JBossWS SVN: r2485 - trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-28 18:20:57 -0500 (Wed, 28 Feb 2007)
New Revision: 2485
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
Log:
Fix date/time marshalling
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-28 12:19:01 UTC (rev 2484)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-28 23:20:57 UTC (rev 2485)
@@ -30,6 +30,7 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
+import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
import javax.xml.transform.Source;
@@ -70,9 +71,7 @@
Result result = null;
try
{
- // It needs to be a valid JAXB type
- // Therefore we don't need to look into our TypeMapping
- Class javaType = value.getClass();
+ Class javaType = deriveType(value);
JAXBContextCache contextCache = JAXBContextCache.getContextCache();
JAXBContext jaxbContext = contextCache.getInstance(javaType);
@@ -97,6 +96,20 @@
return result;
}
+ private Class deriveType(Object value)
+ {
+ // It needs to be a valid JAXB type
+ // Therefore we don't need to look into our TypeMapping
+ Class javaType = value.getClass();
+
+ // Filter known interface types
+ // Implementation classes will cause JAXB to fail
+ if (XMLGregorianCalendar.class.isAssignableFrom(javaType))
+ javaType = XMLGregorianCalendar.class;
+
+ return javaType;
+ }
+
// 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall
// a request or unmarshall a response, an implementation MUST throw a WebServiceException whose
// cause is set to the original JAXBException.
17 years, 1 month
- 1
- 0
JBossWS SVN: r2484 - in branches/jbossws-1.0.4.GA_JBWS-1539/src: test/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-28 07:19:01 -0500 (Wed, 28 Feb 2007)
New Revision: 2484
Added:
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1539/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
JBWS-1538 - Prevent variables being mapped mutliple times in the JAX-RPC mapping.
Modified: branches/jbossws-1.0.4.GA_JBWS-1539/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-28 11:42:56 UTC (rev 2483)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -497,10 +497,42 @@
mapping.setXmlElementName(name);
mapping.setDataMember(utils.doesPublicFieldExist(javaType, variableName));
- javaXmlTypeMapping.addVariableMapping(mapping);
+ if (isAlreadyMapped(javaXmlTypeMapping, mapping) == false)
+ {
+ javaXmlTypeMapping.addVariableMapping(mapping);
+ }
}
}
+ private boolean isAlreadyMapped(JavaXmlTypeMapping jxtm, VariableMapping vm)
+ {
+ String javaVariableName = vm.getJavaVariableName();
+ String attributeName = vm.getXmlAttributeName();
+ String elementName = vm.getXmlElementName();
+
+ for (VariableMapping current : jxtm.getVariableMappings())
+ {
+ boolean matched = checkStringEquality(javaVariableName, current.getJavaVariableName());
+
+ if (matched)
+ {
+ matched = checkStringEquality(attributeName, current.getXmlAttributeName());
+ }
+
+ if (matched)
+ {
+ matched = checkStringEquality(elementName, current.getXmlElementName());
+ }
+
+ if (matched)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private List<XSParticle> getXSParticlesForPublicFields(String typeNamespace, Class javaType, Map<String, QName> elementNames)
{
List<XSParticle> particles = new ArrayList<XSParticle>();
@@ -875,4 +907,15 @@
return sutils.createXSParticle(targetNS, isArray, xsel);
}
+
+ private boolean checkStringEquality(String str1, String str2)
+ {
+ if (str1 == null && str2 == null)
+ return true;
+ if (str1 == null && str2 != null)
+ return false;
+ if (str1 != null && str2 == null)
+ return false;
+ return str1.equals(str2);
+ }
}
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538 (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,50 +0,0 @@
-/*
- * 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.jbws1538;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 28 Feb 2007
- */
-public class JBWS1538TestCase extends WSToolsTest
-{
-
- public final void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1538";
- String toolsDir = "tools/jbws1538";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
-
- new WSTools().generate(args);
-
- semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,50 @@
+/*
+ * 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.jbws1538;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 28 Feb 2007
+ */
+public class JBWS1538TestCase extends WSToolsTest
+{
+
+ public final void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1538";
+ String toolsDir = "tools/jbws1538";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+
+ new WSTools().generate(args);
+
+ semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,44 +0,0 @@
-/*
- * 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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelFour extends LevelThree
-{
-
- private String fieldFour;
-
- public String getFieldFour()
- {
- return fieldFour;
- }
-
- public void setFieldFour(String fieldFour)
- {
- this.fieldFour = fieldFour;
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelFour extends LevelThree
+{
+
+ private String fieldFour;
+
+ public String getFieldFour()
+ {
+ return fieldFour;
+ }
+
+ public void setFieldFour(String fieldFour)
+ {
+ this.fieldFour = fieldFour;
+ }
+
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,44 +0,0 @@
-/*
- * 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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelOne
-{
-
- private String fieldOne;
-
- public String getFieldOne()
- {
- return fieldOne;
- }
-
- public void setFieldOne(String fieldOne)
- {
- this.fieldOne = fieldOne;
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelOne
+{
+
+ private String fieldOne;
+
+ public String getFieldOne()
+ {
+ return fieldOne;
+ }
+
+ public void setFieldOne(String fieldOne)
+ {
+ this.fieldOne = fieldOne;
+ }
+
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,44 +0,0 @@
-/*
- * 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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelThree extends LevelTwo
-{
-
- private String fieldThree;
-
- public String getFieldThree()
- {
- return fieldThree;
- }
-
- public void setFieldThree(String fieldThree)
- {
- this.fieldThree = fieldThree;
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelThree extends LevelTwo
+{
+
+ private String fieldThree;
+
+ public String getFieldThree()
+ {
+ return fieldThree;
+ }
+
+ public void setFieldThree(String fieldThree)
+ {
+ this.fieldThree = fieldThree;
+ }
+
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,44 +0,0 @@
-/*
- * 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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelTwo extends LevelOne
-{
-
- private String fieldTwo;
-
- public String getFieldTwo()
- {
- return fieldTwo;
- }
-
- public void setFieldTwo(String fieldTwo)
- {
- this.fieldTwo = fieldTwo;
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelTwo extends LevelOne
+{
+
+ private String fieldTwo;
+
+ public String getFieldTwo()
+ {
+ return fieldTwo;
+ }
+
+ public void setFieldTwo(String fieldTwo)
+ {
+ this.fieldTwo = fieldTwo;
+ }
+
+}
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,37 +0,0 @@
-/*
- * 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.jbws1538;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public interface TestEndpoint extends Remote
-{
-
- public LevelFour echo(final LevelFour levelFour) throws RemoteException;
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,37 @@
+/*
+ * 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.jbws1538;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public LevelFour echo(final LevelFour levelFour) throws RemoteException;
+
+}
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538 (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='echoResponse'>
- <sequence>
- <element name='result' nillable='true' type='tns:LevelFour'/>
- </sequence>
- </complexType>
- <complexType name='LevelFour'>
- <complexContent>
- <extension base='tns:LevelThree'>
- <sequence>
- <element name='fieldFour' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name='LevelOne'>
- <sequence>
- <element name='fieldOne' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='LevelThree'>
- <complexContent>
- <extension base='tns:LevelTwo'>
- <sequence>
- <element name='fieldThree' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name='echo'>
- <sequence>
- <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/>
- </sequence>
- </complexType>
- <complexType name='LevelTwo'>
- <complexContent>
- <extension base='tns:LevelOne'>
- <sequence>
- <element name='fieldTwo' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name='echo' type='tns:echo'/>
- <element name='echoResponse' type='tns:echoResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_echo'>
- <part element='ns1:echo' name='echo'/>
- </message>
- <message name='TestEndpoint_echoResponse'>
- <part element='ns1:echoResponse' name='echoResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='echo'>
- <input message='tns:TestEndpoint_echo'/>
- <output message='tns:TestEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body 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
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/TestService.wsdl 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='echoResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelFour'>
+ <complexContent>
+ <extension base='tns:LevelThree'>
+ <sequence>
+ <element name='fieldFour' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='LevelOne'>
+ <sequence>
+ <element name='fieldOne' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelThree'>
+ <complexContent>
+ <extension base='tns:LevelTwo'>
+ <sequence>
+ <element name='fieldThree' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='echo'>
+ <sequence>
+ <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelTwo'>
+ <complexContent>
+ <extension base='tns:LevelOne'>
+ <sequence>
+ <element name='fieldTwo' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name='echo' type='tns:echo'/>
+ <element name='echoResponse' type='tns:echoResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo'>
+ <part element='ns1:echo' name='echo'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='ns1:echoResponse' name='echoResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body 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
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,116 +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.tools.jbws1538</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldThree</java-variable-name>
- <xml-element-name>fieldThree</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldThree</java-variable-name>
- <xml-element-name>fieldThree</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldFour</java-variable-name>
- <xml-element-name>fieldFour</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>levelFour_1</java-variable-name>
- <xml-element-name>LevelFour_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>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.tools.jbws1538.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
- <wsdl-message-part-name>LevelFour_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.tools.jbws1538.LevelFour</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</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: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,116 @@
+<?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.tools.jbws1538</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldFour</java-variable-name>
+ <xml-element-name>fieldFour</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>levelFour_1</java-variable-name>
+ <xml-element-name>LevelFour_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>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.tools.jbws1538.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>LevelFour_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.tools.jbws1538.LevelFour</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</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
Deleted: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml 2007-02-28 12:19:01 UTC (rev 2484)
@@ -1,14 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <java-wsdl>
- <service name="TestService"
- endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" />
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1538"
- type-namespace="http://org.jboss.test.ws/jbws1538/types" />
- <mapping file="jaxrpc-mapping.xml" />
- <webservices servlet-link="TestService"/>
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml (from rev 2478, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml)
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml (rev 0)
+++ branches/jbossws-1.0.4.GA_JBWS-1539/src/test/resources/tools/jbws1538/wstools-config.xml 2007-02-28 12:19:01 UTC (rev 2484)
@@ -0,0 +1,14 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService"
+ endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" />
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1538"
+ type-namespace="http://org.jboss.test.ws/jbws1538/types" />
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="TestService"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
17 years, 1 month
- 1
- 0
JBossWS SVN: r2483 - tags.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-28 06:42:56 -0500 (Wed, 28 Feb 2007)
New Revision: 2483
Added:
tags/jbossws-1.2.0.GA/
Log:
Release jbossws-1.2.0.GA
Copied: tags/jbossws-1.2.0.GA (from rev 2482, branches/jbossws-1.2.0)
17 years, 1 month
- 1
- 0
JBossWS SVN: r2482 - branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-28 06:17:46 -0500 (Wed, 28 Feb 2007)
New Revision: 2482
Added:
branches/jbossws-1.0.4.GA_JBWS-1539/
Log:
Branch for JBWS-1539
Copied: branches/jbossws-1.0.4.GA_JBWS-1539 (from rev 2481, tags/jbossws-1.0.4.GA)
17 years, 1 month
- 1
- 0
JBossWS SVN: r2481 - branches/jbossws-1.2.0/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-28 06:17:24 -0500 (Wed, 28 Feb 2007)
New Revision: 2481
Modified:
branches/jbossws-1.2.0/build/ant.properties.example
Log:
AS50 - 60985
AS42 - 60944
AS40 - 60942
Modified: branches/jbossws-1.2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/build/ant.properties.example 2007-02-28 10:13:48 UTC (rev 2480)
+++ branches/jbossws-1.2.0/build/ant.properties.example 2007-02-28 11:17:24 UTC (rev 2481)
@@ -19,12 +19,6 @@
tomcat.manager.username=manager
tomcat.manager.password=manager
-# Required JAX-WS Home
-# The testsuite requires the RI tools to generate the artifacts
-# Use the RI codebase from java.net: https://jax-ws.dev.java.net/jax-ws-20-fcs/
-#
-ri.home=/usr/java/jaxws-ri
-
# Hudson QA Environment
hudson.root=/home/tdiesler/workspace
hudson.port=8180
@@ -34,15 +28,15 @@
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
hudson.jboss50.build=jboss-5.0.0.Beta2
-hudson.jboss50.rev=HEAD
+hudson.jboss50.rev=60985
hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
hudson.jboss42.build=jboss-4.2.0.CR1
-hudson.jboss42.rev=HEAD
+hudson.jboss42.rev=60944
hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
hudson.jboss40.build=jboss-4.0.5.SP1
-hudson.jboss40.rev=HEAD
+hudson.jboss40.rev=60942
hudson.mail.recipients=yourname(a)jboss.com
hudson.smtp.host=pobox-2.corp.redhat.com
17 years, 1 month
- 1
- 0
JBossWS SVN: r2480 - in branches/jbossws-1.2.0: build/ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-28 05:13:48 -0500 (Wed, 28 Feb 2007)
New Revision: 2480
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Add jaxen to thirdparty because jbpm-bpel.sar doe not include it any more
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-28 10:13:48 UTC (rev 2480)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="init-thirdparty" name="JBossWS-Thirdparty">
+<project default="thirdparty" name="JBossWS-Thirdparty">
<!-- ========= -->
<!-- Libraries -->
@@ -39,6 +39,7 @@
<get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<!--get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/-->
+ <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-28 10:13:48 UTC (rev 2480)
@@ -33,6 +33,7 @@
dom4j=1.6.1
gnu-getopt=1.0.10
hibernate=3.2.1.GA
+jaxen=1.1-beta-10
jboss-backport-concurrent=2.1.0.GA
jboss-common=1.0.3.GA
jboss-common-logging-log4j=2.0.2.GA
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-28 10:13:48 UTC (rev 2480)
@@ -30,6 +30,7 @@
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-28 10:13:48 UTC (rev 2480)
@@ -213,6 +213,7 @@
<pathelement location="${thirdparty.dir}/commons-collections.jar"/>
<pathelement location="${thirdparty.dir}/commons-logging.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxen.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
<!--
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-28 10:13:48 UTC (rev 2480)
@@ -8,6 +8,7 @@
dom4j=@dom4j@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
+jaxen=@jaxen@
jbpm-bpel=@jbpm-bpel@
jboss-common=@jboss-common@
jboss-common-logging-log4j=@jboss-common-logging-log4j@
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-28 10:13:48 UTC (rev 2480)
@@ -217,10 +217,10 @@
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
<pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
<pathelement location="${thirdparty.dir}/commons-collections.jar"/>
<pathelement location="${thirdparty.dir}/commons-logging.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxen.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
<!--
17 years, 1 month
- 1
- 0
JBossWS SVN: r2479 - branches/dlofthouse/JBWS-1538/jbossws-core/src/main/java/org/jboss/ws/tools/schema.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-27 19:40:40 -0500 (Tue, 27 Feb 2007)
New Revision: 2479
Modified:
branches/dlofthouse/JBWS-1538/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
Check so variables are not mapped mutliple times for JBWS-1538
Modified: branches/dlofthouse/JBWS-1538/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-27 23:49:17 UTC (rev 2478)
+++ branches/dlofthouse/JBWS-1538/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-28 00:40:40 UTC (rev 2479)
@@ -347,7 +347,8 @@
JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm();
group.setParticles(particles);
- if(log.isDebugEnabled()) log.debug("generateNewType: " + sutils.write(complexType));
+ if (log.isDebugEnabled())
+ log.debug("generateNewType: " + sutils.write(complexType));
return complexType;
}
@@ -485,10 +486,9 @@
continue;
}
-
String name = term.getName();
- String variableName = name;
- if (reversedNames != null && reversedNames.get(name) != null)
+ String variableName = name;
+ if (reversedNames != null && reversedNames.get(name) != null)
variableName = reversedNames.get(name);
VariableMapping mapping = new VariableMapping(javaXmlTypeMapping);
@@ -497,10 +497,42 @@
mapping.setXmlElementName(name);
mapping.setDataMember(utils.doesPublicFieldExist(javaType, variableName));
- javaXmlTypeMapping.addVariableMapping(mapping);
+ if (isAlreadyMapped(javaXmlTypeMapping, mapping) == false)
+ {
+ javaXmlTypeMapping.addVariableMapping(mapping);
+ }
}
}
+ private boolean isAlreadyMapped(JavaXmlTypeMapping jxtm, VariableMapping vm)
+ {
+ String javaVariableName = vm.getJavaVariableName();
+ String attributeName = vm.getXmlAttributeName();
+ String elementName = vm.getXmlElementName();
+
+ for (VariableMapping current : jxtm.getVariableMappings())
+ {
+ boolean matched = checkStringEquality(javaVariableName, current.getJavaVariableName());
+
+ if (matched)
+ {
+ matched = checkStringEquality(attributeName, current.getXmlAttributeName());
+ }
+
+ if (matched)
+ {
+ matched = checkStringEquality(elementName, current.getXmlElementName());
+ }
+
+ if (matched)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private List<XSParticle> getXSParticlesForPublicFields(String typeNamespace, Class javaType, Map<String, QName> elementNames)
{
List<XSParticle> particles = new ArrayList<XSParticle>();
@@ -579,10 +611,10 @@
String fieldname = prop.getName();
Class fieldType = prop.getPropertyType();
- if (prop instanceof IndexedPropertyDescriptor && fieldType==null)
+ if (prop instanceof IndexedPropertyDescriptor && fieldType == null)
{
- log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname);
- continue;
+ log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname);
+ continue;
}
// Skip magic work around property used in ParameterWrapping
@@ -710,7 +742,7 @@
List<XSParticle> particles = new ArrayList<XSParticle>(0);
List<Class> types = new ArrayList<Class>(0);
- JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
+ JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
complexType.setName(name);
complexType.setNamespace(namespace);
@@ -718,14 +750,14 @@
xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
typeMapping.register(javaType, new QName(namespace, name), null, null);
registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
-
+
Class superClass = javaType.getSuperclass();
if (!Exception.class.equals(superClass) || Throwable.class.equals(superClass))
{
JBossXSTypeDefinition baseType = generateType(null, superClass);
complexType.setBaseType(baseType);
}
-
+
generateExceptionParticles(namespace, javaType, types, particles);
boolean found = hasConstructor(javaType, types);
@@ -750,7 +782,7 @@
}
}
- complexType.setParticle(createGroupParticle(namespace, particles));
+ complexType.setParticle(createGroupParticle(namespace, particles));
return complexType;
}
@@ -876,4 +908,15 @@
return sutils.createXSParticle(targetNS, isArray, xsel);
}
+
+ private boolean checkStringEquality(String str1, String str2)
+ {
+ if (str1 == null && str2 == null)
+ return true;
+ if (str1 == null && str2 != null)
+ return false;
+ if (str1 != null && str2 == null)
+ return false;
+ return str1.equals(str2);
+ }
}
\ No newline at end of file
17 years, 1 month
- 1
- 0
JBossWS SVN: r2478 - in branches/dlofthouse/JBWS-1538/jbossws-tests/src/main: java/org/jboss/test/ws/tools/jbws1538 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-27 18:49:17 -0500 (Tue, 27 Feb 2007)
New Revision: 2478
Added:
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
Log:
JBWS-1538 Test Case
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,50 @@
+/*
+ * 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.jbws1538;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 28 Feb 2007
+ */
+public class JBWS1538TestCase extends WSToolsTest
+{
+
+ public final void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1538";
+ String toolsDir = "tools/jbws1538";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+
+ new WSTools().generate(args);
+
+ semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelFour extends LevelThree
+{
+
+ private String fieldFour;
+
+ public String getFieldFour()
+ {
+ return fieldFour;
+ }
+
+ public void setFieldFour(String fieldFour)
+ {
+ this.fieldFour = fieldFour;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelOne
+{
+
+ private String fieldOne;
+
+ public String getFieldOne()
+ {
+ return fieldOne;
+ }
+
+ public void setFieldOne(String fieldOne)
+ {
+ this.fieldOne = fieldOne;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelThree extends LevelTwo
+{
+
+ private String fieldThree;
+
+ public String getFieldThree()
+ {
+ return fieldThree;
+ }
+
+ public void setFieldThree(String fieldThree)
+ {
+ this.fieldThree = fieldThree;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelTwo extends LevelOne
+{
+
+ private String fieldTwo;
+
+ public String getFieldTwo()
+ {
+ return fieldTwo;
+ }
+
+ public void setFieldTwo(String fieldTwo)
+ {
+ this.fieldTwo = fieldTwo;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,37 @@
+/*
+ * 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.jbws1538;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public LevelFour echo(final LevelFour levelFour) throws RemoteException;
+
+}
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='echoResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelFour'>
+ <complexContent>
+ <extension base='tns:LevelThree'>
+ <sequence>
+ <element name='fieldFour' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='LevelOne'>
+ <sequence>
+ <element name='fieldOne' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelThree'>
+ <complexContent>
+ <extension base='tns:LevelTwo'>
+ <sequence>
+ <element name='fieldThree' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='echo'>
+ <sequence>
+ <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelTwo'>
+ <complexContent>
+ <extension base='tns:LevelOne'>
+ <sequence>
+ <element name='fieldTwo' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name='echo' type='tns:echo'/>
+ <element name='echoResponse' type='tns:echoResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo'>
+ <part element='ns1:echo' name='echo'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='ns1:echoResponse' name='echoResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body 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/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,116 @@
+<?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.tools.jbws1538</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldFour</java-variable-name>
+ <xml-element-name>fieldFour</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>levelFour_1</java-variable-name>
+ <xml-element-name>LevelFour_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>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.tools.jbws1538.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>LevelFour_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.tools.jbws1538.LevelFour</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</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/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-02-27 23:49:17 UTC (rev 2478)
@@ -0,0 +1,14 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService"
+ endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" />
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1538"
+ type-namespace="http://org.jboss.test.ws/jbws1538/types" />
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="TestService"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
- 1
- 0
JBossWS SVN: r2477 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-27 18:46:52 -0500 (Tue, 27 Feb 2007)
New Revision: 2477
Added:
branches/dlofthouse/JBWS-1538/
Log:
Branch for JBWS-1538
Copied: branches/dlofthouse/JBWS-1538 (from rev 2476, branches/jbossws-1.2.0)
17 years, 1 month
- 1
- 0
JBossWS SVN: r2476 - in trunk/jbossws-tests: src/main/java/org/jboss/test/ws/jaxws/jbws944 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-27 18:20:58 -0500 (Tue, 27 Feb 2007)
New Revision: 2476
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java
Modified:
trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
Log:
test narrowing the proxy to the remote interface
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-27 16:21:04 UTC (rev 2475)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-27 23:20:58 UTC (rev 2476)
@@ -171,6 +171,7 @@
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/>
</fileset>
</jar>
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-02-27 16:21:04 UTC (rev 2475)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-02-27 23:20:58 UTC (rev 2476)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.jaxws.jbws944;
import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -33,6 +34,7 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
+(a)RemoteHome(EJB3RemoteHome.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless(name = "FooBean01")
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java 2007-02-27 23:20:58 UTC (rev 2476)
@@ -0,0 +1,32 @@
+/*
+ * 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.jaxws.jbws944;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+public interface EJB3RemoteHome extends EJBHome
+{
+ EJB3RemoteInterface create() throws RemoteException, CreateException;
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-02-27 16:21:04 UTC (rev 2475)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-02-27 23:20:58 UTC (rev 2476)
@@ -25,6 +25,7 @@
import java.net.URL;
import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -63,6 +64,20 @@
assertEquals(helloWorld, retObj);
}
+ // This tests whether the remote proxy also implements
+ // the home interface and that it can be narrowed to it.
+ public void testNarrowedRemoteAccess() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ Object obj = iniCtx.lookup("/ejb3/EJB3EndpointInterface");
+ EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class);
+ EJB3RemoteInterface ejb3Remote = ejb3Home.create();
+
+ String helloWorld = "Hello world!";
+ Object retObj = ejb3Remote.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
public void testWebService() throws Exception
{
assertWSDLAccess();
17 years, 1 month
- 1
- 0