JBossWS SVN: r8699 - in stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test: resources/tools/jbws2389/doclit and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-11-11 07:56:57 -0500 (Tue, 11 Nov 2008)
New Revision: 8699
Added:
stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java
stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl
stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml
Log:
Added initial test case.
Copied: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (from rev 8689, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java)
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 12:56:57 UTC (rev 8699)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2389;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-2389
+ *
+ * WSDL To Java - WSDL To Java - Anonymous types
+ * nested within anonymous types not being processed correctly.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Nov 10, 2008
+ */
+public class JBWS2389TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ File resourceDir = createResourceFile("tools/jbws2389/" + scenario);
+ String toolsDir = resourceDir.getAbsolutePath();
+
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ String[] expectedFiles = resourceDir.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2389/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ System.out.println(packageDir.getAbsolutePath());
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (from rev 8689, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/Wrapped.wsdl)
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-11 12:56:57 UTC (rev 8699)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <element name='lookup'>
+ <complexType>
+ <sequence>
+ <element name='Details'>
+ <complexType>
+ <sequence>
+ <element name='Name'>
+ <complexType>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookupResponse'>
+ <complexType>
+ <sequence>
+ <element name='Details'>
+ <complexType>
+ <sequence>
+ <element name='Number'>
+ <complexType>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Copied: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (from rev 8689, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws1801/doclit/wstools-config.xml)
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-11 12:56:57 UTC (rev 8699)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="${test.resources.directory}/tools/jbws2389/doclit/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
16 years, 2 months
JBossWS SVN: r8698 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:53:56 -0500 (Mon, 10 Nov 2008)
New Revision: 8698
Modified:
stack/native/trunk/pom.xml
Log:
Using released jaxbintros
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-11-10 21:42:39 UTC (rev 8697)
+++ stack/native/trunk/pom.xml 2008-11-10 21:53:56 UTC (rev 8698)
@@ -65,7 +65,7 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
- <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
+ <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.remoting.version>2.5.0.SP1</jboss.remoting.version>
<jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
16 years, 2 months
JBossWS SVN: r8697 - projects/jaxbintros/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:42:39 -0500 (Mon, 10 Nov 2008)
New Revision: 8697
Modified:
projects/jaxbintros/trunk/version.properties
Log:
Next dev cycle
Modified: projects/jaxbintros/trunk/version.properties
===================================================================
--- projects/jaxbintros/trunk/version.properties 2008-11-10 21:40:42 UTC (rev 8696)
+++ projects/jaxbintros/trunk/version.properties 2008-11-10 21:42:39 UTC (rev 8697)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jboss-jaxbintros-1.0
-version.id=1.0.0.GA
-repository.id=1.0.0.GA
+version.id=1.0.1-SNAPSHOT
+repository.id=1.0.1-SNAPSHOT
implementation.title=JBoss JAXBIntros
implementation.url=http://www.jboss.org/products/jbossws
16 years, 2 months
JBossWS SVN: r8696 - projects/jaxbintros/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:40:42 -0500 (Mon, 10 Nov 2008)
New Revision: 8696
Added:
projects/jaxbintros/tags/1.0.0.GA/
Log:
Tagging 1.0.0.GA
Copied: projects/jaxbintros/tags/1.0.0.GA (from rev 8695, projects/jaxbintros/trunk)
16 years, 2 months
JBossWS SVN: r8695 - projects/jaxbintros.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:39:59 -0500 (Mon, 10 Nov 2008)
New Revision: 8695
Added:
projects/jaxbintros/tags/
Log:
Adding tags
16 years, 2 months
JBossWS SVN: r8694 - projects/jaxbintros/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:38:13 -0500 (Mon, 10 Nov 2008)
New Revision: 8694
Removed:
projects/jaxbintros/trunk/ant.properties
Log:
Removing custom ant.properties (copy/paste ant.properties.example)
Deleted: projects/jaxbintros/trunk/ant.properties
===================================================================
--- projects/jaxbintros/trunk/ant.properties 2008-11-10 21:33:45 UTC (rev 8693)
+++ projects/jaxbintros/trunk/ant.properties 2008-11-10 21:38:13 UTC (rev 8694)
@@ -1,20 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
16 years, 2 months
JBossWS SVN: r8693 - projects/jaxbintros/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 16:33:45 -0500 (Mon, 10 Nov 2008)
New Revision: 8693
Modified:
projects/jaxbintros/trunk/version.properties
Log:
Preparing for tagging GA release
Modified: projects/jaxbintros/trunk/version.properties
===================================================================
--- projects/jaxbintros/trunk/version.properties 2008-11-10 20:43:39 UTC (rev 8692)
+++ projects/jaxbintros/trunk/version.properties 2008-11-10 21:33:45 UTC (rev 8693)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jboss-jaxbintros-1.0
-version.id=1.0.0.CR1
-repository.id=1.0.0.CR1
+version.id=1.0.0.GA
+repository.id=1.0.0.GA
implementation.title=JBoss JAXBIntros
implementation.url=http://www.jboss.org/products/jbossws
16 years, 2 months
JBossWS SVN: r8692 - in projects/jaxbintros/trunk: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-10 15:43:39 -0500 (Mon, 10 Nov 2008)
New Revision: 8692
Modified:
projects/jaxbintros/trunk/ant-import/build-thirdparty.xml
projects/jaxbintros/trunk/build.xml
projects/jaxbintros/trunk/version.properties
Log:
Removing useless dependencies + minor changes
Modified: projects/jaxbintros/trunk/ant-import/build-thirdparty.xml
===================================================================
--- projects/jaxbintros/trunk/ant-import/build-thirdparty.xml 2008-11-10 17:11:13 UTC (rev 8691)
+++ projects/jaxbintros/trunk/ant-import/build-thirdparty.xml 2008-11-10 20:43:39 UTC (rev 8692)
@@ -36,7 +36,6 @@
<target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
@@ -54,7 +53,6 @@
<!-- The compile classpath for jaxbintro -->
<path id="jaxbintro.integration.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
Modified: projects/jaxbintros/trunk/build.xml
===================================================================
--- projects/jaxbintros/trunk/build.xml 2008-11-10 17:11:13 UTC (rev 8691)
+++ projects/jaxbintros/trunk/build.xml 2008-11-10 20:43:39 UTC (rev 8692)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS-JBoss42">
+<project default="main" basedir="." name="JBossJAXBIntros">
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
Modified: projects/jaxbintros/trunk/version.properties
===================================================================
--- projects/jaxbintros/trunk/version.properties 2008-11-10 17:11:13 UTC (rev 8691)
+++ projects/jaxbintros/trunk/version.properties 2008-11-10 20:43:39 UTC (rev 8692)
@@ -1,24 +1,20 @@
# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
-specification.title=JBossWS
+specification.title=JBossJAXBIntros
specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-2.0
+specification.version=jboss-jaxbintros-1.0
-version.id=1.0.0.beta3
-repository.id=1.0.0.beta3
+version.id=1.0.0.CR1
+repository.id=1.0.0.CR1
-implementation.title=JBoss Web Services - Integration JBoss42
+implementation.title=JBoss JAXBIntros
implementation.url=http://www.jboss.org/products/jbossws
implementation.vendor=JBoss Inc.
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-spi=1.0.0.GA
-jbossws-native=2.0.1.GA
-
-# Thirdparty library versions
-apache-log4j=1.2.8
+apache-log4j=1.2.14
apache-logging=1.1.0.jboss
junit=3.8.1
sun-jaf=1.1
16 years, 2 months