You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2005/02/14 20:55:09 UTC

svn commit: r153835 - in incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model: ./ jsr181/ wsdl/

Author: mmerz
Date: Mon Feb 14 11:55:04 2005
New Revision: 153835

URL: http://svn.apache.org/viewcvs?view=rev&rev=153835
Log:
Package move.

Contributor: Daryoush Mehrtash

Added:
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java
Modified:
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java Mon Feb 14 11:55:04 2005
@@ -25,13 +25,13 @@
 /**
  * @author Daryoush
  */
-public interface Jsr181MethodMetadata {
+public interface BeehiveWsMethodMetadata {
     
     boolean isOneWay();
     void setOneWay(boolean oneway);
     
-    SecurityRolesInfo getSecurityRoles();
-    void setSecurityRoles(SecurityRolesInfo securityRoles);
+    BeehiveWsSecurityRolesInfo getSecurityRoles();
+    void setSecurityRoles(BeehiveWsSecurityRolesInfo securityRoles);
     
     String getWmAction();
     void setWmAction(String wmAction);
@@ -45,9 +45,9 @@
     String getWrTargetNamespace();
     void setWrTargetNamespace(String wrTargetNamespace);
     
-    List<Jsr181ParameterMetadata> getParams();
-    void addParam(Jsr181ParameterMetadata parameter);
-    void addParams(List<? extends Jsr181ParameterMetadata> parameters);
+    List<BeehiveWsParameterMetadata> getParams();
+    void addParam(BeehiveWsParameterMetadata parameter);
+    void addParams(List<? extends BeehiveWsParameterMetadata> parameters);
 
     String getJavaMethodName();
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java Mon Feb 14 11:55:04 2005
@@ -24,7 +24,7 @@
 /**
  * @author Daryoush
  */
-public interface Jsr181ParameterMetadata {
+public interface BeehiveWsParameterMetadata {
     
     boolean isWpHeader();
     void setWpHeader(boolean wpHeader);

Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java?view=auto&rev=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java (added)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java Mon Feb 14 11:55:04 2005
@@ -0,0 +1,46 @@
+/*
+ * Created on Feb 11, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.beehive.wsm.jsr181.model;
+import javax.jws.soap.SOAPBinding;
+/**
+ * @author dmehrtash
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface BeehiveWsSOAPBindingInfo {
+  /**
+   * @return Returns the parameterStyle.
+   */
+  public abstract SOAPBinding.ParameterStyle getParameterStyle();
+
+  /**
+   * @param parameterStyle The parameterStyle to set.
+   */
+  public abstract void setParameterStyle(
+      SOAPBinding.ParameterStyle parameterStyle);
+
+  /**
+   * @return Returns the style.
+   */
+  public abstract SOAPBinding.Style getStyle();
+
+  /**
+   * @param style The style to set.
+   */
+  public abstract void setStyle(SOAPBinding.Style style);
+
+  /**
+   * @return Returns the use.
+   */
+  public abstract SOAPBinding.Use getUse();
+
+  /**
+   * @param use The use to set.
+   */
+  public abstract void setUse(SOAPBinding.Use use);
+}
\ No newline at end of file

Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java?view=auto&rev=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java (added)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java Mon Feb 14 11:55:04 2005
@@ -0,0 +1,63 @@
+/*
+ * Created on Feb 11, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.beehive.wsm.jsr181.model;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @author dmehrtash
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface BeehiveWsSOAPMessageHandlerInfo {
+  /**
+   * @return Returns the className.
+   */
+  public abstract String getClassName();
+
+  /**
+   * @param className The className to set.
+   */
+  public abstract void setClassName(String className);
+
+  /**
+   * @return Returns the name.
+   */
+  public abstract String getName();
+
+  /**
+   * @param name The name to set.
+   */
+  public abstract void setName(String name);
+
+  /**
+   * @return Returns the headers.
+   */
+  public abstract Collection<String> getHeaders();
+
+  public abstract void addHeader(String header);
+
+  /**
+   * @return Returns the params.
+   */
+  public abstract Map<String, String> getParameterMap();
+
+  public abstract void addInitParam(String key, String value);
+
+  public abstract void addInitParams(Map<String, String> params);
+
+  /**
+   * @return Returns the roles.
+   */
+  public abstract Collection<String> getRoles();
+
+  public abstract void addRole(String role);
+
+  public abstract void addRoles(Collection<String> roles);
+}
\ No newline at end of file

Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java?view=auto&rev=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java (added)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java Mon Feb 14 11:55:04 2005
@@ -0,0 +1,35 @@
+/*
+ * Created on Feb 11, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.beehive.wsm.jsr181.model;
+
+import java.util.Collection;
+import javax.jws.security.SecurityRoles;
+/**
+ * @author dmehrtash
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface BeehiveWsSecurityRolesInfo {
+  /**
+   * @return Returns the wrRolesAllowed.
+   */
+  public abstract Collection<String> getRolesAllowed();
+
+  public abstract void addRolesAllowed(String role);
+
+  public abstract void addRolesAllowed(Collection<String> roles);
+
+  /**
+   * @return Returns the RolesReferenced.
+   */
+  public abstract Collection<String> getRolesReferenced();
+
+  public abstract void addRolesReferenced(String role);
+
+  public abstract void addRolesReferenced(Collection<String> roles);
+}
\ No newline at end of file

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java Mon Feb 14 11:55:04 2005
@@ -38,11 +38,12 @@
 import org.apache.xmlbeans.XmlException;
 
 import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
 
 /**
  * @author Daryoush
  */
-public interface Jsr181TypeMetadata {
+public interface BeehiveWsTypeMetadata {
 
     void initHandlersFromChainConfig(URL chainConfigURL, String chainName)
         throws Exception;
@@ -53,17 +54,17 @@
     String getHcFileName();
     void setHcFileName(String hcFileName);
     
-    String getHcName();
-    void setHcName(String hcName);
+    public String getHcName();
+    public void setHcName(String hcName);
     
-    SecurityRolesInfo getSecurityRoles();
-    void setSecurityRoles(SecurityRolesInfo securityRoles);
+    BeehiveWsSecurityRolesInfo getSecurityRoles();
+    void setSecurityRoles(BeehiveWsSecurityRolesInfo securityRoles);
     
     String getSiValue();
     void setSiValue(String siValue);
     
-    SOAPBindingInfo getSoapBinding();
-    void setSoapBinding(SOAPBindingInfo soapBinding);
+    BeehiveWsSOAPBindingInfo getSoapBinding();
+    void setSoapBinding(BeehiveWsSOAPBindingInfo soapBinding);
     
     String getWsName();
     void setWsName(String wsName);
@@ -81,19 +82,19 @@
     String getWsWsdlLocation();
     void setWsWsdlLocation(String wsWsdlLocation);
     
-    Collection<Jsr181MethodMetadata> getMethods();
+    Collection<? extends BeehiveWsMethodMetadata> getMethods();
 
-    public abstract Jsr181MethodMetadata getMethod(String methodName,
+    public abstract BeehiveWsMethodMetadata getMethod(String methodName,
                                                    Class... paramTypes);
     
     /**
      * @throws ValidateException if duplicate methods are encountered or if a
      * Document style service attempts to overload methods.
      */
-    void addMethod(Jsr181MethodMetadata method) throws ValidationException;
+    void addMethod(BeehiveWsMethodMetadata method) throws ValidationException;
     
-    List<SOAPMessageHandlerInfo> getSoapHandlers();
-    void addSOAPHandler(SOAPMessageHandlerInfo soapHandler);
+    List<? extends BeehiveWsSOAPMessageHandlerInfo> getSoapHandlers();
+    void addSOAPHandler(BeehiveWsSOAPMessageHandlerInfo soapHandler);
     
     String getClassName();
     void setClassName(String className);

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 import javax.jws.soap.InitParam;
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -32,10 +32,14 @@
 
 import javax.xml.namespace.QName; // todo (mmerz@apache.org, 01/25/05): this needs to go...
 
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.jsr181.model.ValidationException;
 import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
 import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
 
-public class Jsr181MethodMetadataImpl implements Jsr181MethodMetadata, java.io.Serializable {
+public class Jsr181MethodMetadataImpl implements BeehiveWsMethodMetadata, java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
     private static final String DEFAULT_WRNAME = "result";
@@ -43,11 +47,11 @@
     private String wmOperationName;
     private String wmAction;
     private boolean oneway = false;
-    private List<Jsr181ParameterMetadata> params =
-            new ArrayList<Jsr181ParameterMetadata>();
+    private List<BeehiveWsParameterMetadata> params =
+            new ArrayList<BeehiveWsParameterMetadata>();
     private String wrName;
     private String wrTargetNamespace;
-    private SecurityRolesInfo securityRoles;
+    private BeehiveWsSecurityRolesInfo securityRoles;
     private String javaMethodName;
     private Class javaReturnType;
 
@@ -85,10 +89,10 @@
         javaReturnType = jm.getReturnType();
 
         // get webMethod's webParams
-        List<Jsr181ParameterMetadata> webParams =
-            new ArrayList<Jsr181ParameterMetadata>();
+        List<BeehiveWsParameterMetadata> webParams =
+            new ArrayList<BeehiveWsParameterMetadata>();
         for (JavaParameterInfo param : jm.getParameters()) {
-            Jsr181ParameterMetadata wspm = new Jsr181ParameterMetadataImpl(param);
+            BeehiveWsParameterMetadata wspm = new Jsr181ParameterMetadataImpl(param);
             if (null == wspm) {
                 throw new ValidationException("cannot create web param: " + param.getName());
             }
@@ -118,7 +122,7 @@
             // todo??? prohibit @Oneway with "OUT" and "INOUT" parameters
                     
             if (null != webParams) {
-                for (Jsr181ParameterMetadata param : webParams) {
+                for (BeehiveWsParameterMetadata param : webParams) {
                     if ((WebParam.Mode.OUT == param.getWpMode()) || (WebParam.Mode.INOUT == param.getWpMode())) {
                         throw new ValidationException("@Oneway method " + javaMethodName + " has illegal INOUT or OUT parameter: " + param.getWpName());
                     }
@@ -192,11 +196,11 @@
         this.oneway = oneway;
     }
 
-    public SecurityRolesInfo getSecurityRoles() {
+    public BeehiveWsSecurityRolesInfo getSecurityRoles() {
         return securityRoles;
     }
 
-    public void setSecurityRoles(SecurityRolesInfo securityRoles) {
+    public void setSecurityRoles(BeehiveWsSecurityRolesInfo securityRoles) {
         this.securityRoles = securityRoles;
     }
 
@@ -232,18 +236,18 @@
         this.wrTargetNamespace = wrTargetNamespace;
     }
 
-    public List<Jsr181ParameterMetadata> getParams() {
+    public List<BeehiveWsParameterMetadata> getParams() {
         return Collections.unmodifiableList(params);
     }
 
-    public void addParams(List<? extends Jsr181ParameterMetadata> parameters) {
+    public void addParams(List<? extends BeehiveWsParameterMetadata> parameters) {
         if (null != parameters) {
             params.addAll(parameters);
         }
         // todo: checks
     }
 
-    public void addParam(Jsr181ParameterMetadata parameter) {
+    public void addParam(BeehiveWsParameterMetadata parameter) {
         if (null != parameter) {
             params.add(parameter);
         }
@@ -263,7 +267,7 @@
         sb.append('(');
         boolean firstParam = true;
         if (null != params) {
-            for (Jsr181ParameterMetadata p : params) {
+            for (BeehiveWsParameterMetadata p : params) {
                 if (firstParam) {
                     firstParam = false;
                 }
@@ -279,7 +283,7 @@
     
     public String toString() {
         String signature = getJavaReturnType().toString() + " " + getJavaMethodName() + "( ";
-        for (Jsr181ParameterMetadata p : params) {
+        for (BeehiveWsParameterMetadata p : params) {
             signature += p.getJavaType().toString() + " ";
         }
         return signature + ")";

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -25,9 +25,11 @@
 
 import javax.xml.namespace.QName; // todo (mmerz@apache.org, 01/25/05): this needs to go...
 
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.ValidationException;
 import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
 
-public class Jsr181ParameterMetadataImpl implements Jsr181ParameterMetadata, java.io.Serializable {
+public class Jsr181ParameterMetadataImpl implements BeehiveWsParameterMetadata, java.io.Serializable {
     
     private static final long serialVersionUID = 1L;
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -59,10 +59,17 @@
 import org.w3c.dom.NodeList;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.ValidationException;
 import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
 import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
 
-public class Jsr181TypeMetadataImpl implements Jsr181TypeMetadata, java.io.Serializable {
+public class Jsr181TypeMetadataImpl implements BeehiveWsTypeMetadata, java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -71,15 +78,15 @@
     private String wsWsdlLocation;
     private String wsTargetNamespace;
     private String wsEndpointInterface;
-    private Map<String, Jsr181MethodMetadata> methodMap =
-            new HashMap<String, Jsr181MethodMetadata>();
-    private Set<Jsr181MethodMetadata> noDuplicateMethods;
-    private SOAPBindingInfo soapBinding;
+    private Map<String, BeehiveWsMethodMetadata> methodMap =
+            new HashMap<String, BeehiveWsMethodMetadata>();
+    private Set<BeehiveWsMethodMetadata> noDuplicateMethods;
+    private BeehiveWsSOAPBindingInfo soapBinding;
     private String hcFileName;
     private String hcName;
-    private List<SOAPMessageHandlerInfo> soapHandlers =
-            new ArrayList<SOAPMessageHandlerInfo>();
-    private SecurityRolesInfo securityRoles;
+    private List<BeehiveWsSOAPMessageHandlerInfo> soapHandlers =
+            new ArrayList<BeehiveWsSOAPMessageHandlerInfo>();
+    private BeehiveWsSecurityRolesInfo securityRoles;
     private String siValue;
     private String className;
     private File baseLocation;
@@ -109,12 +116,12 @@
         }
 
         // get webMethods
-        Collection<Jsr181MethodMetadata> webMethods =
-            new ArrayList<Jsr181MethodMetadata>();
+        Collection<BeehiveWsMethodMetadata> webMethods =
+            new ArrayList<BeehiveWsMethodMetadata>();
         // SEI: add all methods from service endpoint interface
         if (jt.isInterface()) {
             for (JavaMethodInfo jm : jt.getMethods()) {
-                Jsr181MethodMetadata wsmm = new Jsr181MethodMetadataImpl(jm);
+                BeehiveWsMethodMetadata wsmm = new Jsr181MethodMetadataImpl(jm);
                 webMethods.add(wsmm);
             }
         }        
@@ -122,7 +129,7 @@
         else {
             for (JavaMethodInfo jm : jt.getMethods()) {
                 if (null != jm.getAnnotation(WebMethod.class)) {
-                    Jsr181MethodMetadata wsmm = new Jsr181MethodMetadataImpl(jm);
+                    BeehiveWsMethodMetadata wsmm = new Jsr181MethodMetadataImpl(jm);
                     if (null == wsmm) {
                         jt.logError("illegal web method: " + jm.getMethodName());
                     }
@@ -224,7 +231,7 @@
         }
         
         // set Jsr181MethodMetadata and back fill JSR-181 default values
-        for (Jsr181MethodMetadata wsmm : webMethods) {
+        for (BeehiveWsMethodMetadata wsmm : webMethods) {
             // JSR-181 defaults: fill in default for tergetNamespace from @WebService
             String wrTargetNamespace = wsmm.getWrTargetNamespace();
             if ((null == wrTargetNamespace) || (0 == wrTargetNamespace.length())) {
@@ -232,7 +239,7 @@
             }
 
             // JSR-181 defaults: fill in default for tergetNamespace from @WebService
-            for (Jsr181ParameterMetadata wspm : wsmm.getParams()) {
+            for (BeehiveWsParameterMetadata wspm : wsmm.getParams()) {
                 String wpTargetNamespace = wspm.getWpTargetNamespace();
                 if ((null == wpTargetNamespace) || (0 == wpTargetNamespace.length())) {
                     wspm.setWpTargetNamespace(getWsTargetNamespace());
@@ -297,7 +304,7 @@
         setSoapBinding(new SOAPBindingInfo(annotation));
 
         // validate soap binding
-        SOAPBindingInfo sbi = getSoapBinding();
+        BeehiveWsSOAPBindingInfo sbi = getSoapBinding();
         if (null == sbi) {
             throw new IllegalArgumentException("illegal SOAPBinding annotation on WebService class:\n\t" + sbi);
         }
@@ -340,7 +347,7 @@
         }                
                 
         for (SOAPMessageHandler soapMessageHandler : annotation.value()) {
-            SOAPMessageHandlerInfo smhi = new SOAPMessageHandlerInfo(soapMessageHandler);
+            BeehiveWsSOAPMessageHandlerInfo smhi = new SOAPMessageHandlerInfo(soapMessageHandler);
             // todo: validate smhi.getClassName()
             addSOAPHandler(smhi);
         }
@@ -586,14 +593,14 @@
     /**
      * @return Returns the securityRoles.
      */
-    public SecurityRolesInfo getSecurityRoles() {
+    public BeehiveWsSecurityRolesInfo getSecurityRoles() {
         return securityRoles;
     }
 
     /**
      * @param securityRoles The securityRoles to set.
      */
-    public void setSecurityRoles(SecurityRolesInfo securityRoles) {
+    public void setSecurityRoles(BeehiveWsSecurityRolesInfo securityRoles) {
         this.securityRoles = securityRoles;
     }
 
@@ -614,7 +621,7 @@
     /**
      * @return Returns the soapBinding.
      */
-    public SOAPBindingInfo getSoapBinding() {
+    public BeehiveWsSOAPBindingInfo getSoapBinding() {
         if (soapBinding == null) {
             soapBinding = new SOAPBindingInfo();
         }
@@ -624,7 +631,7 @@
     /**
      * @param soapBinding The soapBinding to set.
      */
-    public void setSoapBinding(SOAPBindingInfo soapBinding) {
+    public void setSoapBinding(BeehiveWsSOAPBindingInfo soapBinding) {
         this.soapBinding = soapBinding;
     }
 
@@ -712,20 +719,20 @@
     /**
      * @return Returns the methods.
      */
-    public Collection<Jsr181MethodMetadata> getMethods() {
+    public Collection<BeehiveWsMethodMetadata> getMethods() {
         if (noDuplicateMethods == null) {
             noDuplicateMethods = Collections
-                .unmodifiableSet(new HashSet<Jsr181MethodMetadata>
+                .unmodifiableSet(new HashSet<BeehiveWsMethodMetadata>
                                  (methodMap.values()));
         }
         return noDuplicateMethods;
     }
 
-    public Jsr181MethodMetadata getMethod(String methodName,
+    public BeehiveWsMethodMetadata getMethod(String methodName,
                                           Class... paramTypes) {
         String sig = createCompleteMethodSignature(methodName, paramTypes);
         
-        Jsr181MethodMetadata meta = methodMap.get(sig);
+        BeehiveWsMethodMetadata meta = methodMap.get(sig);
         if (meta == null) {
             /* 
              * NOTE jcolwell@bea.com 2004-Nov-29 -- 
@@ -738,16 +745,16 @@
         return meta;
     }
 
-    public void addMethod(Jsr181MethodMetadata method)
+    public void addMethod(BeehiveWsMethodMetadata method)
         throws ValidationException {
 
         // NOTE jcolwell@bea.com 2004-Nov-29 -- clear the Set that prevents
         // duplicates being returned from getMethods().
         noDuplicateMethods = null;
-        List<Jsr181ParameterMetadata> params = method.getParams();
+        List<? extends BeehiveWsParameterMetadata> params = method.getParams();
         Class[] paramTypes = new Class[params.size()];
         int j = 0;
-        for (Jsr181ParameterMetadata param : params) {
+        for (BeehiveWsParameterMetadata param : params) {
             Class javaType = param.getJavaType();
             if (null == javaType) {
                 throw new ValidationException("<null> is not a valid parameter class");
@@ -769,11 +776,11 @@
         }
     }
 
-    public List<SOAPMessageHandlerInfo> getSoapHandlers() {
+    public List<? extends BeehiveWsSOAPMessageHandlerInfo> getSoapHandlers() {
         return Collections.unmodifiableList(soapHandlers);
     }
 
-    public void addSOAPHandler(SOAPMessageHandlerInfo soapHandler) {
+    public void addSOAPHandler(BeehiveWsSOAPMessageHandlerInfo soapHandler) {
         soapHandlers.add(soapHandler);
     }
 
@@ -860,7 +867,7 @@
             throw new ValidationException("service endpoint interface can't reference another service endpoint interface: " + myEndpointInterface);
         
         // check if objectModel doesn't reference this endpointInterface --> error
-        Jsr181TypeMetadata sibObjectModel = new Jsr181TypeMetadataImpl(jt);
+        BeehiveWsTypeMetadata sibObjectModel = new Jsr181TypeMetadataImpl(jt);
         String omEndpointInterface = sibObjectModel.getWsEndpointInterface();
         if (null == omEndpointInterface || 0 >= omEndpointInterface.length() || ! omEndpointInterface.equals(getClassName()))
             throw new Exception("Internal error: object model for " + sibObjectModel.getClassName() + " does not reference endpoint interface "+ omEndpointInterface);
@@ -886,7 +893,7 @@
     protected void validateContract(JavaTypeInfo jt) throws ValidationException {
         
         // get all implemented methods
-        Collection<Jsr181MethodMetadata> implementedMethods = new HashSet<Jsr181MethodMetadata>();
+        Collection<BeehiveWsMethodMetadata> implementedMethods = new HashSet<BeehiveWsMethodMetadata>();
         for (JavaMethodInfo jm : jt.getMethods()) {
             try {
                 implementedMethods.add(new Jsr181MethodMetadataImpl(jm));
@@ -897,9 +904,9 @@
         }
         
         // check if we implement all required methods
-        for (Jsr181MethodMetadata declaredMethod : getMethods()) {
+        for (BeehiveWsMethodMetadata declaredMethod : getMethods()) {
             boolean implementationFound = false;
-            for (Jsr181MethodMetadata implementedMethod : implementedMethods) {
+            for (BeehiveWsMethodMetadata implementedMethod : implementedMethods) {
                 if (implementedMethod.equals(declaredMethod)) {
                     implementationFound = true;
                     break;
@@ -923,7 +930,7 @@
     /**
      * @param clazz
      */
-    public static Jsr181TypeMetadata load(Class clazz) throws IOException, ClassNotFoundException {
+    public static BeehiveWsTypeMetadata load(Class clazz) throws IOException, ClassNotFoundException {
         String resourceName = getLocation(clazz.getName()).toString();
         URL url = clazz.getClassLoader().getResource(resourceName);
         return load(url.openStream());
@@ -932,7 +939,7 @@
     /**
      * @param is
      */
-    public static Jsr181TypeMetadata load(InputStream is) throws IOException, ClassNotFoundException {
+    public static BeehiveWsTypeMetadata load(InputStream is) throws IOException, ClassNotFoundException {
 
         Jsr181TypeMetadataImpl objectModel = null;
         ObjectInputStream ois = null;
@@ -957,7 +964,7 @@
      * @param os
      * @param objectModel
      */
-    public static void store(OutputStream os, Jsr181TypeMetadata objectModel) throws IOException {
+    public static void store(OutputStream os, BeehiveWsTypeMetadata objectModel) throws IOException {
         
         ObjectOutputStream oos = null;
         try {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java Mon Feb 14 11:55:04 2005
@@ -1,7 +1,9 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 import javax.jws.soap.SOAPBinding;
 
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
+
 /*
  * Copyright 2004 The Apache Software Foundation
  *
@@ -20,7 +22,7 @@
  * $Header:$
  */
 
-public class SOAPBindingInfo implements java.io.Serializable {
+public class SOAPBindingInfo implements java.io.Serializable, BeehiveWsSOAPBindingInfo {
 
     private static final long serialVersionUID = 1L;
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -28,7 +28,9 @@
 import javax.jws.soap.InitParam;
 import javax.jws.soap.SOAPMessageHandler;
 
-public class SOAPMessageHandlerInfo implements java.io.Serializable {
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
+
+public class SOAPMessageHandlerInfo implements java.io.Serializable, BeehiveWsSOAPMessageHandlerInfo {
 
     private static final long serialVersionUID = 1L;
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java Mon Feb 14 11:55:04 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.jsr181.model.jsr181;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,6 +7,8 @@
 
 import javax.jws.security.SecurityRoles;
 
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+
 /*
  * Copyright 2004 The Apache Software Foundation
  *
@@ -25,7 +27,7 @@
  * $Header:$
  */
 
-public class SecurityRolesInfo implements java.io.Serializable {
+public class SecurityRolesInfo implements java.io.Serializable, BeehiveWsSecurityRolesInfo {
 
     private static final long serialVersionUID = 1L;
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java?view=diff&r1=153834&r2=153835
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java Mon Feb 14 11:55:04 2005
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.jsr181.wsdl;
+package org.apache.beehive.wsm.jsr181.model.wsdl;
 
 import java.io.File;
 import java.io.InputStream;
@@ -37,14 +37,16 @@
 
 import org.apache.beehive.wsm.jsr181.util.TypeMappingUtil;
 import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil;
+import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
 
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.SchemaTypeLoader;
 import org.apache.xmlbeans.XmlBeans;
@@ -82,7 +84,7 @@
 
   private TypeMappingUtil mTmu;
 
-  public Jsr181TypeMetadata createObjectModel(InputStream wsdlStream)
+  public BeehiveWsTypeMetadata createObjectModel(InputStream wsdlStream)
       throws Exception {
 
     DefinitionsDocument defDoc = parseWSDL(wsdlStream);
@@ -109,10 +111,10 @@
 
   public static final String WSDLSOAPNS = "http://schemas.xmlsoap.org/wsdl/soap/";
 
-  public Jsr181TypeMetadata toWebServiceMetadata(DefinitionsDocument defDoc)
+  public BeehiveWsTypeMetadata toWebServiceMetadata(DefinitionsDocument defDoc)
       throws Exception {
-    Jsr181TypeMetadata wsm = new Jsr181TypeMetadataImpl();
-    Map<String, Jsr181MethodMetadata> methodMap = new HashMap<String, Jsr181MethodMetadata>();
+    BeehiveWsTypeMetadata wsm = new Jsr181TypeMetadataImpl();
+    Map<String, BeehiveWsMethodMetadata> methodMap = new HashMap<String, BeehiveWsMethodMetadata>();
     TDefinitions defs = defDoc.getDefinitions();
     wsm.setWsTargetNamespace(defs.getTargetNamespace());
     Map<String, TPart[]> messageMap = new HashMap<String, TPart[]>();
@@ -181,15 +183,15 @@
    * defDoc; }
    */
 
-  private void processTOperation(TOperation op, Jsr181TypeMetadata wsm,
-      Map<String, Jsr181MethodMetadata> methodMap,
+  private void processTOperation(TOperation op, BeehiveWsTypeMetadata wsm,
+      Map<String, BeehiveWsMethodMetadata> methodMap,
       Map<String, TPart[]> messageMap, TTypes types) throws Exception {
     String opName = op.getName();
     TParam outputParam = op.getOutput();
 
-    Map<String, Jsr181ParameterMetadata> outParamMap = null;
+    Map<String, BeehiveWsParameterMetadata> outParamMap = null;
 
-    Jsr181ParameterMetadata[] paraMeta = processParameters(outputParam, types,
+    BeehiveWsParameterMetadata[] paraMeta = processParameters(outputParam, types,
         messageMap, wsm);
     Class returnType;
     QName returnXMLType;
@@ -208,15 +210,15 @@
       returnType = Void.TYPE;
       returnXMLType = null;
       if (paraMeta.length > 1) {
-        outParamMap = new HashMap<String, Jsr181ParameterMetadata>(
+        outParamMap = new HashMap<String, BeehiveWsParameterMetadata>(
             paraMeta.length);
         boolean returnIsSet = false;
-        for (Jsr181ParameterMetadata cpm : paraMeta) {
+        for (BeehiveWsParameterMetadata cpm : paraMeta) {
           outParamMap.put(cpm.getWpName(), cpm);
         }
       }
     }
-    Jsr181MethodMetadata wmm = new Jsr181MethodMetadataImpl(opName, returnType,
+    BeehiveWsMethodMetadata wmm = new Jsr181MethodMetadataImpl(opName, returnType,
         returnXMLType);
 
     wmm.setWmOperationName(opName);
@@ -242,7 +244,7 @@
     TParam inputParam = op.getInput();
     if (inputParam != null) {
 
-      Jsr181ParameterMetadata[] params = processParameters(inputParam, types,
+      BeehiveWsParameterMetadata[] params = processParameters(inputParam, types,
           messageMap, wsm);
 
       if (paramOrder != null) { // walk the parameters according to
@@ -258,7 +260,7 @@
         // if there is a paramoder then order the parameters, then all
         // the parameters and look at in/out flag.
         for (Object ord : paramOrder) {
-          for (Jsr181ParameterMetadata wpm : params) {
+          for (BeehiveWsParameterMetadata wpm : params) {
             if (ord.equals(wpm.getWpName())) {
 
               wpm.setWpMode(WebParam.Mode.IN); // THIUS MAY BE
@@ -274,7 +276,7 @@
           }
         }
       } else if (params.length > 0) {
-        for (Jsr181ParameterMetadata wpm : params) {
+        for (BeehiveWsParameterMetadata wpm : params) {
           // FIXME jcolwell@bea.com 2005-Jan-04 --
           // Double check DOC/Lit rules
           if (outParamMap != null && outParamMap.containsKey(wpm.getWpName())) {
@@ -297,19 +299,19 @@
     // do the pure out parameters.
     if (outParamMap != null && outParamMap.size() > 0) {
       if (outParamMap.size() == 1) {
-        Jsr181ParameterMetadata wpm = outParamMap.values().iterator().next();
+        BeehiveWsParameterMetadata wpm = outParamMap.values().iterator().next();
         wmm.setXmlReturnType(wpm.getXmlType());
         wmm.setReturnType(wpm.getJavaType());
         wmm.setOneWay(false);
       } else {
-        for (Jsr181ParameterMetadata wpm : outParamMap.values()) {
+        for (BeehiveWsParameterMetadata wpm : outParamMap.values()) {
           wpm.setWpMode(WebParam.Mode.OUT);
           wmm.addParam(wpm);
         }
       }
     }
 
-    List<Jsr181ParameterMetadata> params = wmm.getParams();
+    List<BeehiveWsParameterMetadata> params = wmm.getParams();
     /*
      * System.out.println("adding method " + wmm.getWmOperationName() + "
      * returning " + wmm.getJavaReturnType() + " with the following " +
@@ -322,14 +324,14 @@
 
   }
 
-  private Jsr181ParameterMetadata[] processParameters(TParam parameter,
-      TTypes types, Map<String, TPart[]> messageMap, Jsr181TypeMetadata wsm) {
+  private BeehiveWsParameterMetadata[] processParameters(TParam parameter,
+      TTypes types, Map<String, TPart[]> messageMap, BeehiveWsTypeMetadata wsm) {
 
     if (parameter != null) {
       TPart[] messageParts = messageMap.get(parameter.getMessage()
           .getLocalPart());
 
-      List<Jsr181ParameterMetadata> paramList = new ArrayList<Jsr181ParameterMetadata>(
+      List<BeehiveWsParameterMetadata> paramList = new ArrayList<BeehiveWsParameterMetadata>(
           messageParts.length);
       int j = 0;
       for (TPart messagePart : messageParts) {
@@ -350,7 +352,7 @@
           String name = messagePart.getName();
           // if name is "parameters" then we need to unwrap the type
           // and the service is doc/literal wrapped./
-          if (0 == "parameters".compareTo(name)) {
+          if (0 == "parameters".compareTo(name)  ) {  
             if (types != null) { // if there are some type
               try {
                 Schema[] schemas = selectChildren(types, Schema.class);
@@ -413,7 +415,7 @@
            wsm.getSoapBinding().setParameterStyle(
                 SOAPBinding.ParameterStyle.BARE);
 
-            Jsr181ParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
+            BeehiveWsParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
 
             wpm.setWpTargetNamespace(element.getNamespaceURI());
             wpm.setWpName(element.getLocalPart());
@@ -422,7 +424,7 @@
             paramList.add(wpm);
           }
         } else { // this is an rpc and with no element attribute
-          Jsr181ParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
+          BeehiveWsParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
           // FIXME jcolwell@bea.com 2004-Nov-09 -- figure out where
           // RPC parameter namespaces should be specified in the WSDL.
           wpm.setWpTargetNamespace(wsm.getWsTargetNamespace());
@@ -437,9 +439,9 @@
           paramList.add(wpm);
         }
       }
-      return paramList.toArray(new Jsr181ParameterMetadata[paramList.size()]);
+      return paramList.toArray(new BeehiveWsParameterMetadata[paramList.size()]);
     }
-    return new Jsr181ParameterMetadata[0];
+    return new BeehiveWsParameterMetadata[0];
   }
 
   /**
@@ -447,9 +449,9 @@
    * @param s
    * @param el
    */
-  private Jsr181ParameterMetadata elementToParamMetaData(
+  private BeehiveWsParameterMetadata elementToParamMetaData(
       String targetNamespace, Element el) {
-    Jsr181ParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
+    BeehiveWsParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
     // FIXME
     // jcolwell@bea.com
     // 2004-Nov-09
@@ -502,11 +504,11 @@
 
   }
 
-  private void processTBinding(TBinding tBind, Jsr181TypeMetadata wsm)
+  private void processTBinding(TBinding tBind, BeehiveWsTypeMetadata wsm)
       throws IllegalAccessException, NoSuchFieldException {
 
     org.xmlsoap.schemas.wsdl.soap.TBinding[] soapBinding = getSOAPBinding(tBind);
-    SOAPBindingInfo soapInfo = new SOAPBindingInfo();
+    BeehiveWsSOAPBindingInfo soapInfo = new SOAPBindingInfo();
     if (soapBinding != null && soapBinding.length > 0) {
       if (TStyleChoice.RPC.equals(soapBinding[0].getStyle())) {
         soapInfo.setStyle(SOAPBinding.Style.RPC);
@@ -515,13 +517,13 @@
     }
   }
 
-  private void processTBindingOperation(TBinding tBind, Jsr181TypeMetadata wsm,
-      Map<String, Jsr181MethodMetadata> methodMap)
+  private void processTBindingOperation(TBinding tBind, BeehiveWsTypeMetadata wsm,
+      Map<String, BeehiveWsMethodMetadata> methodMap)
       throws IllegalAccessException, NoSuchFieldException {
 
     TBindingOperation[] tBops = tBind.getOperationArray();
     for (TBindingOperation tBop : tBops) {
-      Jsr181MethodMetadata wmm = methodMap.get(tBop.getName());
+      BeehiveWsMethodMetadata wmm = methodMap.get(tBop.getName());
       if (wmm != null) {
         org.xmlsoap.schemas.wsdl.soap.TOperation[] soapOperations = getSOAPOperations(tBop);
         if (soapOperations != null && soapOperations.length > 0) {
@@ -537,7 +539,7 @@
             if (wsm.getWsTargetNamespace() == null) {
               wsm.setWsTargetNamespace(bodies[0].getNamespace());
             }
-            SOAPBindingInfo soapInfo = wsm.getSoapBinding();
+            BeehiveWsSOAPBindingInfo soapInfo = wsm.getSoapBinding();
             if (UseChoice.ENCODED.equals(bodies[0].getUse())) {
               soapInfo.setUse(SOAPBinding.Use.ENCODED);
             }
@@ -621,7 +623,7 @@
    * kidCursor.copyXml(parentCursor); }
    */
 
-  public Jsr181TypeMetadata loadWebServiceMetadataFromWSDL(String wsdlLocation)
+  public BeehiveWsTypeMetadata loadWebServiceMetadataFromWSDL(String wsdlLocation)
       throws Exception {
     return toWebServiceMetadata(parseWSDL(wsdlLocation));
   }