[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata ElementBase.java PortComponent.j
From:       thomas diesler <tdiesler () users ! sourceforge ! net>
Date:       2003-10-31 23:38:16
[Download RAW message or body]

  User: tdiesler
  Date: 03/10/31 15:38:16

  Modified:    jboss.net/src/main/org/jboss/net/ws4ee/metadata
                        ElementBase.java PortComponent.java
                        ServiceImplBean.java WebserviceDescription.java
                        Webservices.java WsdlPort.java
  Log:
  layout code using style from jboss-server
  
  Revision  Changes    Path
  1.3       +37 -28    \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/ElementBase.java  
  Index: ElementBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/ElementBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ElementBase.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ ElementBase.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: ElementBase.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: ElementBase.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  @@ -22,7 +22,7 @@
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
    * @author <a href="mailto:christoph.jung@infor.de">Christoph G. Jung</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public abstract class ElementBase
   {
  @@ -30,8 +30,9 @@
   
      public ElementBase(Node node) throws SAXException
      {
  -      if(node==null) {
  -         throw new SAXException("No node for meta-data instance "+getClass());
  +      if (node == null)
  +      {
  +         throw new SAXException("No node for meta-data instance " + getClass());
         }
         this.node = node;
      }
  @@ -46,7 +47,7 @@
       * @param localName an element name
       * @return a List
       */
  -   protected Node getChild(String localName) 
  +   protected Node getChild(String localName)
      {
         int count = node.getChildNodes().getLength();
         for (int i = 0; i < count; i++)
  @@ -61,29 +62,36 @@
      }
   
      /**
  -   * Get first named child node.
  -   * @param localName an element name
  -   * @return a List
  -   */
  -  protected String getChildValue(String localName) 
  -  {
  -     return getValue(getChild(localName));
  -  }
  -
  -   /** return node body */  
  -  protected String getValue(Node resNode) {
  -     if(resNode==null) {
  +    * Get first named child node.
  +    * @param localName an element name
  +    * @return a List
  +    */
  +   protected String getChildValue(String localName)
  +   {
  +      return getValue(getChild(localName));
  +   }
  +
  +   /** return node body */
  +   protected String getValue(Node resNode)
  +   {
  +      if (resNode == null)
  +      {
            return null;
  -      } else {
  -         Node textNode=resNode.getFirstChild();
  -         if(textNode!=null) {
  -          return textNode.getNodeValue();
  -         } else {
  +      }
  +      else
  +      {
  +         Node textNode = resNode.getFirstChild();
  +         if (textNode != null)
  +         {
  +            return textNode.getNodeValue();
  +         }
  +         else
  +         {
               return null;
            }
         }
  -  }
  -  
  +   }
  +
      /**
       * Get first named child node.
       * @param localName an element name
  @@ -91,10 +99,11 @@
       */
      protected Node getUniqueChild(String localName) throws SAXException
      {
  -      Node result=getChild(localName);
  -      if(result==null) {
  -         throw new SAXException("The unique element "+localName+" could not been \
                found under node "+node);
  -      } 
  +      Node result = getChild(localName);
  +      if (result == null)
  +      {
  +         throw new SAXException("The unique element " + localName + " could not \
been found under node " + node);  +      }
         return result;
      }
   
  
  
  
  1.3       +92 -75    \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/PortComponent.java  
  Index: PortComponent.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/PortComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortComponent.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ PortComponent.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: PortComponent.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: PortComponent.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  @@ -21,10 +21,11 @@
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
    * @author <a href="mailto:christoph.jung@infor.de">Christoph G. Jung</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
  -public class PortComponent extends ElementBase {
  -   
  +public class PortComponent extends ElementBase
  +{
  +
      public static String ELEMENT_NAME = "port-component";
      /** service class property */
      public static final String PARAMETER_WEB_SERVICE_POS = \
"web-service-description-id";  @@ -38,119 +39,135 @@
      protected Class serviceEndpointInterface;
      protected WebserviceDescription description;
      int pos;
  -         
  -   public PortComponent(Node node, WebserviceDescription parent, int pos) throws \
SAXException {  +
  +   public PortComponent(Node node, WebserviceDescription parent, int pos) throws \
SAXException  +   {
         super(node);
  -      description=parent;
  -      this.pos=pos;
  -      if (!ELEMENT_NAME.equals(node.getLocalName())) {
  +      description = parent;
  +      this.pos = pos;
  +      if (!ELEMENT_NAME.equals(node.getLocalName()))
  +      {
            throw new IllegalArgumentException(
  -            "invalid element name, expected '"
  -               + ELEMENT_NAME
  -               + "' but was '"
  -               + node.getLocalName()
  -               + "'");
  +                 "invalid element name, expected '"
  +                 + ELEMENT_NAME
  +                 + "' but was '"
  +                 + node.getLocalName()
  +                 + "'");
         }
  -      
  -      serviceImplBean=new \
                ServiceImplBean(getUniqueChild(ServiceImplBean.ELEMENT_NAME),this);
  -      wsdlPort=new WsdlPort(getUniqueChild(WsdlPort.ELEMENT_NAME),this);
  +
  +      serviceImplBean = new \
ServiceImplBean(getUniqueChild(ServiceImplBean.ELEMENT_NAME), this);  +      wsdlPort \
= new WsdlPort(getUniqueChild(WsdlPort.ELEMENT_NAME), this);  }
   
  -   public String getPortComponentName() {
  +   public String getPortComponentName()
  +   {
         return getChildValue("port-component-name");
      }
   
  -   public WsdlPort getWsdlPort() {
  +   public WsdlPort getWsdlPort()
  +   {
         return wsdlPort;
      }
   
  -   public Class getServiceEndpointInterface() {
  -      if(serviceEndpointInterface==null) {
  -         try{
  -            serviceEndpointInterface=description.services.module.getDeploymentInfo().localCl.
                
  -               loadClass(getChildValue("service-endpoint-interface"));
  -         } catch(Exception e) {
  +   public Class getServiceEndpointInterface()
  +   {
  +      if (serviceEndpointInterface == null)
  +      {
  +         try
  +         {
  +            serviceEndpointInterface = \
description.services.module.getDeploymentInfo().localCl.  +                    \
loadClass(getChildValue("service-endpoint-interface"));  +         }
  +         catch (Exception e)
  +         {
            }
         }
         return serviceEndpointInterface;
      }
   
  -   public ServiceImplBean getServiceImplBean() {
  +   public ServiceImplBean getServiceImplBean()
  +   {
         return serviceImplBean;
      }
   
  -   public void getDeploymentWSDD(StringBuffer buffer) {
  +   public void getDeploymentWSDD(StringBuffer buffer)
  +   {
         buffer.append("<deployment");
         buffer.append(
  -         " targetNamespace='" + getWsdlPort().getQName().getNamespaceURI() + "'");
  +              " targetNamespace='" + getWsdlPort().getQName().getNamespaceURI() + \
"'");  buffer.append(" xmlns='http://xml.apache.org/axis/wsdd/'");
         buffer.append(
  -         " xmlns:java='http://xml.apache.org/axis/wsdd/providers/java'");
  +              " xmlns:java='http://xml.apache.org/axis/wsdd/providers/java'");
         buffer.append(
  -         " xmlns:xsi='http://www.w3.org/2000/10/XMLSchema-instance'>");
  +              " xmlns:xsi='http://www.w3.org/2000/10/XMLSchema-instance'>");
         buffer.append(
  -         "<service name='"
  -            + getWsdlPort().getQName().getLocalPart()
  -            + "' provider='Handler'>");
  -      buffer.append(
  -         "<parameter name='"
  -            + JavaProvider.OPTION_CLASSNAME
  -            + "' value='"
  -            + getServiceEndpointInterface().getName()
  -            + "' />");
  -      buffer.append(
  -         "<parameter name='"
  -            + PARAMETER_WEB_SERVICE_MODULE
  -            + "' value='"
  -            + description.services.module.getObjectName().getCanonicalName()
  -            + "' />");
  -      buffer.append(
  -         "<parameter name='"
  -            + PARAMETER_WEB_SERVICE_POS
  -            + "' value='"
  -            + String.valueOf(description.pos)
  -            + "' />");
  -      buffer.append(
  -         "<parameter name='"
  -            + PARAMETER_PORT_COMPONENT_POS
  -            + "' value='"
  -            + String.valueOf(pos)
  -            + "' />");
  +              "<service name='"
  +              + getWsdlPort().getQName().getLocalPart()
  +              + "' provider='Handler'>");
  +      buffer.append(
  +              "<parameter name='"
  +              + JavaProvider.OPTION_CLASSNAME
  +              + "' value='"
  +              + getServiceEndpointInterface().getName()
  +              + "' />");
  +      buffer.append(
  +              "<parameter name='"
  +              + PARAMETER_WEB_SERVICE_MODULE
  +              + "' value='"
  +              + description.services.module.getObjectName().getCanonicalName()
  +              + "' />");
  +      buffer.append(
  +              "<parameter name='"
  +              + PARAMETER_WEB_SERVICE_POS
  +              + "' value='"
  +              + String.valueOf(description.pos)
  +              + "' />");
  +      buffer.append(
  +              "<parameter name='"
  +              + PARAMETER_PORT_COMPONENT_POS
  +              + "' value='"
  +              + String.valueOf(pos)
  +              + "' />");
         getServiceImplBean().getDeploymentWSDD(buffer);
         buffer.append("</service>");
         buffer.append("</deployment>");
      }
  -   
  +
      /** verify this port component */
  -   public boolean verify(Logger log) {
  -      boolean result=true;
  -      
  -      if(getServiceEndpointInterface()==null) {
  -         log.warn("No service endpoint interface has been registered in port \
                component "+this);
  -         result=false;
  +   public boolean verify(Logger log)
  +   {
  +      boolean result = true;
  +
  +      if (getServiceEndpointInterface() == null)
  +      {
  +         log.warn("No service endpoint interface has been registered in port \
component " + this);  +         result = false;
         }
  -      
  -      result&=wsdlPort.verify(log);
  -      result&=serviceImplBean.verify(log);
  -      
  +
  +      result &= wsdlPort.verify(log);
  +      result &= serviceImplBean.verify(log);
  +
         return result;
      }
   
      /**
       * @return
       */
  -   public WebserviceDescription getDescription() {
  +   public WebserviceDescription getDescription()
  +   {
         return description;
      }
   
      /**
       * this method serves to connects an ejb ports to the correct container
       */
  -   public void registerEJBContainer(SessionContainer container) {
  -      String ejbName1=container.getBeanMetaData().getEjbName();
  -      String ejbLink=getServiceImplBean().getEjbLink();
  -      if(ejbName1.equals(ejbLink)) {
  -            getServiceImplBean().container=container;
  -         }
  +   public void registerEJBContainer(SessionContainer container)
  +   {
  +      String ejbName1 = container.getBeanMetaData().getEjbName();
  +      String ejbLink = getServiceImplBean().getEjbLink();
  +      if (ejbName1.equals(ejbLink))
  +      {
  +         getServiceImplBean().container = container;
  +      }
      }
   }
  
  
  
  1.3       +53 -37    \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/ServiceImplBean.java  
  Index: ServiceImplBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/ServiceImplBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceImplBean.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ ServiceImplBean.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,16 +5,16 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: ServiceImplBean.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: ServiceImplBean.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  -import org.w3c.dom.Node;
  -import org.xml.sax.SAXException;
   import org.jboss.ejb.SessionContainer;
   import org.jboss.logging.Logger;
   import org.jboss.net.ws4ee.server.EJBInvokerProvider;
   import org.jboss.net.ws4ee.server.JBossNetWebAppProvider;
  +import org.w3c.dom.Node;
  +import org.xml.sax.SAXException;
   
   /**
    * XML Binding element for \
<code>webservices/webservice-description/port-component/service-impl-bean</code>  @@ \
                -22,10 +22,11 @@
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
    * @author <a href="mailto:christoph.jung@infor.de">Christoph G. Jung</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
  -public class ServiceImplBean extends ElementBase {
  -   
  +public class ServiceImplBean extends ElementBase
  +{
  +
      public static String ELEMENT_NAME = "service-impl-bean";
      /** the <code>ejb-link</code>  option in the deployment.wsdd */
      public static final String OPTION_EJB_LINK = "ejb-link";
  @@ -36,72 +37,87 @@
      protected SessionContainer container;
      /** back reference to the port component */
      protected PortComponent portComponent;
  -   
  +
      /** create a new service impl */
  -   public ServiceImplBean(Node node, PortComponent pc) throws SAXException {
  +   public ServiceImplBean(Node node, PortComponent pc) throws SAXException
  +   {
         super(node);
  -      portComponent=pc;
  -      if (!ELEMENT_NAME.equals(node.getLocalName())) {
  +      portComponent = pc;
  +      if (!ELEMENT_NAME.equals(node.getLocalName()))
  +      {
            throw new IllegalArgumentException(
  -            "invalid element name, expected '"
  -               + ELEMENT_NAME
  -               + "' but was '"
  -               + node.getLocalName()
  -               + "'");
  +                 "invalid element name, expected '"
  +                 + ELEMENT_NAME
  +                 + "' but was '"
  +                 + node.getLocalName()
  +                 + "'");
         }
      }
   
      /** return servlet link */
  -   public String getServletLink() {
  +   public String getServletLink()
  +   {
         return getChildValue("servlet-link");
      }
   
      /** return ejb link */
  -   public String getEjbLink() {
  +   public String getEjbLink()
  +   {
         return getChildValue("ejb-link");
      }
   
  -   public boolean verify(Logger log) {
  -      if(getServletLink()==null) {
  -         if(getEjbLink()!=null) {
  -            boolean result=true;
  -            if(container==null) {
  -               log.warn("The ejb-link "+getEjbLink()+" to implement port \
                "+portComponent+" could not be connected to a container.");
  -               result=false;
  +   public boolean verify(Logger log)
  +   {
  +      if (getServletLink() == null)
  +      {
  +         if (getEjbLink() != null)
  +         {
  +            boolean result = true;
  +            if (container == null)
  +            {
  +               log.warn("The ejb-link " + getEjbLink() + " to implement port " + \
portComponent + " could not be connected to a container.");  +               result = \
false;  }
               return result;
  -         } else {
  +         }
  +         else
  +         {
               return false;
            }
         }
         return true;
      }
  -   
  -   /** 
  +
  +   /**
       * create handler parameters for the axis engine
       * @param buffer
       * @param deploymentId
       */
  -   public void getDeploymentWSDD(StringBuffer buffer) {
  +   public void getDeploymentWSDD(StringBuffer buffer)
  +   {
         String link = getEjbLink();
  -      if (link != null) {
  +      if (link != null)
  +      {
            buffer.append(
  -            "<parameter name='handlerClass' value='"
  -               + EJBInvokerProvider.class.getName()
  -               + "' />");
  -      } else {
  +                 "<parameter name='handlerClass' value='"
  +                 + EJBInvokerProvider.class.getName()
  +                 + "' />");
  +      }
  +      else
  +      {
            link = getServletLink();
            buffer.append(
  -            "<parameter name='handlerClass' value='"
  -               + JBossNetWebAppProvider.class.getName()
  -               + "' />");
  +                 "<parameter name='handlerClass' value='"
  +                 + JBossNetWebAppProvider.class.getName()
  +                 + "' />");
         }
      }
   
      /**
       * @return
       */
  -   public SessionContainer getContainer() {
  +   public SessionContainer getContainer()
  +   {
         return container;
      }
   
  
  
  
  1.3       +129 -109  \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/WebserviceDescription.java  
  Index: WebserviceDescription.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/WebserviceDescription.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebserviceDescription.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ WebserviceDescription.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,18 +5,17 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: WebserviceDescription.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: WebserviceDescription.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Node;
  -import org.xml.sax.SAXException;
  +import com.ibm.wsdl.factory.WSDLFactoryImpl;
   import org.apache.axis.MessageContext;
   import org.jboss.ejb.SessionContainer;
   import org.jboss.logging.Logger;
  -
  -import com.ibm.wsdl.factory.WSDLFactoryImpl;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Node;
  +import org.xml.sax.SAXException;
   
   import javax.wsdl.Definition;
   import javax.wsdl.WSDLException;
  @@ -31,131 +30,152 @@
    *
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
  -public class WebserviceDescription extends ElementBase {
  -	public static String ELEMENT_NAME = "webservice-description";
  +public class WebserviceDescription extends ElementBase
  +{
  +   public static String ELEMENT_NAME = "webservice-description";
   
  -	protected Definition wsdlDefinition;
  +   protected Definition wsdlDefinition;
      protected Document wsdlDocument;
  -	protected Document jaxrpcDocument;
  -	protected PortComponent[] portComponents;
  +   protected Document jaxrpcDocument;
  +   protected PortComponent[] portComponents;
      protected Webservices services;
      int pos;
  -   
  -	public WebserviceDescription(Node node, DocumentBuilder builder, Webservices \
                parent, int count) throws IOException, SAXException, WSDLException {
  -		super(node);
  -      pos=count;
  -		if (!ELEMENT_NAME.equals(node.getLocalName())) {
  -			throw new IllegalArgumentException(
  -				"invalid element name, expected '"
  -					+ ELEMENT_NAME
  -					+ "' but was '"
  -					+ node.getLocalName()
  -					+ "'");
  -		}
  -      
  -      services=parent;
  -		//	initialize the list of portcomponent descriptions
  -		List allDescriptions=getChildren(PortComponent.ELEMENT_NAME);
  -		portComponents=new PortComponent[allDescriptions.size()];
  -		
  -		for (int i = 0; i < portComponents.length; i++) {
  -				 portComponents[i]=
  -					 new PortComponent(
  -						 (Node) allDescriptions.get(
  -							 i),this,i);
  -		}
  -
  -		String wsdlFile=getWsdlFile();
  -		if(wsdlFile!=null) {		
  -			wsdlDocument=builder.parse(services.module.getDeploymentInfo().localCl.getResourceAsStream(wsdlFile));
                
  -			WSDLFactory wsdlFactory = new WSDLFactoryImpl();
  -			WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
  -			wsdlDefinition=wsdlReader.readWSDL(null, wsdlDocument);
  -		}
  -		
  -		String jaxrpxFile=getJaxrpcMappingFile();
  -		if(jaxrpxFile!=null) {
  -			jaxrpcDocument=builder.parse(services.module.getDeploymentInfo().localCl.getResourceAsStream(jaxrpxFile));
                
  -		}
  -	}
   
  -   public Document getWsdlDocument() {
  +   public WebserviceDescription(Node node, DocumentBuilder builder, Webservices \
parent, int count) throws IOException, SAXException, WSDLException  +   {
  +      super(node);
  +      pos = count;
  +      if (!ELEMENT_NAME.equals(node.getLocalName()))
  +      {
  +         throw new IllegalArgumentException(
  +                 "invalid element name, expected '"
  +                 + ELEMENT_NAME
  +                 + "' but was '"
  +                 + node.getLocalName()
  +                 + "'");
  +      }
  +
  +      services = parent;
  +      //	initialize the list of portcomponent descriptions
  +      List allDescriptions = getChildren(PortComponent.ELEMENT_NAME);
  +      portComponents = new PortComponent[allDescriptions.size()];
  +
  +      for (int i = 0; i < portComponents.length; i++)
  +      {
  +         portComponents[i] =
  +                 new PortComponent(
  +                         (Node) allDescriptions.get(
  +                                 i), this, i);
  +      }
  +
  +      String wsdlFile = getWsdlFile();
  +      if (wsdlFile != null)
  +      {
  +         wsdlDocument = \
builder.parse(services.module.getDeploymentInfo().localCl.getResourceAsStream(wsdlFile));
  +         WSDLFactory wsdlFactory = new WSDLFactoryImpl();
  +         WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
  +         wsdlDefinition = wsdlReader.readWSDL(null, wsdlDocument);
  +      }
  +
  +      String jaxrpxFile = getJaxrpcMappingFile();
  +      if (jaxrpxFile != null)
  +      {
  +         jaxrpcDocument = \
builder.parse(services.module.getDeploymentInfo().localCl.getResourceAsStream(jaxrpxFile));
  +      }
  +   }
  +
  +   public Document getWsdlDocument()
  +   {
         return wsdlDocument;
      }
  -   
  -	public String getWebserviceDescriptionName() {
  -		return getChildValue("webservice-description-name");
  -	}
  -
  -	public String getWsdlFile() throws SAXException {
  -		return getValue(getUniqueChild("wsdl-file"));
  -	}
  -
  -	public String getJaxrpcMappingFile() throws SAXException {
  -		return getValue(getUniqueChild("jaxrpc-mapping-file"));
  -	}
   
  -   public PortComponent getPortComponent(int id) {
  +   public String getWebserviceDescriptionName()
  +   {
  +      return getChildValue("webservice-description-name");
  +   }
  +
  +   public String getWsdlFile() throws SAXException
  +   {
  +      return getValue(getUniqueChild("wsdl-file"));
  +   }
  +
  +   public String getJaxrpcMappingFile() throws SAXException
  +   {
  +      return getValue(getUniqueChild("jaxrpc-mapping-file"));
  +   }
  +
  +   public PortComponent getPortComponent(int id)
  +   {
         return portComponents[id];
      }
  -   
  -	/**
  -	 * Get the WSDL definition, which must previously be loaded
  -	 * @return a WSDL Definition
  -	 */
  -	public Definition getWsdlDefinition() {
  -		return wsdlDefinition;
  -	}
  -
  -	public String getServiceName() {
  -		return getWebserviceDescriptionName();
  -	}
  -
  -	/**
  -	 * Get the JAX-RPC document, which must previously be loaded
  -	 * @return a JAX-RPC document
  -	 */
  -	public Document getJaxrpcDocument() {
  -		return jaxrpcDocument;
  -	}
  -
  -	/**
  -	  * Add a service entry for each <code>webservice-description</code>
  -	  */
  -	protected void getDeploymentWSDD(StringBuffer buffer) {
  -		for(int count=0;count<portComponents.length;count++) {
  -			portComponents[count].getDeploymentWSDD(buffer);
  -		}
  -	}
  -
  -	/**
  -	 * Verify the webservice description
  -	 * @param wsd a <code>WebserviceDescription</code>
  -	 */
  -	public boolean verify(Logger log) {
  -      boolean result=true;
  -      for(int count=0;count<portComponents.length;count++) {
  -         result&=portComponents[count].verify(log);
  +
  +   /**
  +    * Get the WSDL definition, which must previously be loaded
  +    * @return a WSDL Definition
  +    */
  +   public Definition getWsdlDefinition()
  +   {
  +      return wsdlDefinition;
  +   }
  +
  +   public String getServiceName()
  +   {
  +      return getWebserviceDescriptionName();
  +   }
  +
  +   /**
  +    * Get the JAX-RPC document, which must previously be loaded
  +    * @return a JAX-RPC document
  +    */
  +   public Document getJaxrpcDocument()
  +   {
  +      return jaxrpcDocument;
  +   }
  +
  +   /**
  +    * Add a service entry for each <code>webservice-description</code>
  +    */
  +   protected void getDeploymentWSDD(StringBuffer buffer)
  +   {
  +      for (int count = 0; count < portComponents.length; count++)
  +      {
  +         portComponents[count].getDeploymentWSDD(buffer);
  +      }
  +   }
  +
  +   /**
  +    * Verify the webservice description
  +    * @param wsd a <code>WebserviceDescription</code>
  +    */
  +   public boolean verify(Logger log)
  +   {
  +      boolean result = true;
  +      for (int count = 0; count < portComponents.length; count++)
  +      {
  +         result &= portComponents[count].verify(log);
         }
         return result;
  -	}
  +   }
   
      /** generate wsdl into the given message context */
  -   public void generateWsdl(MessageContext ctx) {
  +   public void generateWsdl(MessageContext ctx)
  +   {
         // TODO compute new locations for the ports
  -      ctx.setProperty("WSDL",wsdlDocument);
  +      ctx.setProperty("WSDL", wsdlDocument);
      }
  -   
  +
      /**
       * this method serves to connect all ports linked
       * to particular ejbs with the correct container
       */
  -   public void registerEJBContainer(SessionContainer container) {
  -      for(int count=0;count<portComponents.length;count++) {
  +   public void registerEJBContainer(SessionContainer container)
  +   {
  +      for (int count = 0; count < portComponents.length; count++)
  +      {
            portComponents[count].registerEJBContainer(container);
  -      } 
  +      }
      }
   
   }
  
  
  
  1.3       +94 -82    \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/Webservices.java  
  Index: Webservices.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/Webservices.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Webservices.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ Webservices.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: Webservices.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: Webservices.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  @@ -31,102 +31,114 @@
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
    * @author <a href="mailto:Christoph.Jung@infor.de">Christoph G. Jung</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   
  -public class Webservices extends ElementBase {
  -   
  -	/** element name */
  -	public static String ELEMENT_NAME = "webservices";
  -	/** children */
  -	protected WebserviceDescription[] webserviceDescriptions;
  +public class Webservices extends ElementBase
  +{
  +
  +   /** element name */
  +   public static String ELEMENT_NAME = "webservices";
  +   /** children */
  +   protected WebserviceDescription[] webserviceDescriptions;
      /** the module that created us */
      protected WebServiceModule module;
  -   
  -	/**
  -	 * Construct a <code>Webservices</code> for a given <code>Node</code>
  -	 */
  -	public Webservices(Node node, DocumentBuilder builder, WebServiceModule parent)
  -		throws IOException, SAXException, WSDLException {
  -
  -		super(node);
  -
  -      this.module=parent;
  -      
  -		if (!ELEMENT_NAME.equals(node.getLocalName())) {
  -			throw new IllegalArgumentException(
  -				"invalid element name, expected '"
  -					+ ELEMENT_NAME
  -					+ "' but was '"
  -					+ node.getLocalName()
  -					+ "'");
  -		}
  -
  -		node.normalize();
  -
  -		// initialize the list of webservice descriptions
  -		List allDescriptions=getChildren(WebserviceDescription.ELEMENT_NAME);
  -		webserviceDescriptions=new WebserviceDescription[allDescriptions.size()];
  -		
  -		for (int i = 0; i < webserviceDescriptions.length; i++) {
  -			webserviceDescriptions[i]=
  -				new WebserviceDescription((Node) allDescriptions.get(
  -						i),builder,this,i);
  -		}
  -	}
  -
  -	/**
  -	 * @return
  -	 */
  -	public WebserviceDescription[] getWebserviceDescriptions() {
  -		return webserviceDescriptions;
  -	}
  -   
  +
  +   /**
  +    * Construct a <code>Webservices</code> for a given <code>Node</code>
  +    */
  +   public Webservices(Node node, DocumentBuilder builder, WebServiceModule parent)
  +           throws IOException, SAXException, WSDLException
  +   {
  +
  +      super(node);
  +
  +      this.module = parent;
  +
  +      if (!ELEMENT_NAME.equals(node.getLocalName()))
  +      {
  +         throw new IllegalArgumentException(
  +                 "invalid element name, expected '"
  +                 + ELEMENT_NAME
  +                 + "' but was '"
  +                 + node.getLocalName()
  +                 + "'");
  +      }
  +
  +      node.normalize();
  +
  +      // initialize the list of webservice descriptions
  +      List allDescriptions = getChildren(WebserviceDescription.ELEMENT_NAME);
  +      webserviceDescriptions = new WebserviceDescription[allDescriptions.size()];
  +
  +      for (int i = 0; i < webserviceDescriptions.length; i++)
  +      {
  +         webserviceDescriptions[i] =
  +                 new WebserviceDescription((Node) allDescriptions.get(
  +                         i), builder, this, i);
  +      }
  +   }
  +
  +   /**
  +    * @return
  +    */
  +   public WebserviceDescription[] getWebserviceDescriptions()
  +   {
  +      return webserviceDescriptions;
  +   }
  +
      /**
       * @return
       */
  -   public WebserviceDescription getWebserviceDescription(int pos) {
  +   public WebserviceDescription getWebserviceDescription(int pos)
  +   {
         return webserviceDescriptions[pos];
      }
  -	
  -	/**
  -	 * Convert the <code>webservices.xml</code> into an Axis deployment.wsdd
  -	 */
  -	public Document getDeploymentWSDD(DocumentBuilder builder)
  -		throws IOException, SAXException, ParserConfigurationException {
  -		StringBuffer buffer = new StringBuffer();
  -		buffer.append("<deployments>");		
  -		for (int i = 0; i < webserviceDescriptions.length; i++) {
  -			webserviceDescriptions[i].getDeploymentWSDD(buffer);
  -		}
  -		buffer.append("</deployments>");
  -		return builder.parse(
  -			new InputSource(new StringReader(buffer.toString())));
  -	}
  -
  -	/**
  -	 * verify the WSDL and JAXRPC mapping entries
  -	 * @param sdi a <code>DeploymentInfo</code>
  -	 */
  -	public boolean verify(Logger log) {
  -		boolean result=true;
  -      
  -      for (int i = 0; i < webserviceDescriptions.length; i++) {
  -			WebserviceDescription wsd = webserviceDescriptions[i];
  -			result&=wsd.verify(log);
  -		}
  -      
  -      return result; 
  -	}
  +
  +   /**
  +    * Convert the <code>webservices.xml</code> into an Axis deployment.wsdd
  +    */
  +   public Document getDeploymentWSDD(DocumentBuilder builder)
  +           throws IOException, SAXException, ParserConfigurationException
  +   {
  +      StringBuffer buffer = new StringBuffer();
  +      buffer.append("<deployments>");
  +      for (int i = 0; i < webserviceDescriptions.length; i++)
  +      {
  +         webserviceDescriptions[i].getDeploymentWSDD(buffer);
  +      }
  +      buffer.append("</deployments>");
  +      return builder.parse(
  +              new InputSource(new StringReader(buffer.toString())));
  +   }
  +
  +   /**
  +    * verify the WSDL and JAXRPC mapping entries
  +    * @param sdi a <code>DeploymentInfo</code>
  +    */
  +   public boolean verify(Logger log)
  +   {
  +      boolean result = true;
  +
  +      for (int i = 0; i < webserviceDescriptions.length; i++)
  +      {
  +         WebserviceDescription wsd = webserviceDescriptions[i];
  +         result &= wsd.verify(log);
  +      }
  +
  +      return result;
  +   }
   
      /**
       * this method serves to connect all services linked
       * to particular ejbs with the correct container
       */
  -   public void registerEJBContainer(SessionContainer container) {
  -      for(int count=0;count<webserviceDescriptions.length;count++) {
  +   public void registerEJBContainer(SessionContainer container)
  +   {
  +      for (int count = 0; count < webserviceDescriptions.length; count++)
  +      {
            webserviceDescriptions[count].registerEJBContainer(container);
  -      } 
  +      }
      }
   
   }
  
  
  
  1.3       +12 -10    \
contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/WsdlPort.java  
  Index: WsdlPort.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jboss.net/src/main/org/jboss/net/ws4ee/metadata/WsdlPort.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WsdlPort.java	31 Oct 2003 18:23:46 -0000	1.2
  +++ WsdlPort.java	31 Oct 2003 23:38:16 -0000	1.3
  @@ -5,16 +5,16 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: WsdlPort.java,v 1.2 2003/10/31 18:23:46 cgjung Exp $
  +// $Id: WsdlPort.java,v 1.3 2003/10/31 23:38:16 tdiesler Exp $
   
   package org.jboss.net.ws4ee.metadata;
   
  -import javax.xml.namespace.QName;
  -
   import org.jboss.logging.Logger;
   import org.w3c.dom.Node;
   import org.xml.sax.SAXException;
   
  +import javax.xml.namespace.QName;
  +
   
   /**
    * XML Binding element for \
<code>webservices/webservice-description/port-component/wsdl-port</code>  @@ -22,7 \
                +22,7 @@
    * @since 25. October 2003
    * @author <a href="mailto:thomas.diesler@arcor.de">Thomas Diesler</a>
    * @author <a href="mailto:christoph.jung@infor.de">Christoph G. Jung</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   
   public class WsdlPort extends ElementBase
  @@ -31,7 +31,7 @@
   
      protected PortComponent portComponent;
      protected QName qName;
  -   
  +
      WsdlPort(Node node, PortComponent pc) throws SAXException
      {
         super(node);
  @@ -39,15 +39,17 @@
         {
            throw new IllegalArgumentException("invalid element name, expected '" + \
ELEMENT_NAME + "' but was '" + node.getLocalName() + "'");  }
  -      portComponent=pc;
  -      qName=new QName(getValue(getUniqueChild("namespaceURI")),getValue(getUniqueChild("localpart")));
  +      portComponent = pc;
  +      qName = new QName(getValue(getUniqueChild("namespaceURI")), \
getValue(getUniqueChild("localpart")));  }
   
  -   public QName getQName() {
  +   public QName getQName()
  +   {
         return qName;
      }
  -   
  -   public boolean verify(Logger log) {
  +
  +   public boolean verify(Logger log)
  +   {
         // TODO check wether this qname is really accessible in the wsdl
         return true;
      }
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic