[jbossws-commits] JBossWS SVN: r1196 - in branches/jbossws-1.0/src/test: java/org/jboss/test/ws/tools/jbws_211/tests java/org/jboss/test/ws/tools/jbws_211/tests/Attachment java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance java/org/jboss/test/ws/tools/jbws_211/tests/OneWay java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders java/org/jboss/test/ws/tools/jbws_211/tests/UserException resources/tools/jbws-211/jbosswsConfig resources/tools/jbws-211/jbosswsConfig/CustomHolders
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Oct 11 02:27:03 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-10-11 02:26:48 -0400 (Wed, 11 Oct 2006)
New Revision: 1196
Added:
branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/
Removed:
branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder/
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java
branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml
Log:
Fix tools custom holders test case
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -40,7 +40,7 @@
public String getFixMe()
{
- return "FIXME:JBWS-269";
+ return "FIXME: JBWS-269";
}
public String getWSDLName()
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -37,11 +37,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -39,11 +39,6 @@
return base;
}
- public String getFixMe()
- {
- return "FIXME:JBWS-103";
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -38,11 +38,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.tools.jbws_211.tests;
import org.jboss.test.ws.tools.WSToolsTest;
@@ -31,36 +31,39 @@
* @since Sep 24, 2005
*/
public abstract class JBWS211Test extends WSToolsTest
-{
+{
public abstract String getBase();
+
public abstract String getWSDLName();
- public abstract String getFixMe();
-
+
//Set up the test
protected void setUp()
- {
+ {
String out_dir = "tools/jbws-211/jbossws/" + getBase();
- // createDir(out_dir + "/server");
- createDir(out_dir );
+ createDir(out_dir);
createDir(out_dir + "/wsdl");
- }
-
+ }
+
public final void testJava2WSDL() throws Exception
- {
- if(getFixMe() != null)
+ {
+ if (getFixMe() != null)
{
System.out.println(getFixMe());
return;
}
String out_dir = "tools/jbws-211/jbossws/" + getBase();
String wsdlFix = "resources/tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName();
- String configStr = getBase().replaceAll("/","");
- String configloc = "resources/tools/jbws-211/jbosswsConfig/"+ getBase() + "/" + configStr + "Config.xml";
+ String configStr = getBase().replaceAll("/", "");
+ String configloc = "resources/tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml";
- String[] args= new String[]{"-dest",out_dir,"-config",configloc};
+ String[] args = new String[] { "-dest", out_dir, "-config", configloc };
WSTools tools = new WSTools();
- tools.generate(args);
- //semanticallyValidateWSDL(wsdlFix, out_dir+"/server/" + getWSDLName());
- semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName());
+ tools.generate(args);
+ semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName());
}
+
+ protected String getFixMe()
+ {
+ return null;
+ }
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -40,7 +40,7 @@
public String getFixMe()
{
- return "FIXME:JBWS-271";
+ return "FIXME: JBWS-271";
}
public String getWSDLName()
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -39,11 +39,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -38,11 +38,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -38,11 +38,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-10-10 19:55:31 UTC (rev 1195)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-10-11 06:26:48 UTC (rev 1196)
@@ -38,11 +38,6 @@
return base;
}
- public String getFixMe()
- {
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Copied: branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders (from rev 1193, branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder)
Modified: branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolder/CustomHoldersConfig.xml 2006-10-10 16:20:55 UTC (rev 1193)
+++ branches/jbossws-1.0/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-10-11 06:26:48 UTC (rev 1196)
@@ -1,12 +1,7 @@
-<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="CustomHoldersService"
- endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI"
- style="rpc"
- />
- <namespaces target-namespace="http://org.jboss.ws"
- type-namespace="http://org.jboss.ws/types"/>
- </java-wsdl>
+<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="CustomHoldersService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" style="rpc"/>
+ <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/>
+ </java-wsdl>
</configuration>
More information about the jbossws-commits
mailing list