[jboss-svn-commits] JBossWS SVN: r807 - in tags/jbossws-1.0.3.GA/src: main/java/org/jboss/ws/metadata/jsr109 main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/config main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/interfaces main/resources/schema test/java/org/jboss/test/ws/tools test/java/org/jboss/test/ws/tools/jbws1090 test/resources/tools test/resources/tools/jbws1090
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 22 18:50:58 EDT 2006
Author: alex.guizar at jboss.com
Date: 2006-08-22 18:50:52 -0400 (Tue, 22 Aug 2006)
New Revision: 807
Added:
tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/
tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java
tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/
tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml
tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml
Removed:
tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml
tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml
Modified:
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/Configuration.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/interfaces/WSDotXMLCreatorIntf.java
tags/jbossws-1.0.3.GA/src/main/resources/schema/jbossws-tool_1_0.xsd
Log:
JBWS-1090
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.metadata.jsr109;
// $Id$
@@ -78,7 +78,7 @@
portComponents.toArray(array);
return array;
}
-
+
/**
* Get the QNames of the port components to be declared
* in the namespaces
@@ -90,15 +90,15 @@
//TODO:Check if there is just one QName that drives all portcomponents
//or each port component can have a distinct QName (namespace/prefix)
//Maintain uniqueness of the QName
- Map map = new HashMap();
+ Map map = new HashMap();
Iterator iter = portComponents.iterator();
- while(iter != null && iter.hasNext())
+ while (iter != null && iter.hasNext())
{
PortComponentMetaData pcm = (PortComponentMetaData)iter.next();
QName qname = pcm.getWsdlPort();
- map.put(qname.getPrefix(),qname);
+ map.put(qname.getPrefix(), qname);
}
- return map.values();
+ return map.values();
}
/**
@@ -155,7 +155,7 @@
{
this.jaxrpcMappingFile = jaxrpcMappingFile;
}
-
+
/**
* Serialize as a String
*
@@ -166,11 +166,11 @@
StringBuilder buffer = new StringBuilder("<webservice-description> <webservice-description-name>");
buffer.append(this.webserviceDescriptionName);
buffer.append("</webservice-description-name>");
- buffer.append("<wsdl-file>"+wsdlFile+"</wsdl-file>");
- buffer.append("<jaxrpc-mapping-file>"+jaxrpcMappingFile+"</jaxrpc-mapping-file>");
- for(PortComponentMetaData pm:portComponents)
- buffer.append(pm.serialize());
- buffer.append("</webservice-description></webservices>");
+ buffer.append("<wsdl-file>" + wsdlFile + "</wsdl-file>");
+ buffer.append("<jaxrpc-mapping-file>" + jaxrpcMappingFile + "</jaxrpc-mapping-file>");
+ for (PortComponentMetaData pm : portComponents)
+ buffer.append(pm.serialize());
+ buffer.append("</webservice-description>");
return buffer.toString();
}
}
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
// $Id$
package org.jboss.ws.metadata.jsr109;
@@ -31,7 +31,6 @@
import org.jboss.ws.Constants;
-
// $Id$
/**
@@ -72,7 +71,7 @@
webserviceDescriptions.toArray(array);
return array;
}
-
+
//Serialize as a String
public String serialize()
{
@@ -80,29 +79,30 @@
//Construct the webservices.xml definitions
List qnames = new ArrayList();
Iterator iter = webserviceDescriptions.iterator();
- while(iter != null && iter.hasNext())
+ while (iter != null && iter.hasNext())
{
WebserviceDescriptionMetaData wmd = (WebserviceDescriptionMetaData)iter.next();
qnames.addAll(wmd.getPortComponentQNames());
- }
- createHeader( buffer,qnames );
- for(WebserviceDescriptionMetaData wm:webserviceDescriptions)
- buffer.append(wm.serialize());
- return buffer.toString();
+ }
+ createHeader(buffer, qnames);
+ for (WebserviceDescriptionMetaData wm : webserviceDescriptions)
+ buffer.append(wm.serialize());
+ buffer.append("</webservices>");
+ return buffer.toString();
}
-
- private void createHeader( StringBuilder buf, List qnames)
- {
+
+ private void createHeader(StringBuilder buf, List qnames)
+ {
buf.append("<webservices xmlns='http://java.sun.com/xml/ns/j2ee'");
- buf.append(" xmlns:xsi='"+Constants.NS_SCHEMA_XSI+"'");
+ buf.append(" xmlns:xsi='" + Constants.NS_SCHEMA_XSI + "'");
//Lets append the port type namespaces
Iterator iter = qnames.iterator();
- while(iter != null && iter.hasNext())
+ while (iter != null && iter.hasNext())
{
QName qn = (QName)iter.next();
buf.append(" xmlns:").append(qn.getPrefix()).append("='").append(qn.getNamespaceURI()).append("'");
- }
+ }
buf.append(" xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'");
- buf.append(" version='1.1' >");
+ buf.append(" version='1.1' >");
}
}
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/Configuration.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/Configuration.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/Configuration.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.tools;
import java.util.ArrayList;
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
-
/**
* Configuration driving jbossws
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
@@ -46,13 +45,15 @@
public JavaToWSDLConfig getJavaToWSDLConfig(boolean createNew)
{
- if(createNew && j2wc == null) j2wc = new JavaToWSDLConfig();
+ if (createNew && j2wc == null)
+ j2wc = new JavaToWSDLConfig();
return j2wc;
}
- public WSDLToJavaConfig getWSDLToJavaConfig(boolean createNew)
+ public WSDLToJavaConfig getWSDLToJavaConfig(boolean createNew)
{
- if(createNew && w2jc == null) w2jc = new WSDLToJavaConfig();
+ if (createNew && w2jc == null)
+ w2jc = new WSDLToJavaConfig();
return w2jc;
}
@@ -61,21 +62,19 @@
*/
public GlobalConfig getGlobalConfig(boolean createNew)
{
- if( createNew && globalConfig == null)
+ if (createNew && globalConfig == null)
globalConfig = new GlobalConfig();
return globalConfig;
}
-
public void setGlobalConfig(GlobalConfig globalConfig)
{
this.globalConfig = globalConfig;
}
-
public void setJavaToWSDLConfig(JavaToWSDLConfig j2wc2)
{
- this.j2wc =j2wc2;
+ this.j2wc = j2wc2;
}
public void setWSDLToJavaConfig(WSDLToJavaConfig wsdl2jc)
@@ -88,69 +87,72 @@
*/
public class JavaToWSDLConfig
{
- /**
- * Is a jax-rpc mapping file needed?
- */
- public boolean mappingFileNeeded = false;
- /**
- * Name of the jax-rpc mapping file
- */
- public String mappingFileName = null;
- /**
- * Need webservices.xml file?
- */
- public boolean wsxmlFileNeeded = false;
- /**
- * Target Namespace
- */
- public String targetNamespace = null;
- /**
- * Type Namespace
- */
- public String typeNamespace = null;
- /**
- * Service Name
- */
- public String serviceName = null;
- /**
- * Endpoint Name
- */
- public String endpointName = null;
+ /**
+ * Is a jax-rpc mapping file needed?
+ */
+ public boolean mappingFileNeeded = false;
+ /**
+ * Name of the jax-rpc mapping file
+ */
+ public String mappingFileName = null;
+ /**
+ * Need webservices.xml file?
+ */
+ public boolean wsxmlFileNeeded = false;
+ /**
+ * Target Namespace
+ */
+ public String targetNamespace = null;
+ /**
+ * Type Namespace
+ */
+ public String typeNamespace = null;
+ /**
+ * Service Name
+ */
+ public String serviceName = null;
+ /**
+ * Endpoint Name
+ */
+ public String endpointName = null;
- /**
- * Style of WSDL. {"rpc","doc"}
- */
- public String wsdlStyle = "document";
+ /**
+ * Style of WSDL. {"rpc","doc"}
+ */
+ public String wsdlStyle = "document";
- public String parameterStyle = "wrapped";
- /**
- * WSDL Version {"1.1","2.0"}
- */
- public String wsdlVersion = "1.1";
- /**
- * Should Schema be included in the wsdl
- */
- public boolean includeSchemaInWSDL = true;
- public boolean restrictSchemaToTargetNS = false;
+ public String parameterStyle = "wrapped";
+ /**
+ * WSDL Version {"1.1","2.0"}
+ */
+ public String wsdlVersion = "1.1";
+ /**
+ * Should Schema be included in the wsdl
+ */
+ public boolean includeSchemaInWSDL = true;
+ public boolean restrictSchemaToTargetNS = false;
- public String servletLink = null;
- public String ejbLink = null;
+ public String servletLink = null;
+ public String ejbLink = null;
- public Map<String, List<OperationConfig>> operations = new HashMap<String, List<OperationConfig>>();
- public OperationConfig createOperationConfig()
- {
- return new OperationConfig();
- }
+ public boolean wsxmlFileAppend = false;
- /**Configuration at the operation level*/
- /*public OperationConfig opConfig = null;
+ public Map<String, List<OperationConfig>> operations = new HashMap<String, List<OperationConfig>>();
- public OperationConfig getOperationConfig(boolean createNew)
- {
- if(j2wc.opConfig == null)
- j2wc.opConfig = new OperationConfig();
- return j2wc.opConfig;
- }*/
+ public OperationConfig createOperationConfig()
+ {
+ return new OperationConfig();
+ }
+
+ /**Configuration at the operation level*/
+ /*public OperationConfig opConfig = null;
+
+ public OperationConfig getOperationConfig(boolean createNew)
+ {
+ if(j2wc.opConfig == null)
+ j2wc.opConfig = new OperationConfig();
+ return j2wc.opConfig;
+ }*/
}
/**
@@ -169,8 +171,8 @@
*/
public class GlobalConfig
{
- public String nscollide="Array";
- public Map<String,String> packageNamespaceMap = new HashMap<String,String>();
+ public String nscollide = "Array";
+ public Map<String, String> packageNamespaceMap = new HashMap<String, String>();
}
/**
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,29 +1,31 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.tools;
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.tools;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import javax.xml.namespace.QName;
@@ -35,35 +37,38 @@
import org.jboss.ws.metadata.jsr109.WebserviceDescriptionMetaData;
import org.jboss.ws.metadata.jsr109.WebservicesMetaData;
import org.jboss.ws.tools.interfaces.WSDotXMLCreatorIntf;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
* Creates the webservices.xml deployment descriptor
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
* @since Jun 20, 2005
- */
+ */
public class WSDotXMLCreator implements WSDotXMLCreatorIntf
-{
+{
// provide logging
protected static final Logger log = Logger.getLogger(WSDotXMLCreator.class);
protected String targetNamespace = null;
-
- protected String seiName = null;
-
- protected String portName = null;
-
- protected String serviceName=null;
-
+
+ protected String seiName = null;
+
+ protected String portName = null;
+
+ protected String serviceName = null;
+
protected String servletLink = null;
-
+
protected String ejbLink = null;
-
+
protected String wsdlFile = null;
protected String mappingFile = null;
-
+
+ protected boolean append = false;
+
public WSDotXMLCreator()
- {}
-
+ {
+ }
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setTargetNamespace(java.lang.String)
@@ -71,9 +76,7 @@
public void setTargetNamespace(String targetNamespace)
{
this.targetNamespace = targetNamespace;
- }
-
-
+ }
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setSeiName(java.lang.String)
@@ -81,8 +84,7 @@
public void setSeiName(String seiName)
{
this.seiName = seiName;
- }
-
+ }
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setPortName(java.lang.String)
@@ -90,7 +92,7 @@
public void setPortName(String portName)
{
this.portName = portName;
- }
+ }
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setServiceName(java.lang.String)
@@ -98,7 +100,7 @@
public void setServiceName(String serviceName)
{
this.serviceName = serviceName;
- }
+ }
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setEjbLink(java.lang.String)
@@ -107,7 +109,6 @@
{
this.ejbLink = ejbLink;
}
-
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setServletLink(java.lang.String)
@@ -116,8 +117,7 @@
{
this.servletLink = servletLink;
}
-
-
+
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setMappingFile(java.lang.String)
*/
@@ -125,78 +125,101 @@
{
this.mappingFile = mappingFile;
}
-
+
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#setWsdlFile(java.lang.String)
*/
public void setWsdlFile(String wsdlFile)
{
this.wsdlFile = wsdlFile;
- }
-
-
+ }
+
+ public void setAppend(boolean append)
+ {
+ this.append = append;
+ }
+
/* (non-Javadoc)
* @see org.jboss.ws.tools.WSDotXMLCreatorIntf#generateWSXMLDescriptor(java.io.File)
*/
public void generateWSXMLDescriptor(File file) throws IOException
{
- WebservicesMetaData webservices = constructWSMetaData();
- String wmdata = webservices.serialize();
- Element act = DOMUtils.parse(wmdata);
+ WebservicesMetaData webservices = constructWSMetaData();
+
+ Element webservicesElem;
+ if (append && file.exists())
+ {
+ // append generated webservice descriptions to existing file
+ // parse existing file
+ InputStream wsxmlStream = new FileInputStream(file);
+ webservicesElem = DOMUtils.parse(wsxmlStream);
+ wsxmlStream.close();
+
+ // obtain <webservice-description> subelements and append them to <webservices>
+ Document webservicesDoc = webservicesElem.getOwnerDocument();
+ for (WebserviceDescriptionMetaData wsdescription : webservices.getWebserviceDescriptions())
+ {
+ String wsdescriptionString = wsdescription.serialize();
+ Element wsdescriptionElem = DOMUtils.parse(wsdescriptionString);
+ webservicesElem.appendChild(webservicesDoc.importNode(wsdescriptionElem, true));
+ }
+ }
+ else
+ {
+ // write generated webservices descriptor to new file
+ String wmdata = webservices.serialize();
+ webservicesElem = DOMUtils.parse(wmdata);
+ }
+
FileWriter fw = new FileWriter(file);
- fw.write( DOMWriter.printNode(act,true) );
+ fw.write(DOMWriter.printNode(webservicesElem, true));
fw.close();
}
-
+
//PRIVATE METHODS
-
+
private WebservicesMetaData constructWSMetaData()
{
WebservicesMetaData wm = new WebservicesMetaData(null);
WebserviceDescriptionMetaData wsdm = new WebserviceDescriptionMetaData(wm);
populateWebserviceDescriptionMetaData(wsdm);
wm.addWebserviceDescription(wsdm);
- return wm;
+ return wm;
}
-
+
private void populateWebserviceDescriptionMetaData(WebserviceDescriptionMetaData wsdm)
{
checkEssentials();
wsdm.setWebserviceDescriptionName(this.serviceName);
wsdm.setWsdlFile(this.wsdlFile);
- wsdm.setJaxrpcMappingFile(this.mappingFile);
+ wsdm.setJaxrpcMappingFile(this.mappingFile);
PortComponentMetaData pm1 = new PortComponentMetaData(wsdm);
- pm1.setPortComponentName(portName);
- pm1.setWsdlPort(new QName(this.targetNamespace, portName ,"impl") );
+ pm1.setPortComponentName(portName);
+ pm1.setWsdlPort(new QName(this.targetNamespace, portName, "impl"));
pm1.setServiceEndpointInterface(seiName);
- if(this.servletLink != null && this.servletLink.length() > 0 )
- pm1.setServletLink(this.servletLink);
- else
- pm1.setEjbLink(this.ejbLink);
+ if (this.servletLink != null && this.servletLink.length() > 0)
+ pm1.setServletLink(this.servletLink);
+ else pm1.setEjbLink(this.ejbLink);
wsdm.addPortComponent(pm1);
}
-
+
private void checkEssentials()
{
- if(serviceName == null)
+ if (serviceName == null)
throw new WSException("serviceName is null");
- if(wsdlFile == null)
+ if (wsdlFile == null)
throw new WSException("wsdlFile is null");
- if(mappingFile == null)
+ if (mappingFile == null)
throw new WSException("mappingFile is null");
- if(targetNamespace == null)
+ if (targetNamespace == null)
throw new WSException("targetNamespace is null");
- if(portName == null)
+ if (portName == null)
throw new WSException("portName is null");
- if(seiName == null)
+ if (seiName == null)
throw new WSException("seiName is null");
- if(servletLink == null && ejbLink == null)
+ if (servletLink == null && ejbLink == null)
throw new WSException("Either servletLink or ejbLink should not be null");
- if(servletLink != null && ejbLink != null)
+ if (servletLink != null && ejbLink != null)
throw new WSException("One of servletLink or ejbLink should be null");
}
}
-
-
-
-
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -75,6 +75,7 @@
private static final String PACKAGE_ATTRIBUTE = "package";
private static final String EJB_LINK_ATTRIBUTE = "ejb-link";
private static final String SERVLET_LINK_ATTRIBUTE = "servlet-link";
+ private static final String APPEND_ATTRIBUTE = "append";
private static final String TYPE_NAMESPACE_ATTRIBUTE = "type-namespace";
private static final String TARGET_NAMESPACE_ATTRIBUTE = "target-namespace";
private static final String RETURN_XML_NAME_ATTRIBUTE = "return-xml-name";
@@ -89,7 +90,6 @@
// provide logging
private static final Logger log = Logger.getLogger(ToolsSchemaConfigReader.class);
-
public ToolsSchemaConfigReader()
{
}
@@ -148,7 +148,7 @@
}
if (config.getJavaToWSDLConfig(false) == null && config.getWSDLToJavaConfig(false) == null)
- throw new WSException("Invalid configuration file, either " + JAVA_WSDL_TAG + ", or " + WSDL_JAVA_TAG + " must be present");
+ throw new WSException("Invalid configuration file, either " + JAVA_WSDL_TAG + ", or " + WSDL_JAVA_TAG + " must be present");
log.trace("Exit readConfig");
return config;
@@ -212,7 +212,7 @@
operation.isOneWay = "true".equals(oneWay) || "1".equals(oneWay);
String returnXmlName = attrs.getValue(RETURN_XML_NAME_ATTRIBUTE);
if (returnXmlName != null)
- operation.returnXmlName = navigator.resolveQName(returnXmlName);
+ operation.returnXmlName = navigator.resolveQName(returnXmlName);
return operation;
}
@@ -236,7 +236,8 @@
j2wsdlc.ejbLink = getOptionalAttribute(attrs, EJB_LINK_ATTRIBUTE, null);
if (j2wsdlc.ejbLink == null && j2wsdlc.servletLink == null)
throw new WSException("Either servletLink or ejbLink should be specified");
-
+ String wsxmlFileAppend = attrs.getValue(APPEND_ATTRIBUTE);
+ j2wsdlc.wsxmlFileAppend = "true".equals(wsxmlFileAppend) || "1".equals(wsxmlFileAppend);
}
return j2wsdlc;
}
@@ -346,7 +347,6 @@
return root;
}
-
//PRIVATE METHODS
private String getOptionalAttribute(Attributes attrs, String attribName, String defaultValue)
{
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -188,6 +188,7 @@
wscr.setWsdlFile("META-INF/wsdl/" + j2wc.serviceName + ".wsdl");
wscr.setEjbLink(j2wc.ejbLink);
}
+ wscr.setAppend(j2wc.wsxmlFileAppend);
wscr.generateWSXMLDescriptor(new File(outDir + "/webservices.xml"));
}
}
Modified: tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/interfaces/WSDotXMLCreatorIntf.java
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/interfaces/WSDotXMLCreatorIntf.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/java/org/jboss/ws/tools/interfaces/WSDotXMLCreatorIntf.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,29 +1,29 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.tools.interfaces;
import java.io.File;
import java.io.IOException;
-
+
/**
* Defines the contract for webservices.xml creating agents
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
@@ -31,58 +31,58 @@
*/
public interface WSDotXMLCreatorIntf
-{
-
+{
+
/**
* Generate the webservices.xml file
* @throws IOException
*/
- public void generateWSXMLDescriptor(File file) throws IOException;
-
+ public void generateWSXMLDescriptor(File file) throws IOException;
/**
* @param targetNamespace The targetNamespace to set.
*/
- public void setTargetNamespace(String targetNamespace);
-
+ public void setTargetNamespace(String targetNamespace);
/**
* @param seiName The seiName to set.
*/
- public void setSeiName(String seiName);
-
+ public void setSeiName(String seiName);
/**
* @param portName The portName to set.
*/
- public void setPortName(String portName);
-
+ public void setPortName(String portName);
/**
* @param serviceName The serviceName to set.
*/
public void setServiceName(String serviceName);
-
/**
* @param ejbLink The ejbLink to set.
*/
- public void setEjbLink(String ejbLink);
-
+ public void setEjbLink(String ejbLink);
/**
* @param servletLink The servletLink to set.
*/
- public void setServletLink(String servletLink);
-
+ public void setServletLink(String servletLink);
+
/**
* @param mappingFileEntry The mapping file entry
*/
public void setMappingFile(String mappingFileEntry);
-
+
/**
*
* @param wsdlFileEntry The wsdl-file entry
*/
public void setWsdlFile(String wsdlFileEntry);
+
+ /**
+ *
+ * @param append add ws descriptions to existing webservices.xml file, if any
+ */
+ public void setAppend(boolean append);
}
Modified: tags/jbossws-1.0.3.GA/src/main/resources/schema/jbossws-tool_1_0.xsd
===================================================================
--- tags/jbossws-1.0.3.GA/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-08-22 22:50:52 UTC (rev 807)
@@ -196,6 +196,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="append" type="xs:boolean" use="optional" />
</xs:complexType>
<xs:complexType name="javaToWsdlType">
<xs:sequence>
Copied: tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090 (from rev 806, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090)
Added: tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1090;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * @author <a href="mailto:alex.guizar at jboss.com">Alejandro Guizar</a>
+ * @version $Revision: 806 $
+ */
+public interface AdditionalEndpoint extends Remote
+{
+ public String sayHello(String name) throws RemoteException;
+}
Deleted: tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1090;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.nio.channels.FileChannel;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.ws.tools.WSTools;
-import org.w3c.dom.Element;
-
-/**
- * Test append web service descriptions to existing webservices.xml (JBWS-1090)
- *
- * @author <a href="mailto:alex.guizar at jboss.com">Alejandro Guizar</a>
- * @version $Revision$
- */
-public class JBWS1090TestCase extends JBossWSTest
-{
- public void testWebServicesAppend() throws Exception
- {
- // create output dir
- File outputDir = new File("tools/jbws1090");
- outputDir.mkdirs();
- // copy webservices.xml fixture to output folder
- FileChannel src = new FileInputStream("resources/tools/metadatafixture/webservices.xml").getChannel();
- FileChannel dest = new FileOutputStream("tools/jbws1090/webservices.xml").getChannel();
- src.transferTo(0L, src.size(), dest);
- src.close();
- dest.close();
-
- // run wstools
- String[] args = { "-dest", "tools/jbws1090", "-config", "resources/tools/jbws1090/wstools-config.xml" };
- new WSTools().generate(args);
-
- Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1090/webservices.xml"));
- Element was = DOMUtils.parse(new FileInputStream("tools/jbws1090/webservices.xml"));
- assertEquals(expected, was);
- }
-}
Copied: tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java (from rev 806, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java)
Copied: tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090 (from rev 806, branches/jbossws-1.0/src/test/resources/tools/jbws1090)
Deleted: tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://test.jboss.org/ws4eesimple"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
-
- <webservice-description>
- <webservice-description-name>HelloWsService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>ValidURL</port-component-name>
- <wsdl-port>impl:ValidURLPort</wsdl-port>
- <service-endpoint-interface>
- org.jboss.test.webservice.ws4eesimple.HelloWs
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloJavaBean</servlet-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <port-component-name>InvalidURL</port-component-name>
- <wsdl-port>impl:InvalidURLPort</wsdl-port>
- <service-endpoint-interface>
- org.jboss.test.webservice.ws4eesimple.HelloWs
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloJavaBean</servlet-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <port-component-name>ValidSecureURL</port-component-name>
- <wsdl-port>impl:ValidSecureURLPort</wsdl-port>
- <service-endpoint-interface>
- org.jboss.test.webservice.ws4eesimple.HelloWs
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloJavaBean</servlet-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <port-component-name>InvalidSecureURL</port-component-name>
- <wsdl-port>impl:InvalidSecureURLPort</wsdl-port>
- <service-endpoint-interface>
- org.jboss.test.webservice.ws4eesimple.HelloWs
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloJavaBean</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
- <webservice-description>
- <webservice-description-name>HelloService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>HelloEndpointPort</port-component-name>
- <wsdl-port>impl:HelloEndpointPort</wsdl-port>
- <service-endpoint-interface>
- org.jboss.test.ws.tools.jbws1090.HelloEndpoint
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
-</webservices>
\ No newline at end of file
Copied: tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml (from rev 806, branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml)
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/webservices.xml 2006-08-22 22:50:52 UTC (rev 807)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:impl="http://test.jboss.org/ws4eesimple"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
+ version="1.1">
+
+ <webservice-description>
+ <webservice-description-name>HelloWsService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>ValidURL</port-component-name>
+ <wsdl-port>impl:ValidURLPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>HelloJavaBean</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ <port-component>
+ <port-component-name>InvalidURL</port-component-name>
+ <wsdl-port>impl:InvalidURLPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>HelloJavaBean</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ <port-component>
+ <port-component-name>ValidSecureURL</port-component-name>
+ <wsdl-port>impl:ValidSecureURLPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>HelloJavaBean</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ <port-component>
+ <port-component-name>InvalidSecureURL</port-component-name>
+ <wsdl-port>impl:InvalidSecureURLPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>HelloJavaBean</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+
+ <webservice-description>
+ <webservice-description-name>AdditionalService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/AdditionalService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/additional-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>AdditionalEndpointPort</port-component-name>
+ <wsdl-port>impl:AdditionalEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.tools.jbws1090.AdditionalEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>AdditionalServlet</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+
+</webservices>
\ No newline at end of file
Deleted: tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml 2006-08-22 22:50:52 UTC (rev 807)
@@ -1,14 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <java-wsdl>
- <service name="HelloService"
- endpoint="org.jboss.test.ws.tools.jbws1090.HelloEndpoint" style="rpc" />
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1090"
- type-namespace="http://org.jboss.test.ws/jbws1090/type" />
- <mapping file="jaxrpc-mapping.xml" />
- <webservices servlet-link="HelloEndpoint" append="true" />
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml (from rev 806, branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml)
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml 2006-08-22 17:47:22 UTC (rev 806)
+++ tags/jbossws-1.0.3.GA/src/test/resources/tools/jbws1090/wstools-config.xml 2006-08-22 22:50:52 UTC (rev 807)
@@ -0,0 +1,14 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="AdditionalService"
+ endpoint="org.jboss.test.ws.tools.jbws1090.AdditionalEndpoint" style="rpc" />
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1090"
+ type-namespace="http://org.jboss.test.ws/jbws1090/type" />
+ <mapping file="additional-mapping.xml" />
+ <webservices servlet-link="AdditionalServlet" append="true" />
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list