Author: darran.lofthouse(a)jboss.com Date: 2006-11-02 16:43:56 -0500 (Thu, 02 Nov 2006) New Revision: 1349 Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java branches/jbossws-1.0/src/test/resources/tools/jbws1080/ branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml Modified: branches/jbossws-1.0/src/main/resources/schema/jbossws-tool_1_0.xsd Log: JBWS-1080 - Made namespaces element mandatory in wstools configuration as it is required. Modified: branches/jbossws-1.0/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-02 21:19:22 UTC (rev 1348) +++ branches/jbossws-1.0/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-02 21:43:56 UTC (rev 1349) @@ -201,7 +201,7 @@ <xs:complexType name="javaToWsdlType"> <xs:sequence> <xs:element name="service" type="ns1:serviceType"/> - <xs:element name="namespaces" type="ns1:namespacesType" minOccurs="0"> + <xs:element name="namespaces" type="ns1:namespacesType"> <xs:annotation> <xs:documentation>Namespaces to use when generating the WSDL file.</xs:documentation> </xs:annotation> Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-02 21:19:22 UTC (rev 1348) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-02 21:43:56 UTC (rev 1349) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1080; + +import java.io.IOException; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +public class JBWS1080TestCase extends JBossWSTest +{ + + public final void testNoNamespaceElement() throws Exception + { + String resourceDir = "resources/tools/jbws1080"; + String toolsDir = "tools/jbws1080"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + + try + { + new WSTools().generate(args); + fail("Expected exception not thrown."); + } + catch (IOException e) + { + assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-t... is expected.")); + } + } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-02 21:19:22 UTC (rev 1348) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-02 21:43:56 UTC (rev 1349) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1080; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +public interface TestEndpoint extends Remote +{ + + public String hello(final String message) throws RemoteException; + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-02 21:19:22 UTC (rev 1348) +++ branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-02 21:43:56 UTC (rev 1349) @@ -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.jbws1080.TestEndpoint" style="rpc" /> + <!--namespaces target-namespace="http://org.jboss.test.ws/jbws1080" + type-namespace="http://org.jboss.test.ws/jbws1080/type" /--> + <mapping file="jaxrpc-mapping.xml" /> + <webservices servlet-link="TestService" append="true" /> + </java-wsdl> + +</configuration> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF