JBossWS SVN: r1916 - branches/tdiesler/trunk/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 18:11:28 -0500 (Wed, 10 Jan 2007)
New Revision: 1916
Modified:
branches/tdiesler/trunk/build/ant-import/build-release.xml
Log:
[JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded
Modified: branches/tdiesler/trunk/build/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-release.xml 2007-01-10 22:49:48 UTC (rev 1915)
+++ branches/tdiesler/trunk/build/ant-import/build-release.xml 2007-01-10 23:11:28 UTC (rev 1916)
@@ -174,17 +174,15 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss50.output.lib.dir}">
- <include name="jbossws50.sar"/>
- <include name="jbossws50-deployer.zip"/>
- </fileset>
- <fileset dir="${jboss42.output.lib.dir}">
- <include name="jbossws42.sar"/>
- </fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- </fileset>
</copy>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/>
<!-- lib/jboss-jdk14 -->
<copy todir="${build.bin.dist}/lib/jboss-jdk14" overwrite="true">
@@ -193,11 +191,12 @@
<include name="jboss-saaj.jar"/>
</fileset>
<fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40-jdk14.sar"/>
<include name="jbossws14-client.jar"/>
<include name="jboss-jaxws14.jar"/>
</fileset>
</copy>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
<!-- lib/tomcat -->
<copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
18 years
- 1
- 0
JBossWS SVN: r1915 - branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 17:49:48 -0500 (Wed, 10 Jan 2007)
New Revision: 1915
Added:
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java
Log:
add missing file
Added: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java 2007-01-10 22:49:48 UTC (rev 1915)
@@ -0,0 +1,46 @@
+/*
+ * 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.core;
+
+/**
+ * A RuntimeException that that indicates client timeout
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 06-Jan-2006
+ */
+public class WSTimeoutException extends RuntimeException
+{
+ private long timeout;
+
+ public WSTimeoutException(String message, long timeout)
+ {
+ super(message);
+ this.timeout = timeout;
+ }
+
+ public long getTimeout()
+ {
+ return timeout;
+ }
+
+
+}
Property changes on: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1914 - in branches/dlofthouse/JBWS-1259: jbossws-core/src/main/java/org/jboss/ws/tools/wsdl and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 17:49:33 -0500 (Wed, 10 Jan 2007)
New Revision: 1914
Added:
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml
Modified:
branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java
branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
JBWS-1259 - Initial test case and fix for first stack overflow.
Modified: branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -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.wsdl.xmlschema;
import java.io.IOException;
@@ -77,7 +77,6 @@
this.targetNamespace = targetNamespace;
}
-
/**
* Checks whether given a targetNS and other regular schema namespaces,
* the passed "checkNS" is a custom namespace
@@ -87,15 +86,14 @@
*/
public boolean checkCustomNamespace(String targetNS, String checkNS)
{
- String[] nsarr = new String[] {xsNS,Constants.NS_SCHEMA_XSI };
+ String[] nsarr = new String[] { xsNS, Constants.NS_SCHEMA_XSI };
List<String> knownNamespaces = Arrays.asList(nsarr);
boolean isCustom = false;
- if(xsNS.equals(targetNS))
- throw new IllegalArgumentException("targetNamespace cannot be "+xsNS );
- if(checkNS == null)
+ if (xsNS.equals(targetNS))
+ throw new IllegalArgumentException("targetNamespace cannot be " + xsNS);
+ if (checkNS == null)
throw new IllegalArgumentException("checkNS is null");
- if(knownNamespaces.contains(checkNS) == false &&
- targetNS.equals(checkNS) == false)
+ if (knownNamespaces.contains(checkNS) == false && targetNS.equals(checkNS) == false)
isCustom = true;
return isCustom;
}
@@ -108,8 +106,7 @@
* @return
*/
- public JBossXSElementDeclaration createGlobalXSElementDeclaration(String name, XSTypeDefinition xstype,
- String targetNS)
+ public JBossXSElementDeclaration createGlobalXSElementDeclaration(String name, XSTypeDefinition xstype, String targetNS)
{
JBossXSElementDeclaration xsel = new JBossXSElementDeclaration();
xsel.setName(name);
@@ -130,11 +127,10 @@
return new JBossXSModel();
}
- public JBossXSComplexTypeDefinition createXSComplexTypeDefinition( String name,
- XSTypeDefinition baseType, List<XSParticle> xsparts, String typens)
+ public JBossXSComplexTypeDefinition createXSComplexTypeDefinition(String name, XSTypeDefinition baseType, List<XSParticle> xsparts, String typens)
{
//No complex type if particles are null
- if(xsparts == null)
+ if (xsparts == null)
return null;
JBossXSComplexTypeDefinition ct = new JBossXSComplexTypeDefinition();
@@ -147,18 +143,17 @@
// Plug the particle array into the modelgroup
JBossXSParticle xspa = new JBossXSParticle(null, typens);
xspa.setTerm(group);
- ((JBossXSComplexTypeDefinition) ct).setParticle(xspa);
+ ((JBossXSComplexTypeDefinition)ct).setParticle(xspa);
if (baseType != null)
{
- ((JBossXSComplexTypeDefinition) ct).setDerivationMethod(XSConstants.DERIVATION_EXTENSION);
- ((JBossXSComplexTypeDefinition) ct).setBaseType(baseType);
+ ((JBossXSComplexTypeDefinition)ct).setDerivationMethod(XSConstants.DERIVATION_EXTENSION);
+ ((JBossXSComplexTypeDefinition)ct).setBaseType(baseType);
}
return ct;
}
-
/**
* Create a local XSElementDeclaration object
* @param name
@@ -168,7 +163,7 @@
* @return
*/
- public JBossXSElementDeclaration createXSElementDeclaration(String name, XSTypeDefinition xstype,boolean isNillable)
+ public JBossXSElementDeclaration createXSElementDeclaration(String name, XSTypeDefinition xstype, boolean isNillable)
{
JBossXSElementDeclaration xsel = new JBossXSElementDeclaration();
xsel.setName(name);
@@ -186,7 +181,6 @@
return xsp;
}
-
/**
* Creates a XSTypeDefinition object given a QName
*
@@ -201,7 +195,6 @@
return jbxs;
}
-
/**
* Generate a complex type for a custom exception
* @param exname
@@ -213,12 +206,11 @@
{
JBossXSParticle xsp = new JBossXSParticle();
/*xsp.setType(XSConstants.ELEMENT_DECLARATION);
- xsp.setMaxOccurs(-1);
- JBossXSElementDeclaration xsel = (JBossXSElementDeclaration)createXSElementDeclaration("name", utils.getSchemaBasicType("string"), true);
+ xsp.setMaxOccurs(-1);
+ JBossXSElementDeclaration xsel = (JBossXSElementDeclaration)createXSElementDeclaration("name", utils.getSchemaBasicType("string"), true);
- xsp.setTerm(xsel); */
- XSComplexTypeDefinition ct =
- new JBossXSComplexTypeDefinition(exname, ns);
+ xsp.setTerm(xsel); */
+ XSComplexTypeDefinition ct = new JBossXSComplexTypeDefinition(exname, ns);
((JBossXSComplexTypeDefinition)ct).setParticle(xsp);
return ct;
@@ -233,10 +225,10 @@
*/
public JBossXSModel getJBossXSModel(XSModel xsmodel)
{
- if(xsmodel instanceof JBossXSModel)
+ if (xsmodel instanceof JBossXSModel)
return (JBossXSModel)xsmodel;
JBossXSModel jbxs = new JBossXSModel();
- copyXSModel(xsmodel,jbxs);
+ copyXSModel(xsmodel, jbxs);
return jbxs;
}
@@ -248,18 +240,21 @@
*/
public boolean isEmptySchema(JBossXSModel xsmodel, String namespace)
{
- if(xsmodel == null) return true;
- if(namespace == null) throw new WSException("Target Namespace of xsmodel is null");
+ if (xsmodel == null)
+ return true;
+ if (namespace == null)
+ throw new WSException("Target Namespace of xsmodel is null");
XSNamedMap tmap = xsmodel.getComponentsByNamespace(XSConstants.TYPE_DEFINITION, namespace);
XSNamedMap emap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, namespace);
- if (tmap != null && tmap.getLength() > 0) return false;
- if (emap != null && emap.getLength() > 0) return false;
+ if (tmap != null && tmap.getLength() > 0)
+ return false;
+ if (emap != null && emap.getLength() > 0)
+ return false;
return true;
}
-
/**
* Serialize the SchemaModel into a Writer
* @param xsmodel Schema Model which needs to be serialized
@@ -269,7 +264,7 @@
public void serialize(XSModel xsmodel, Writer writer) throws IOException
{
StringBuilder buffer = new StringBuilder();
- if(xsmodel instanceof JBossXSModel)
+ if (xsmodel instanceof JBossXSModel)
{
String str = ((JBossXSModel)xsmodel).serialize();
buffer.append(str);
@@ -286,7 +281,6 @@
writer.write(buffer.toString());
}
-
/**
* Serialize the SchemaModel (with no types and elements) into a Writer
* @param xsmodel Schema Model which needs to be serialized
@@ -316,7 +310,7 @@
public String write(XSElementDeclaration xsel, XSParticle xsp)
{
XSTypeDefinition xst = xsel.getTypeDefinition();
- if(xst == null)
+ if (xst == null)
throw new IllegalStateException("Type xst is null");
boolean isGlobalRef = (xsel.getScope() == XSConstants.SCOPE_GLOBAL);
@@ -326,7 +320,7 @@
String elname = xsel.getName();
String prefix = null;
- if(isGlobalRef)
+ if (isGlobalRef)
{
String namespace = xsel.getNamespace();
prefix = getPrefix(namespace);
@@ -337,14 +331,14 @@
String namespace = xst.getNamespace();
String typename = xst.getName();
- if (! Constants.NS_SCHEMA_XSD.equals(namespace))
+ if (!Constants.NS_SCHEMA_XSD.equals(namespace))
{
prefix = getPrefix(namespace);
typename = prefix + ":" + typename;
}
buf.append("<element name='" + elname + "'");
- if(! isAnonType)
+ if (!isAnonType)
buf.append(" type='" + typename + "' ");
}
@@ -357,16 +351,14 @@
{
if (xsp.getMaxOccursUnbounded())
buf.append(" maxOccurs='unbounded' ");
- else
- buf.append(" maxOccurs='" + xsp.getMaxOccurs() + "'");
+ else buf.append(" maxOccurs='" + xsp.getMaxOccurs() + "'");
buf.append(" minOccurs='" + xsp.getMinOccurs() + "'");
}
- if(! isAnonType)
+ if (isAnonType == false || isGlobalRef == true)
buf.append("/>");
- else
- buf.append(">").append(write(xst)).append("</element>");
+ else buf.append(">").append(write(xst)).append("</element>");
return buf.toString();
}
@@ -374,7 +366,7 @@
public String write(XSAttributeDeclaration decl)
{
XSTypeDefinition xst = decl.getTypeDefinition();
- if(xst == null)
+ if (xst == null)
throw new IllegalStateException("Type xst is null");
boolean isGlobalRef = (decl.getScope() == XSConstants.SCOPE_GLOBAL);
@@ -395,21 +387,20 @@
String namespace = xst.getNamespace();
String typename = xst.getName();
- if (! Constants.NS_SCHEMA_XSD.equals(namespace))
+ if (!Constants.NS_SCHEMA_XSD.equals(namespace))
{
prefix = getPrefix(namespace);
typename = prefix + ":" + typename;
}
buf.append("<attribute name='" + name + "'");
- if(! isAnonType)
+ if (!isAnonType)
buf.append(" type='" + typename + "' ");
}
- if(! isAnonType)
+ if (!isAnonType)
buf.append("/>");
- else
- buf.append(">").append(write(xst)).append("</attribute>");
+ else buf.append(">").append(write(xst)).append("</attribute>");
return buf.toString();
}
@@ -434,25 +425,22 @@
String namespace = xst.getNamespace();
String prefix = null;
- if (! Constants.NS_SCHEMA_XSD.equals(namespace))
+ if (!Constants.NS_SCHEMA_XSD.equals(namespace))
{
prefix = getPrefix(namespace);
typename = prefix + ":" + typename;
}
buf.append("<element name='" + elname + "'");
- if(!isAnonType)
+ if (!isAnonType)
buf.append(" type='" + typename + "' ");
- else
- buf.append(">").append(write(xst));
+ else buf.append(">").append(write(xst));
- if (xsel.getNillable() &&
- xsel.getScope() != XSConstants.SCOPE_GLOBAL)
+ if (xsel.getNillable() && xsel.getScope() != XSConstants.SCOPE_GLOBAL)
buf.append(" nillable='true' ");
- if(!isAnonType)
+ if (!isAnonType)
buf.append("/>");
- else
- buf.append("</element>");
+ else buf.append("</element>");
return buf.toString();
}
@@ -474,13 +462,12 @@
XSParticle jxsp = (XSParticle)objlist.item(i);
XSTerm xterm = jxsp.getTerm();
short termType = xterm.getType();
- if(termType == XSConstants.ELEMENT_DECLARATION)
+ if (termType == XSConstants.ELEMENT_DECLARATION)
{
XSElementDeclaration xsel = (XSElementDeclaration)jxsp.getTerm();
buf.append(this.write(xsel, jxsp));
}
- else
- if ( termType == XSConstants.MODEL_GROUP)
+ else if (termType == XSConstants.MODEL_GROUP)
{
XSObjectList olist = ((XSModelGroup)xterm).getParticles();
int lobj = olist != null ? olist.getLength() : 0;
@@ -489,18 +476,16 @@
XSParticle jxp = (XSParticle)olist.item(k);
XSTerm xsterm = jxp.getTerm();
termType = xsterm.getType();
- if(termType == XSConstants.ELEMENT_DECLARATION)
+ if (termType == XSConstants.ELEMENT_DECLARATION)
buf.append(write((XSElementDeclaration)xsterm, jxsp));
- else
- if(termType == XSConstants.MODEL_GROUP && k > 0)
- buf.append(write((XSModelGroup)xsterm));
+ else if (termType == XSConstants.MODEL_GROUP && k > 0)
+ buf.append(write((XSModelGroup)xsterm));
}
}
}
return buf.toString();
}
-
/**
* Return a string for the xs type
* @param xstype
@@ -517,9 +502,9 @@
String jxsTypeName = jxstype.getName();
boolean isSimple = jxstype.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_SIMPLE;
- if(xstype.getAnonymous()) buf.append("<complexType>");
- else
- buf.append("<complexType name='" + jxsTypeName + "'>");
+ if (xstype.getAnonymous())
+ buf.append("<complexType>");
+ else buf.append("<complexType name='" + jxsTypeName + "'>");
XSTypeDefinition xsbase = (XSTypeDefinition)jxstype.getBaseType();
String baseType = null;
@@ -533,12 +518,13 @@
}
XSParticle xsp = jxstype.getParticle();
- if (xsp != null) appendComplexTypeDefinition(buf,jxstype);
+ if (xsp != null)
+ appendComplexTypeDefinition(buf, jxstype);
XSObjectList list = jxstype.getAttributeUses();
for (int i = 0; i < list.getLength(); i++)
{
- XSAttributeUse use = (XSAttributeUse) list.item(i);
+ XSAttributeUse use = (XSAttributeUse)list.item(i);
XSAttributeDeclaration decl = use.getAttrDeclaration();
buf.append(write(decl));
}
@@ -560,7 +546,7 @@
{
String baseType = xsbase.getName();
String ns = xsbase.getNamespace();
- if (! Constants.NS_SCHEMA_XSD.equals(ns))
+ if (!Constants.NS_SCHEMA_XSD.equals(ns))
{
String prefix = getPrefix(ns);
baseType = prefix + ":" + baseType;
@@ -572,7 +558,7 @@
for (int i = 0; i < list.getLength(); i++)
{
String listItem = DOMWriter.normalize(list.item(i), false);
- buf.append("<enumeration value='" + listItem +"'/>");
+ buf.append("<enumeration value='" + listItem + "'/>");
}
buf.append("</restriction>");
}
@@ -582,7 +568,7 @@
return buf.toString();
}
-// Private methods
+ // Private methods
private void appendSchemaDefinitions(StringBuilder buffer, XSNamespaceItemList itemlist)
{
@@ -594,13 +580,14 @@
String ns = nsitem.getSchemaNamespace();
//Ignore the one for xsd
- if (Constants.NS_SCHEMA_XSD.equals(ns)) continue;
+ if (Constants.NS_SCHEMA_XSD.equals(ns))
+ continue;
buffer.append(utils.getSchemaDefinitions(ns));
} //end for
}
- private void appendComplexTypeDefinition(StringBuilder buf , XSComplexTypeDefinition jxstype)
+ private void appendComplexTypeDefinition(StringBuilder buf, XSComplexTypeDefinition jxstype)
{
XSParticle xsp = jxstype.getParticle();
XSTerm xsterm = xsp.getTerm();
@@ -651,10 +638,11 @@
}
else if (xterm instanceof XSModelGroup)
{
- if(deriveMethod == XSConstants.DERIVATION_EXTENSION && i != lenobj -1)
+ if (deriveMethod == XSConstants.DERIVATION_EXTENSION && i != lenobj - 1)
continue;
- if (i == 0) continue;//Ignore as it provides the baseclass sequence of elements
+ if (i == 0)
+ continue;//Ignore as it provides the baseclass sequence of elements
XSObjectList olist = ((XSModelGroup)xterm).getParticles();
int lobj = olist != null ? olist.getLength() : 0;
for (int k = 0; k < lobj; k++)
@@ -662,11 +650,10 @@
XSParticle jxp = (XSParticle)olist.item(k);
XSTerm jxpterm = jxp.getTerm();
short termType = jxpterm.getType();
- if(termType == XSConstants.ELEMENT_DECLARATION)
+ if (termType == XSConstants.ELEMENT_DECLARATION)
buf.append(write((XSElementDeclaration)jxpterm, jxsp));
- else
- if(termType == XSConstants.MODEL_GROUP)
- buf.append(write((XSModelGroup)jxpterm));
+ else if (termType == XSConstants.MODEL_GROUP)
+ buf.append(write((XSModelGroup)jxpterm));
}
}
}
@@ -682,12 +669,12 @@
for (int i = 0; i < len; i++)
{
XSTypeDefinition xstype = (XSTypeDefinition)xsmap.item(i);
- if (Constants.NS_SCHEMA_XSD.equals(xstype.getNamespace())) continue;
+ if (Constants.NS_SCHEMA_XSD.equals(xstype.getNamespace()))
+ continue;
buffer.append(this.write(xstype));
}
}
-
private void appendGlobalElements(StringBuilder buffer, XSModel xsmodel)
{
XSNamedMap xsmap = xsmodel.getComponents(XSConstants.ELEMENT_DECLARATION);
@@ -695,7 +682,8 @@
for (int i = 0; i < len; i++)
{
XSElementDeclaration xsel = (XSElementDeclaration)xsmap.item(i);
- if (Constants.NS_SCHEMA_XSD.equals(xsel.getNamespace())) continue;
+ if (Constants.NS_SCHEMA_XSD.equals(xsel.getNamespace()))
+ continue;
buffer.append(this.write(xsel));
}
}
@@ -703,9 +691,9 @@
//Copy the Xerces implementation of XSModel into JBossXSModel
public void copyXSModel(XSModel xsmodel, JBossXSModel jb)
{
- if(xsmodel == null)
+ if (xsmodel == null)
throw new IllegalArgumentException("Illegal Null Argument:xsmodel");
- if(jb == null)
+ if (jb == null)
throw new IllegalArgumentException("Illegal Null Argument:jb");
//Copy all the Namespace Items
jb.setXSNamespaceItemList(xsmodel.getNamespaceItems());
@@ -724,7 +712,8 @@
for (int i = 0; i < len; i++)
{
XSTypeDefinition xstype = (XSTypeDefinition)xsmp.item(i);
- if (!this.xsNS.equals(xstype.getNamespace())) jb.addXSTypeDefinition(xstype);
+ if (!this.xsNS.equals(xstype.getNamespace()))
+ jb.addXSTypeDefinition(xstype);
}
//Copy all the attributes
@@ -739,7 +728,7 @@
//copy all the global annotations
//xsmp = xsmodel.getComponents(XSConstants.ANNOTATION);
XSObjectList xo = xsmodel.getAnnotations();
- len = xo != null ? xo.getLength():0;
+ len = xo != null ? xo.getLength() : 0;
//len = xsmp != null ? xsmp.getLength() : 0;
for (int i = 0; i < len; i++)
{
Modified: branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -291,7 +291,8 @@
}
}
- log.trace("END processTypes: " + wsdlLoc + "\n" + destTypes);
+ if (log.isTraceEnabled())
+ log.trace("END processTypes: " + wsdlLoc + "\n" + destTypes);
}
private void copyParentNamespaceDeclarations(Element destElement, Element srcElement)
@@ -547,7 +548,7 @@
WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation);
QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation);
destInput.setElement(elementName);
-
+
//Lets remember the Message name
destInput.setMessageName(srcMessage.getQName());
destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN, srcMessage.getQName().getLocalPart()));
@@ -591,7 +592,7 @@
if (srcMessage == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find output message on operation " + srcOperation.getName() + " on port type: "
+ srcPortType.getQName());
-
+
log.trace("processOperationOutput: " + srcMessage.getQName());
destOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT);
@@ -716,7 +717,7 @@
private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation) throws WSDLException
{
QName xmlName;
-
+
// R2306 A wsdl:message in a DESCRIPTION MUST NOT specify both type and element attributes on the same wsdl:part
if (srcPart.getTypeName() != null && srcPart.getElementName() != null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Message parts must not define an element name and type name: " + srcMessage.getQName());
@@ -728,11 +729,11 @@
// only to wsdl:part element(s) that have been defined using the type attribute.
if (srcPart.getName() == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "RPC style message parts must define a typy name: " + srcMessage.getQName());
-
+
// <part name="param" element="tns:SomeType" />
// Headers do have an element name even in rpc
xmlName = srcPart.getElementName();
-
+
// <part name="param" type="xsd:string" />
if (xmlName == null)
xmlName = new QName(srcPart.getName());
@@ -743,7 +744,7 @@
// only to wsdl:part element(s) that have been defined using the element attribute
if (srcPart.getElementName() == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Document style message parts must define an element name: " + srcMessage.getQName());
-
+
// <part name="param" element="tns:SomeType" />
xmlName = srcPart.getElementName();
}
@@ -1057,7 +1058,8 @@
}
private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body,
- List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) throws WSDLException
+ List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback)
+ throws WSDLException
{
for (ExtensibilityElement extElement : extList)
{
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jbws1259;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 10 Jan 2007
+ */
+public class JBWS1259TestCase extends JBossWSTest
+{
+
+ private static final String resourceDir = "resources/tools/jbws1259";
+ private static final String toolsDir = "tools/jbws1259";
+
+ public void testGenerate() throws Exception
+ {
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource("Lookup.java");
+ compareSource("PhoneBook_PortType.java");
+ compareSource("TelephoneNumber.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String fileName) throws Exception
+ {
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Lookup {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+ protected org.jboss.test.ws.jbws1259.Lookup[] lookup;
+
+ public Lookup() {
+ }
+
+ public Lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) {
+ this.firstName = firstName;
+ this.surname = surname;
+ this.lookup = lookup;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public org.jboss.test.ws.jbws1259.Lookup[] getLookup() {
+ return lookup;
+ }
+
+ public void setLookup(org.jboss.test.ws.jbws1259.Lookup[] lookup) {
+ this.lookup = lookup;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup'>
+ <complexType>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element maxOccurs='unbounded' ref='tns:lookup'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,36 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class TelephoneNumber {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String areaCode, java.lang.String number) {
+ this.areaCode = areaCode;
+ this.number = number;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Lookup</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookup</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookup</java-variable-name>
+ <xml-element-name>lookup</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Lookup[]</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookup>lookup[1,unbounded]</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>firstName</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>2</param-position>
+ <param-type>org.jboss.test.ws.jbws1259.Lookup[]</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1259.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1259/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml 2007-01-10 22:47:20 UTC (rev 1913)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml 2007-01-10 22:49:33 UTC (rev 1914)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws810</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1441</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws810</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws810.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws810.Lookup</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1441/types:>lookup</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookup</java-variable-name>
+ <xml-element-name>lookup</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws810.Lookup[]</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1441/types:>lookup>lookup[1,unbounded]</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1441">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws810.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1441">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1441">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>firstName</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>surname</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>2</param-position>
+ <param-type>org.jboss.test.ws.jbws810.Lookup[]</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>lookup</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws810.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1913 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 17:47:20 -0500 (Wed, 10 Jan 2007)
New Revision: 1913
Added:
branches/dlofthouse/JBWS-1259/
Log:
JBWS-1259 - Working branch.
Copied: branches/dlofthouse/JBWS-1259 (from rev 1912, trunk)
18 years
- 1
- 0
JBossWS SVN: r1912 - in branches/tdiesler/trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 17:43:08 -0500 (Wed, 10 Jan 2007)
New Revision: 1912
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml
Modified:
branches/tdiesler/trunk/integration-jboss40/.classpath
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java
branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
[JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT
Modified: branches/tdiesler/trunk/integration-jboss40/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-10 22:43:08 UTC (rev 1912)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -32,5 +31,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -580,7 +580,6 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
throw new RemoteException("Call invocation failed", ex);
}
finally
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -127,11 +127,6 @@
if (!ignoreParseError)
throw new IOException("Failed to parse stream: " + e.getMessage());
}
- catch (SOAPException e)
- {
- e.printStackTrace();
- throw e;
- }
finally
{
try
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -24,6 +24,7 @@
// $Id$
import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -43,6 +44,8 @@
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.marshal.MarshalFactory;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.jaxrpc.StubExt;
import org.jboss.ws.extensions.xop.XOPContext;
@@ -127,6 +130,7 @@
if (closed)
throw new SOAPException("SOAPConnection is already closed");
+ Object timeout = null;
String targetAddress;
Map callProps;
@@ -138,7 +142,7 @@
if (callProps.containsKey(StubExt.PROPERTY_CLIENT_TIMEOUT))
{
- Object timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT);
+ timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT);
targetAddress = addURLParameter(targetAddress, "timeout", timeout.toString());
}
}
@@ -178,13 +182,22 @@
}
SOAPMessage resMessage = null;
- if (oneway == true)
+ try
{
- client.invokeOneway(reqMessage, metadata, false);
+ if (oneway == true)
+ {
+ client.invokeOneway(reqMessage, metadata, false);
+ }
+ else
+ {
+ resMessage = (SOAPMessage)client.invoke(reqMessage, metadata);
+ }
}
- else
+ catch (RuntimeException rte)
{
- resMessage = (SOAPMessage)client.invoke(reqMessage, metadata);
+ if (timeout != null && rte.getCause() instanceof SocketTimeoutException)
+ throw new WSTimeoutException("Timeout after: " + timeout + "ms", new Long(timeout.toString()));
+ else throw rte;
}
// Disconnect the remoting client
@@ -202,7 +215,6 @@
}
catch (RuntimeException rte)
{
- rte.printStackTrace();
throw rte;
}
catch (Throwable t)
@@ -237,7 +249,7 @@
log.debug("Get locator for: " + endpoint);
targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "SOAPMessage");
InvokerLocator locator = new InvokerLocator(targetAddress);
-
+
/* An HTTPClientInvoker may disconnect from the server and recreated by the remoting layer.
* In that case the new invoker does not inherit the marshaller/unmarshaller from the disconnected invoker.
* We therefore explicitly specify the invoker locator datatype and register the SOAP marshaller/unmarshaller
@@ -253,7 +265,7 @@
client.connect();
client.setMarshaller(marshaller);
-
+
if (oneway == false)
client.setUnMarshaller(unmarshaller);
}
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -606,7 +606,7 @@
return seiName;
}
- private void createSEI(File loc, WSDLDefinitions wsdl)
+ private void createSEI(File loc, WSDLDefinitions wsdl) throws IOException
{
WSDLInterface[] intarr = wsdl.getInterfaces();
if (intarr == null || intarr.length == 0)
@@ -615,14 +615,7 @@
for (int i = 0; i < len; i++)
{
WSDLInterface intf = intarr[i];
- try
- {
- createSEIFile(intf, loc);
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
+ createSEIFile(intf, loc);
}
}
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -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.ant;
import org.apache.tools.ant.BuildException;
@@ -32,92 +32,88 @@
* @since Oct 5, 2005
*/
public class wstools extends MatchingTask
-{
+{
protected Path compileClasspath = null;
private boolean verbose = false;
-
+
private String dest = null;
-
- private String config = null;
-
+
+ private String config = null;
+
/**
* Creates a nested classpath element.
*/
- public Path createClasspath()
+ public Path createClasspath()
{
- if (compileClasspath == null)
+ if (compileClasspath == null)
{
compileClasspath = new Path(project);
}
return compileClasspath.createPath();
}
-
+
/**
* Adds a reference to a CLASSPATH defined elsewhere.
*/
- public void setClasspathRef(Reference r)
+ public void setClasspathRef(Reference r)
{
createClasspath().setRefid(r);
}
-
-
+
public String getConfig()
{
return config;
}
-
+
public void setConfig(String config)
{
this.config = config;
}
-
+
public String getDest()
{
return dest;
}
-
+
public void setDest(String dest)
{
this.dest = dest;
}
-
+
public boolean isVerbose()
{
return verbose;
}
-
+
public void setVerbose(boolean verbose)
{
this.verbose = verbose;
- }
-
-
+ }
+
public void execute() throws BuildException
- {
+ {
ClassLoader prevCL = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
try
{
- String[] args= new String[]{"-dest",dest,"-config",config};
+ String[] args = new String[] { "-dest", dest, "-config", config };
org.jboss.ws.tools.WSTools tools = new org.jboss.ws.tools.WSTools();
- tools.generate(args);
+ tools.generate(args);
}
catch (Exception ex)
{
if (ex instanceof BuildException)
{
- throw (BuildException) ex;
+ throw (BuildException)ex;
}
else
- {
- ex.printStackTrace();
- throw new BuildException("Error running jbossws: ",
- ex, getLocation());
+ {
+ throw new BuildException("Error running jbossws: ", ex, getLocation());
}
}
- finally
+ finally
{
Thread.currentThread().setContextClassLoader(prevCL);
}
- }
+ }
}
Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 22:43:08 UTC (rev 1912)
@@ -55,6 +55,7 @@
<!-- jaxrpc-benchmark -->
<war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
@@ -68,10 +69,10 @@
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar">
<fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
- <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="ejb-jar.xml"/>
@@ -83,11 +84,11 @@
</jar>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
<fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
- <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="application-client.xml"/>
@@ -98,6 +99,7 @@
</jar>
<war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
@@ -111,10 +113,10 @@
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar">
<fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
- <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="ejb-jar.xml"/>
@@ -126,11 +128,11 @@
</jar>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
<fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
- <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="application-client.xml"/>
@@ -931,6 +933,19 @@
</webinf>
</war>
+ <!-- jaxrpc-jbws1410 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1427 -->
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
<fileset dir="${tests.output.dir}/classes">
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,95 @@
+/*
+ * 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.jaxrpc.jbws1410;
+
+import java.io.File;
+import java.net.URL;
+import java.rmi.RemoteException;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.WSTimeoutException;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.core.jaxrpc.StubExt;
+
+/**
+ * NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT
+ *
+ * http://jira.jboss.com/jira/browse/JBWS-1410
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-Jan-2007
+ */
+public class JBWS1410TestCase extends JBossWSTest
+{
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war");
+ }
+
+ public void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws1410", "TestService");
+ Service service = factory.createService(wsdlURL, serviceName, mappingURL);
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1410");
+ }
+ }
+
+ public void testNoTimeout() throws Exception
+ {
+ String resStr = port.echoSimple("10");
+ assertEquals("10", resStr);
+ }
+
+ public void testTimeout() throws Exception
+ {
+ ((Stub)port)._setProperty(StubExt.PROPERTY_CLIENT_TIMEOUT, "100");
+ try
+ {
+ port.echoSimple("500");
+ fail("socket timeout expected");
+ }
+ catch (RemoteException ex)
+ {
+ assertTrue ("WSTimeoutException expected", ex.getCause() instanceof WSTimeoutException);
+ WSTimeoutException toex = (WSTimeoutException)ex.getCause();
+ assertEquals(100, toex.getTimeout());
+ }
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +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.test.ws.jaxrpc.jbws1410;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+ String echoSimple(String inStr) throws RemoteException;
+
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,45 @@
+/*
+ * 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.jaxrpc.jbws1410;
+
+import org.jboss.logging.Logger;
+
+public class TestEndpointImpl implements TestEndpoint
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echoSimple(String inStr)
+ {
+ log.info("echoSimple: " + inStr);
+
+ try
+ {
+ Thread.currentThread().sleep(new Long(inStr).longValue());
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+
+ return inStr;
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' 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_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1410</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1410/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1410'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1410'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1410'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoSimple</java-method-name>
+ <wsdl-operation>echoSimple</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1410'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1410'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1410' 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'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1410' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1410' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echoSimple'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoSimpleResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoSimple' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoSimple'/>
+ <output message='tns:TestEndpoint_echoSimpleResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoSimple'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1410' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1410' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml 2007-01-10 22:43:08 UTC (rev 1912)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1410" type-namespace="http://org.jboss.test.ws/jbws1410/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
+
+<!--
+ <handler>
+ <handler-name>ServerHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1410.ServerHandler</handler-class>
+ </handler>
+-->
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1911 - in trunk: integration-jboss50 and 28 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 16:58:48 -0500 (Wed, 10 Jan 2007)
New Revision: 1911
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml
Modified:
trunk/integration-jboss42/.classpath
trunk/integration-jboss50/.classpath
trunk/integration-tomcat/.classpath
trunk/jbossws-core/.classpath
trunk/jbossws-docs/
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
Log:
[JBWS-1386] - ComplexType with base64Binary property
Modified: trunk/integration-jboss42/.classpath
===================================================================
--- trunk/integration-jboss42/.classpath 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/integration-jboss42/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -33,5 +32,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/integration-jboss50/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
@@ -22,7 +22,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -35,5 +34,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-tomcat/.classpath
===================================================================
--- trunk/integration-tomcat/.classpath 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/integration-tomcat/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
@@ -18,7 +18,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-core/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
@@ -17,7 +17,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-1_5_2.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Property changes on: trunk/jbossws-docs
___________________________________________________________________
Name: svn:ignore
-
docbook-support
+
docbook-support
output-eclipse
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/.classpath 2007-01-10 21:58:48 UTC (rev 1911)
@@ -27,7 +27,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -46,5 +45,6 @@
<classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-saaj.jar"/>
<classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-client.jar"/>
<classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -918,6 +918,19 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1386 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1427 -->
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/build.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -178,6 +178,7 @@
<pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/>
<pathelement location="${integration.jboss42.dir}/output/lib/jbossws-jboss42-integration.jar"/>
<pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386 (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,76 +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.jaxrpc.jbws1386;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.Stub;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
-
-/**
- * [JBWS-1386] - ComplexType with base64Binary property
- *
- * http://jira.jboss.org/jira/browse/JBWS-1386
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 09-Jan-2007
- */
-public class JBWS1386TestCase extends JBossWSTest
-{
- private static RequestService port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
- URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService");
- Service service = factory.createService(wsdlURL, serviceName , mappingURL);
- port = (RequestService)service.getPort(RequestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386");
- }
- }
-
- public final void testEndpointAccess() throws Exception
- {
- Message inObj = new Message("Kermit", "base64".getBytes());
- Message retObj = port.processClaim(inObj);
- assertEquals(inObj, retObj);
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,76 +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.jaxrpc.jbws1386;
-
-public class Message
-{
- private String name;
- private byte[] data;
-
- public Message()
- {
- }
-
- public Message(String name, byte[] data)
- {
- this.name = name;
- this.data = data;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public byte[] getData()
- {
- return data;
- }
-
- public void setData(byte[] data)
- {
- this.data = data;
- }
-
- public int hashCode()
- {
- return toString().hashCode();
- }
-
- public boolean equals(Object obj)
- {
- if (this == obj) return true;
- if (!(obj instanceof Message)) return false;
- Message other = (Message)obj;
- return toString().equals(other.toString());
- }
-
- public String toString()
- {
- return "[name=" + name + ",data=" + new String(data) + "]";
- }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,30 +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.jaxrpc.jbws1386;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface RequestService extends Remote
-{
- public Message processClaim(Message messsge) throws RemoteException;
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,75 +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.jaxrpc.jbws1386;
-
-import java.rmi.RemoteException;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
-import org.jboss.logging.Logger;
-
-public class RequestServiceBean implements RequestService, ServiceLifecycle
-{
- private Logger log = Logger.getLogger(this.getClass());
-
- private ServletEndpointContext sepCtx;
-
- public Message processClaim(Message message) throws RemoteException
- {
- log.info("message: " + message);
-
- // Test the value in the soap message
- try
- {
- SOAPMessageContext msgCtx = (SOAPMessageContext)sepCtx.getMessageContext();
- SOAPBody body = msgCtx.getMessage().getSOAPBody();
- QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1386", "processClaim");
- SOAPElement bodyEl = (SOAPElement)body.getChildElements(rpcOpName).next();
- SOAPElement soapEl = (SOAPElement)bodyEl.getChildElements(new QName("Message_1")).next();
- soapEl = (SOAPElement)soapEl.getChildElements(new QName("data")).next();
- String value = soapEl.getValue();
- if (value.equals("YmFzZTY0") == false)
- throw new RuntimeException("Unexpected base64 value: " + value);
- }
- catch (SOAPException ex)
- {
- throw new RuntimeException(ex);
- }
-
- return message;
- }
-
- public void init(Object context) throws ServiceException
- {
- this.sepCtx = (ServletEndpointContext)context;
- }
-
- public void destroy()
- { }
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java)
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-10 21:58:48 UTC (rev 1911)
@@ -39,7 +39,9 @@
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
+ * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
*
+ * http://jira.jboss.org/jira/browse/JBWS-1427
*
* @author Thomas.Diesler(a)jboss.com
* @since 09-Jan-2007
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./META-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./META-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat -->
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat -->
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools.bat -config wstools-config.xml -cp ../../../../output/tests/classes/
+ wstools.bat -config wstools-config.xml -cp ../../../../output/classes/
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config confidential-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config confidential-config.xml
-->
<!-- Run wstools for test config first, then follow with confidential-config -->
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config test-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config test-config.xml
-->
<!-- Run wstools for test config first, then follow with confidential-config -->
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386 (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,50 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' 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_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1386</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1386/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1386/types'>typeNS:Message</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>data</java-variable-name>
- <xml-element-name>data</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1386.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1386'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>RequestServicePort</port-name>
- <java-port-name>RequestServicePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1386'>portTypeNS:RequestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1386'>bindingNS:RequestServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>processClaim</java-method-name>
- <wsdl-operation>processClaim</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaim</wsdl-message>
- <wsdl-message-part-name>Message_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.jbws1386.Message</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1386.RequestServiceBean</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1 +0,0 @@
-<webservices xmlns='http://java.sun.com/xml/ns/j2ee' 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>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1386'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml)
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1386' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1386/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1386' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1386/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1386/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <import namespace='http://www.w3.org/2001/XMLSchema'/>
- <complexType name='Message'>
- <sequence>
- <element name='data' nillable='true' type='base64Binary'/>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
- </schema>
- </types>
- <message name='RequestService_processClaim'>
- <part name='Message_1' type='ns1:Message'/>
- </message>
- <message name='RequestService_processClaimResponse'>
- <part name='result' type='ns1:Message'/>
- </message>
- <portType name='RequestService'>
- <operation name='processClaim' parameterOrder='Message_1'>
- <input message='tns:RequestService_processClaim'/>
- <output message='tns:RequestService_processClaimResponse'/>
- </operation>
- </portType>
- <binding name='RequestServiceBinding' type='tns:RequestService'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='processClaim'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:RequestServiceBinding' name='RequestServicePort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/classes -dest ./WEB-INF -config test-config.xml
--->
-
-<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1386.RequestService" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1386" type-namespace="http://org.jboss.test.ws/jbws1386/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml (from rev 1910, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml)
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2007-01-10 21:21:52 UTC (rev 1910)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2007-01-10 21:58:48 UTC (rev 1911)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -config wstools-java-wsdl.xml
+ wstools -cp ../../../../../output/classes -config wstools-java-wsdl.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18 years
- 1
- 0
JBossWS SVN: r1910 - branches/tdiesler/trunk/jbossws-docs.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 16:21:52 -0500 (Wed, 10 Jan 2007)
New Revision: 1910
Modified:
branches/tdiesler/trunk/jbossws-docs/
Log:
ignore
Property changes on: branches/tdiesler/trunk/jbossws-docs
___________________________________________________________________
Name: svn:ignore
-
docbook-support
+
docbook-support
output-eclipse
18 years
- 1
- 0
JBossWS SVN: r1909 - in branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc: jbws1427 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 16:20:35 -0500 (Wed, 10 Jan 2007)
New Revision: 1909
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
Removed:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java
Modified:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
Log:
[JBWS-1386] - ComplexType with base64Binary property
Deleted: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java 2007-01-10 21:13:36 UTC (rev 1908)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java 2007-01-10 21:20:35 UTC (rev 1909)
@@ -1,75 +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.jaxrpc.jbws1386;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.Stub;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-
-/**
- *
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 09-Jan-2007
- */
-public class JBWS1386TestCase extends JBossWSTest
-{
- private static RequestService port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
- URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService");
- Service service = factory.createService(wsdlURL, serviceName , mappingURL);
- port = (RequestService)service.getPort(RequestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386");
- }
- }
-
- public final void testEndpointAccess() throws Exception
- {
- Message inObj = new Message("Kermit", "base64".getBytes());
- Message retObj = port.processClaim(inObj);
- assertEquals(inObj, retObj);
- }
-}
Copied: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java (from rev 1908, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java)
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java 2007-01-10 21:13:36 UTC (rev 1908)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-01-10 21:20:35 UTC (rev 1909)
@@ -0,0 +1,76 @@
+/*
+ * 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.jaxrpc.jbws1386;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+
+/**
+ * [JBWS-1386] - ComplexType with base64Binary property
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1386
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 09-Jan-2007
+ */
+public class JBWS1386TestCase extends JBossWSTest
+{
+ private static RequestService port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService");
+ Service service = factory.createService(wsdlURL, serviceName , mappingURL);
+ port = (RequestService)service.getPort(RequestService.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386");
+ }
+ }
+
+ public final void testEndpointAccess() throws Exception
+ {
+ Message inObj = new Message("Kermit", "base64".getBytes());
+ Message retObj = port.processClaim(inObj);
+ assertEquals(inObj, retObj);
+ }
+}
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-10 21:13:36 UTC (rev 1908)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-10 21:20:35 UTC (rev 1909)
@@ -39,7 +39,9 @@
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
+ * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
*
+ * http://jira.jboss.org/jira/browse/JBWS-1427
*
* @author Thomas.Diesler(a)jboss.com
* @since 09-Jan-2007
18 years
- 1
- 0
JBossWS SVN: r1908 - in branches/tdiesler/trunk/jbossws-tests: src/main/java/org/jboss/test/ws/jaxrpc and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 16:13:36 -0500 (Wed, 10 Jan 2007)
New Revision: 1908
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/
Removed:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/
Modified:
branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml
Log:
partial commit
Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 21:13:36 UTC (rev 1908)
@@ -918,13 +918,13 @@
</metainf>
</jar>
- <!-- jaxrpc-jbws1339 -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1339.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF/web.xml">
+ <!-- jaxrpc-jbws1386 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1339/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws1339/*TestCase.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF">
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
Copied: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386 (from rev 1907, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339)
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java 2007-01-10 21:13:36 UTC (rev 1908)
@@ -19,7 +19,7 @@
* 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.jaxrpc.jbws1339;
+package org.jboss.test.ws.jaxrpc.jbws1386;
import java.io.File;
import java.net.URL;
@@ -42,13 +42,13 @@
* @author Thomas.Diesler(a)jboss.com
* @since 09-Jan-2007
*/
-public class JBWS1339TestCase extends JBossWSTest
+public class JBWS1386TestCase extends JBossWSTest
{
private static RequestService port;
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1339TestCase.class, "jaxrpc-jbws1339.war");
+ return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
}
protected void setUp() throws Exception
@@ -57,12 +57,12 @@
if (port == null)
{
ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
- URL wsdlURL = new File("resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName serviceName = new QName("http://org.jboss.test.ws/jbws1339", "TestService");
+ URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService");
Service service = factory.createService(wsdlURL, serviceName , mappingURL);
port = (RequestService)service.getPort(RequestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1339");
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386");
}
}
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java 2007-01-10 21:13:36 UTC (rev 1908)
@@ -19,7 +19,7 @@
* 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.jaxrpc.jbws1339;
+package org.jboss.test.ws.jaxrpc.jbws1386;
public class Message
{
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java 2007-01-10 21:13:36 UTC (rev 1908)
@@ -19,7 +19,7 @@
* 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.jaxrpc.jbws1339;
+package org.jboss.test.ws.jaxrpc.jbws1386;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java 2007-01-10 21:13:36 UTC (rev 1908)
@@ -19,7 +19,7 @@
* 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.jaxrpc.jbws1339;
+package org.jboss.test.ws.jaxrpc.jbws1386;
import java.rmi.RemoteException;
@@ -49,7 +49,7 @@
{
SOAPMessageContext msgCtx = (SOAPMessageContext)sepCtx.getMessageContext();
SOAPBody body = msgCtx.getMessage().getSOAPBody();
- QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1339", "processClaim");
+ QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1386", "processClaim");
SOAPElement bodyEl = (SOAPElement)body.getChildElements(rpcOpName).next();
SOAPElement soapEl = (SOAPElement)bodyEl.getChildElements(new QName("Message_1")).next();
soapEl = (SOAPElement)soapEl.getChildElements(new QName("data")).next();
Copied: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386 (from rev 1907, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339)
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml 2007-01-10 21:13:36 UTC (rev 1908)
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' 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_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1339</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1339/types</namespaceURI>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1386</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1386/types</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1339/types'>typeNS:Message</root-type-qname>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1386/types'>typeNS:Message</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
<java-variable-name>data</java-variable-name>
@@ -17,32 +17,32 @@
</variable-mapping>
</java-xml-type-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1339.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1339'>serviceNS:TestService</wsdl-service-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1386.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1386'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>RequestServicePort</port-name>
<java-port-name>RequestServicePort</java-port-name>
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1339'>portTypeNS:RequestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1339'>bindingNS:RequestServiceBinding</wsdl-binding>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1386'>portTypeNS:RequestService</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1386'>bindingNS:RequestServiceBinding</wsdl-binding>
<service-endpoint-method-mapping>
<java-method-name>processClaim</java-method-name>
<wsdl-operation>processClaim</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaim</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaim</wsdl-message>
<wsdl-message-part-name>Message_1</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.jbws1339.Message</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message>
+ <method-return-value>org.jboss.test.ws.jaxrpc.jbws1386.Message</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml 2007-01-10 21:13:36 UTC (rev 1908)
@@ -5,7 +5,7 @@
<servlet>
<servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1339.RequestServiceBean</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1386.RequestServiceBean</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml 2007-01-10 21:13:36 UTC (rev 1908)
@@ -1 +1 @@
-<webservices xmlns='http://java.sun.com/xml/ns/j2ee' 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>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1339'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices>
\ No newline at end of file
+<webservices xmlns='http://java.sun.com/xml/ns/j2ee' 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>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1386'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices>
\ No newline at end of file
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl 2007-01-10 21:13:36 UTC (rev 1908)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1339' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1339/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1339' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1386' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1386/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1386' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1339/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1339/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1386/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1386/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
<import namespace='http://www.w3.org/2001/XMLSchema'/>
<complexType name='Message'>
<sequence>
@@ -28,10 +28,10 @@
<operation name='processClaim'>
<soap:operation soapAction=''/>
<input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/>
</input>
<output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/>
</output>
</operation>
</binding>
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml 2007-01-10 21:13:36 UTC (rev 1908)
@@ -7,9 +7,9 @@
<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1339.RequestService" style="rpc">
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1386.RequestService" style="rpc">
</service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1339" type-namespace="http://org.jboss.test.ws/jbws1339/types"/>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1386" type-namespace="http://org.jboss.test.ws/jbws1386/types"/>
<mapping file="jaxrpc-mapping.xml"/>
<webservices servlet-link="TestEndpoint"/>
</java-wsdl>
18 years
- 1
- 0
JBossWS SVN: r1907 - in branches/tdiesler/trunk: integration-jboss50 and 26 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 15:55:45 -0500 (Wed, 10 Jan 2007)
New Revision: 1907
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml
Modified:
branches/tdiesler/trunk/integration-jboss42/.classpath
branches/tdiesler/trunk/integration-jboss50/.classpath
branches/tdiesler/trunk/integration-tomcat/.classpath
branches/tdiesler/trunk/jbossws-core/.classpath
branches/tdiesler/trunk/jbossws-tests/.classpath
branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
branches/tdiesler/trunk/jbossws-tests/build.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-10 20:55:45 UTC (rev 1907)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -33,5 +32,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration-jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-10 20:55:45 UTC (rev 1907)
@@ -22,7 +22,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -35,5 +34,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration-tomcat/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-10 20:55:45 UTC (rev 1907)
@@ -18,7 +18,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-core/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-10 20:55:45 UTC (rev 1907)
@@ -17,7 +17,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-1_5_2.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-tests/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-10 20:55:45 UTC (rev 1907)
@@ -27,7 +27,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -46,5 +45,6 @@
<classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-saaj.jar"/>
<classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-client.jar"/>
<classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -918,6 +918,19 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1339 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1339.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1339/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1339/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1427 -->
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: branches/tdiesler/trunk/jbossws-tests/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -178,6 +178,7 @@
<pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/>
<pathelement location="${integration.jboss42.dir}/output/lib/jbossws-jboss42-integration.jar"/>
<pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,75 @@
+/*
+ * 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.jaxrpc.jbws1339;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+
+/**
+ *
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 09-Jan-2007
+ */
+public class JBWS1339TestCase extends JBossWSTest
+{
+ private static RequestService port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1339TestCase.class, "jaxrpc-jbws1339.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws1339", "TestService");
+ Service service = factory.createService(wsdlURL, serviceName , mappingURL);
+ port = (RequestService)service.getPort(RequestService.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1339");
+ }
+ }
+
+ public final void testEndpointAccess() throws Exception
+ {
+ Message inObj = new Message("Kermit", "base64".getBytes());
+ Message retObj = port.processClaim(inObj);
+ assertEquals(inObj, retObj);
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,76 @@
+/*
+ * 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.jaxrpc.jbws1339;
+
+public class Message
+{
+ private String name;
+ private byte[] data;
+
+ public Message()
+ {
+ }
+
+ public Message(String name, byte[] data)
+ {
+ this.name = name;
+ this.data = data;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public byte[] getData()
+ {
+ return data;
+ }
+
+ public void setData(byte[] data)
+ {
+ this.data = data;
+ }
+
+ public int hashCode()
+ {
+ return toString().hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (this == obj) return true;
+ if (!(obj instanceof Message)) return false;
+ Message other = (Message)obj;
+ return toString().equals(other.toString());
+ }
+
+ public String toString()
+ {
+ return "[name=" + name + ",data=" + new String(data) + "]";
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,30 @@
+/*
+ * 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.jaxrpc.jbws1339;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface RequestService extends Remote
+{
+ public Message processClaim(Message messsge) throws RemoteException;
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,75 @@
+/*
+ * 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.jaxrpc.jbws1339;
+
+import java.rmi.RemoteException;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ServiceException;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+
+import org.jboss.logging.Logger;
+
+public class RequestServiceBean implements RequestService, ServiceLifecycle
+{
+ private Logger log = Logger.getLogger(this.getClass());
+
+ private ServletEndpointContext sepCtx;
+
+ public Message processClaim(Message message) throws RemoteException
+ {
+ log.info("message: " + message);
+
+ // Test the value in the soap message
+ try
+ {
+ SOAPMessageContext msgCtx = (SOAPMessageContext)sepCtx.getMessageContext();
+ SOAPBody body = msgCtx.getMessage().getSOAPBody();
+ QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1339", "processClaim");
+ SOAPElement bodyEl = (SOAPElement)body.getChildElements(rpcOpName).next();
+ SOAPElement soapEl = (SOAPElement)bodyEl.getChildElements(new QName("Message_1")).next();
+ soapEl = (SOAPElement)soapEl.getChildElements(new QName("data")).next();
+ String value = soapEl.getValue();
+ if (value.equals("YmFzZTY0") == false)
+ throw new RuntimeException("Unexpected base64 value: " + value);
+ }
+ catch (SOAPException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+
+ return message;
+ }
+
+ public void init(Object context) throws ServiceException
+ {
+ this.sepCtx = (ServletEndpointContext)context;
+ }
+
+ public void destroy()
+ { }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1010/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1011/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./META-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./META-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1093/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat -->
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1107/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat -->
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1121/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools.bat -config wstools-config.xml -cp ../../../../output/tests/classes/
+ wstools.bat -config wstools-config.xml -cp ../../../../output/classes/
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1124/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1125/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1148/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1179/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1186/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/confidential-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config confidential-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config confidential-config.xml
-->
<!-- Run wstools for test config first, then follow with confidential-config -->
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1190/test-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config test-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config test-config.xml
-->
<!-- Run wstools for test config first, then follow with confidential-config -->
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools"
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' 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_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1339</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1339/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1339/types'>typeNS:Message</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>data</java-variable-name>
+ <xml-element-name>data</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1339.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1339'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>RequestServicePort</port-name>
+ <java-port-name>RequestServicePort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1339'>portTypeNS:RequestService</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1339'>bindingNS:RequestServiceBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>processClaim</java-method-name>
+ <wsdl-operation>processClaim</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaim</wsdl-message>
+ <wsdl-message-part-name>Message_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.jbws1339.Message</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1339.RequestServiceBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1 @@
+<webservices xmlns='http://java.sun.com/xml/ns/j2ee' 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>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1339'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1339' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1339/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1339' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1339/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1339/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://www.w3.org/2001/XMLSchema'/>
+ <complexType name='Message'>
+ <sequence>
+ <element name='data' nillable='true' type='base64Binary'/>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+ <message name='RequestService_processClaim'>
+ <part name='Message_1' type='ns1:Message'/>
+ </message>
+ <message name='RequestService_processClaimResponse'>
+ <part name='result' type='ns1:Message'/>
+ </message>
+ <portType name='RequestService'>
+ <operation name='processClaim' parameterOrder='Message_1'>
+ <input message='tns:RequestService_processClaim'/>
+ <output message='tns:RequestService_processClaimResponse'/>
+ </operation>
+ </portType>
+ <binding name='RequestServiceBinding' type='tns:RequestService'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='processClaim'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:RequestServiceBinding' name='RequestServicePort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config test-config.xml
+-->
+
+<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1339.RequestService" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1339" type-namespace="http://org.jboss.test.ws/jbws1339/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws950/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws956/wstools-config.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+ wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2007-01-10 16:05:43 UTC (rev 1906)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2007-01-10 20:55:45 UTC (rev 1907)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- wstools -cp ../../../../../output/tests/classes -config wstools-java-wsdl.xml
+ wstools -cp ../../../../../output/classes -config wstools-java-wsdl.xml
-->
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18 years
- 1
- 0