November 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r8709 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: jbws1184 and 28 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-12 10:04:31 -0500 (Wed, 12 Nov 2008) New Revision: 8709 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java Log: [JBWS-2395] Maven Refactoring Damaged Many wstools tests. Separate the generated artifacts from the base artifacts for propper comparison. Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -40,7 +40,7 @@ { File resourceFile = createResourceFile("tools/jbws1079"); String resourceDir = resourceFile.getAbsolutePath(); - String toolsDir = resourceDir; + String toolsDir = "target/wstools/jbws1079/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -78,7 +78,7 @@ { File resourceFile = createResourceFile("tools/jbws1184/scenario_" + scenario); String resourceDir = resourceFile.getAbsolutePath(); - String toolsDir = resourceDir; + String toolsDir = "target/wstools/jbws1184/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -40,7 +40,7 @@ public final void testMultiplePackageNameSpace() throws Exception { String resourceDir = createResourceFile("tools/jbws1217").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1217"; + String toolsDir = "target/wstools/jbws1217/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -36,7 +36,7 @@ public final void testGenerate() throws Exception { String resourceDir = createResourceFile("tools/jbws1231").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1231"; + String toolsDir = "target/wstools/jbws1231/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -39,7 +39,7 @@ public final void testPortTypePort() throws Exception { File resourceDir = createResourceFile("tools/jbws1253"); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1253/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -132,7 +132,7 @@ File resourceDir= createResourceFile("tools/jbws1259/scenario_" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1259/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -873,7 +873,7 @@ { File resourceDir = createResourceFile("tools/jbws1260/scenario_" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1260/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -49,7 +49,7 @@ { File resourceDir = createResourceFile("tools/jbws1278/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1278/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -38,7 +38,7 @@ public void testGenerate() throws Exception { String resourceDir = createResourceFile("tools/jbws1428").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1428"; + String toolsDir = "target/wstools/jbws1428/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -36,7 +36,7 @@ public class JBWS1441TestCase extends JBossWSTest { private String resourceDir = createResourceFile("tools/jbws1441").getAbsolutePath(); - private String toolsDir = resourceDir; + private String toolsDir = "target/wstools/jbws1441/output"; public void testGenerate() throws Exception { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -123,7 +123,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1450/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -50,7 +50,7 @@ File resourceDir = createResourceFile("tools/jbws1453"); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1453/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -37,7 +37,7 @@ { private String resourceDir = createResourceFile("tools/jbws1455").getAbsolutePath(); - private String toolsDir = resourceDir; //"tools/jbws1455"; + private String toolsDir = "target/wstools/jbws1455/output"; public void testGenerate() throws Exception { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -62,7 +62,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws1534/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1534/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -36,7 +36,7 @@ public final void testGenerate() throws Exception { String resourceDir = createResourceFile("tools/jbws1538").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1538"; + String toolsDir = "target/wstools/jbws1538/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -81,7 +81,7 @@ { File resourceDir = createResourceFile("tools/jbws1597/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1597/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -50,7 +50,7 @@ public void testGenerate() throws Exception { File resourceDir = createResourceFile("tools/jbws1607"); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1607/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -49,7 +49,7 @@ public void testGenerate() throws Exception { File resourceDir = createResourceFile("tools/jbws1627"); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1627/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -50,7 +50,7 @@ { File resourceDir = createResourceFile("tools/jbws1691/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1691/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -66,7 +66,7 @@ { File resourceDir = createResourceFile("tools/jbws1697/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); //"tools/jbws1697/" + scenario; + String toolsDir = "target/wstools/jbws1697/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -60,7 +60,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws1698/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1698/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -54,7 +54,7 @@ File resourceDir = createResourceFile("tools/jbws1723/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1723/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -52,7 +52,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws1801/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1801/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -50,7 +50,7 @@ File resourceDir = createResourceFile("tools/jbws1873/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1873/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -49,7 +49,7 @@ { File resourceDir = createResourceFile("tools/jbws1881/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws1881/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -37,7 +37,7 @@ public final void testMultiplePackageNameSpace() throws Exception { String resourceDir = createResourceFile("tools/jbws2018").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws2018"; + String toolsDir = "target/wstools/jbws2018/output"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -48,7 +48,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws2019/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws2019/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -51,7 +51,7 @@ protected void generateScenario(final String scenario) throws Exception { File resourceDir = createResourceFile("tools/jbws2389/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws2389/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -78,7 +78,7 @@ File resourceDir = createResourceFile("tools/jbws429/" + scenario); resourceDir.mkdirs(); - String toolsDir = resourceDir.getAbsolutePath(); + String toolsDir = "target/wstools/jbws429/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-11-12 14:37:31 UTC (rev 8708) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-11-12 15:04:31 UTC (rev 8709) @@ -43,7 +43,7 @@ { resourceDir = createResourceFile("tools/jbws810"); resourceDir.mkdirs(); - toolsDir = resourceDir.getAbsolutePath(); + toolsDir = "target/wstools/jbws810"; } public void testDocument() throws Exception

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8708 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 09:37:31 -0500 (Wed, 12 Nov 2008) New Revision: 8708 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt Log: [JBWS-2343][JBWS-2397] Updating excludes for AS 5.0.0.CR2 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-12 09:59:04 UTC (rev 8707) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-12 14:37:31 UTC (rev 8708) @@ -31,24 +31,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2241/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -59,3 +41,5 @@ # [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-12 09:59:04 UTC (rev 8707) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-12 14:37:31 UTC (rev 8708) @@ -7,6 +7,9 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime +org/jboss/test/ws/jaxws/jbws1822/** + # [JBMETA-141] Implement getChildren() in VirtualFileAdaptor org/jboss/test/ws/jaxws/jbws2206/** @@ -28,29 +31,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2241/** -org/jboss/test/ws/jaxws/jbws2250/** - -# [JBWS-2344][JBWS-2342] These tests currently run fine with JDK6 only -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/jaxws/jbws1822/** -org/jboss/test/ws/jaxws/jbws860/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -61,3 +41,5 @@ # [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/**

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8707 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 04:59:04 -0500 (Wed, 12 Nov 2008) New Revision: 8707 Removed: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java Log: [JBWS-2396] Disable wrapper generator Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-11-12 09:28:35 UTC (rev 8706) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-11-12 09:59:04 UTC (rev 8707) @@ -291,7 +291,6 @@ ensureNoContent(reader); Invoker invoker = createInvoker(implementorClass); - generateWrappers(implementorClass, this.classLoader); WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false); @@ -309,11 +308,6 @@ Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker(); return invoker; } - - protected void generateWrappers(Class<?> implementorClass, ClassLoader classLoader) - { - //default implementation does nothing - } /** * @param ddBindingId Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-11-12 09:28:35 UTC (rev 8706) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-11-12 09:59:04 UTC (rev 8707) @@ -21,22 +21,10 @@ */ package org.jboss.wsf.stack.metro; -import java.lang.reflect.Method; import java.net.MalformedURLException; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.jws.soap.SOAPBinding.Style; -import javax.jws.soap.SOAPBinding.Use; -import javax.xml.ws.WebFault; -import javax.xml.ws.WebServiceException; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import com.sun.xml.ws.api.server.Container; @@ -80,90 +68,6 @@ return invoker; } - @Override - protected void generateWrappers(Class<?> implementorClass, ClassLoader classLoader) - { - //Generate wrappers - if (isWrapperGenerationEnabled() && isWrapperGenerationRequired(implementorClass, classLoader)) - { - WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out); - ClassLoader newClassLoader = wrapperGenerator.generate(implementorClass.getName(), classLoader, archiveFile.toURL()); - Thread.currentThread().setContextClassLoader(newClassLoader); - } - } - - private boolean isWrapperGenerationEnabled() - { - boolean noWrappersGeneration = Boolean.getBoolean(Constants.NO_WRAPPERS_GENERATION); - if (noWrappersGeneration) - Logger.getLogger(this.getClass()).debug("Wrapper generation disabled"); - return !noWrappersGeneration; - } - - private boolean isWrapperGenerationRequired(Class<?> endpoint, ClassLoader classLoader) - { - WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class); - if (webServiceAnnotation == null) - return false; - String wsdlLocation = webServiceAnnotation.wsdlLocation(); - if (wsdlLocation != null && !"".equals(wsdlLocation)) - return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport - - String endpointInterface = webServiceAnnotation.endpointInterface(); - javax.jws.soap.SOAPBinding soapBinding; - if (endpointInterface == null || "".equalsIgnoreCase(endpointInterface)) - { - if (isFaultWrapperGenerationRequired(endpoint)) - return true; - soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class); - } - else - { - //Using the SEI to get annotations - Class<?> sei; - try - { - sei = Class.forName(endpointInterface, true, classLoader); - } - catch (ClassNotFoundException e) - { - throw new WebServiceException(e); - } - if (isFaultWrapperGenerationRequired(sei)) - return true; - soapBinding = sei.getAnnotation(javax.jws.soap.SOAPBinding.class); - } - if (soapBinding == null) - return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped - return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use())); - } - - private boolean isFaultWrapperGenerationRequired(Class<?> clazz) - { - Method[] classMethods = clazz.getMethods(); - boolean webMethodAnnUsed = false; - List<Method> webMethods = new LinkedList<Method>(); - for (Method m : classMethods) - { - if (m.getAnnotation(WebMethod.class) != null) - { - webMethods.add(m); - webMethodAnnUsed = true; - } - } - List<Method> methods = webMethodAnnUsed ? webMethods : Arrays.asList(classMethods); - for (Method m : methods) - { - Class<?>[] exceptionClasses = m.getExceptionTypes(); - for (Class<?> exceptionClass : exceptionClasses) - { - if (exceptionClass.getAnnotation(WebFault.class) != null) - return true; - } - } - return false; - } - public void setArchiveFile(UnifiedVirtualFile file) { this.archiveFile = file; Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-11-12 09:28:35 UTC (rev 8706) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-11-12 09:59:04 UTC (rev 8707) @@ -1,221 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.wsf.stack.metro; - -import java.io.File; -import java.io.OutputStream; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceException; - -import org.jboss.logging.Logger; -import org.jboss.util.file.JarUtils; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; - -import com.sun.tools.ws.wscompile.WsgenTool; - -/** - * - * @author alessio.soldano(a)jboss.com - * @since 06-Oct-2008 - */ -public class WsgenWrapperGenerator -{ - private static Logger log = Logger.getLogger(WsgenWrapperGenerator.class); - - private OutputStream outputStream; - private ServerConfig serverConfig; - - public WsgenWrapperGenerator(OutputStream outputStream) - { - this.outputStream = outputStream; - } - - public ClassLoader generate(String endpoint, ClassLoader classLoader, URL archiveUrl) - { - log.debug("ImplementationName: " + endpoint); - log.debug("Archive file: " + archiveUrl); - File tempDir = getTempDir(archiveUrl); - log.debug("Temp directory: " + tempDir); - - if (!checkWsgenRequirements()) - { - return classLoader; - } - - WsgenTool wsgen = new WsgenTool(outputStream); - List<String> args = new ArrayList<String>(); - args.add("-cp"); - args.add(getClasspath(classLoader, archiveUrl)); - args.add("-d"); - args.add(tempDir.getAbsolutePath()); - args.add("-verbose"); - args.add(endpoint); - try - { - log.debug("Invoking Wsgen with the following parameters: " + args); - if (!wsgen.run(args.toArray(new String[0]))) - throw new WebServiceException("Wsgen invocation failed: see the logs for details."); - - URLClassLoader newClassloader = new URLClassLoader(new URL[] { tempDir.toURL() }, classLoader); - return newClassloader; - } - catch (Exception e) - { - throw new WebServiceException("Unable to generate wrapper classes", e); - } - } - - private static boolean checkWsgenRequirements() - { - Class<?> epRef = EndpointReference.class; - Class<?> xmlSeeAlso = XmlSeeAlso.class; - String epRefUrl = epRef.getResource('/'+epRef.getName().replace('.','/')+".class").toExternalForm(); - String xmlSeeAlsoUrl = xmlSeeAlso.getResource('/'+xmlSeeAlso.getName().replace('.','/')+".class").toExternalForm(); - log.debug("EndpointReference.class loaded from: " + epRefUrl); - log.debug("XmlSeeAlso.class loaded from: " + xmlSeeAlsoUrl); - if (!epRefUrl.startsWith("jar:") || !xmlSeeAlsoUrl.startsWith("jar:")) - { - log.warn("[JBWS-2342] wsgen tool does not support jaxws-api and jaxb libraries loaded through vfszip. " + - "Try running this with JDK6 so that they're provided by the JDK runtime. Wrapper generation skipped."); - return false; - } - return true; - } - - private ServerConfig getServerConfig() - { - if (serverConfig == null) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); - serverConfig = spi.getServerConfig(); - } - return serverConfig; - } - - protected String getClasspath(ClassLoader classLoader, URL archiveUrl) - { - StringBuffer sb = new StringBuffer(); - ServerConfig cfg = getServerConfig(); - File clientDir = new File(cfg.getHomeDir(), "client"); - File[] libs = clientDir.listFiles(); - if (libs != null && libs.length > 0) - { - for (File lib : libs) - { - sb.append(lib.getAbsolutePath()).append(File.pathSeparator); - } - sb.delete(sb.length() - 1, sb.length()); - } - URL[] urls = getURLs(classLoader, archiveUrl); - for (URL url : urls) - { - sb.append(File.pathSeparator); - sb.append(url.getPath()); - } - return sb.toString(); - } - - protected File getTempDir(URL archiveUrl) - { - File tempJBossWSDir = new File(getServerConfig().getServerTempDir(), "jbossws"); - if (!tempJBossWSDir.exists()) - tempJBossWSDir.mkdir(); - String archivePath = archiveUrl.getPath(); - if (archivePath.endsWith("/")) - archivePath = archivePath.substring(0, archivePath.length() - 1); - String archiveName = archivePath.substring(archivePath.lastIndexOf("/")); - File tempDir = new File(tempJBossWSDir, archiveName + "-" + new Date().getTime()); - if (!tempDir.exists()) - tempDir.mkdir(); - return tempDir; - } - - private URL[] getURLs(ClassLoader classLoader, URL archiveUrl) - { - List<URL> urls = new LinkedList<URL>(); - try - { - if (archiveUrl.toString().endsWith(".war")) - { - List<URL> innerUrlList = new LinkedList<URL>(); - if (classLoader instanceof URLClassLoader) - { - innerUrlList.addAll(Arrays.asList(((URLClassLoader)classLoader).getURLs())); - } - if (innerUrlList.isEmpty()) - { - File dest = getTempDir(archiveUrl); - JarUtils.unjar(archiveUrl.openStream(), dest); - File webInf = new File(dest, "WEB-INF"); - if (webInf.exists()) - { - innerUrlList.add(webInf.toURL()); - innerUrlList.add(new File(webInf, "classes").toURL()); - } - } - urls.addAll(innerUrlList); - } - else if (archiveUrl.toString().endsWith(".jar") || archiveUrl.toString().endsWith(".jar/")) - { - if (new File(archiveUrl.getPath()).exists()) - { - urls.add(archiveUrl); - } - else - { - File dest = getTempDir(archiveUrl); - JarUtils.unjar(archiveUrl.openStream(), dest); - urls.add(dest.toURL()); - } - } - else if (archiveUrl.toString().endsWith(".war/")) - { - File webInf = new File(archiveUrl.getFile(), "WEB-INF"); - if (webInf.exists()) - { - urls.add(webInf.toURL()); - urls.add(new File(webInf, "classes").toURL()); - } - } - else - throw new WebServiceException("Unsupported deployment archive: " + archiveUrl); - } - catch (Exception e) - { - throw new WebServiceException("Cannot get classpath URLs for archive: " + archiveUrl, e); - } - return (URL[])urls.toArray(new URL[0]); - } -}

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8706 - in stack/metro/trunk: modules/client and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 04:28:35 -0500 (Wed, 12 Nov 2008) New Revision: 8706 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2392] Using WSIT-1.3.1 Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/client/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -48,12 +48,12 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.wsit</groupId> - <artifactId>txnannprocessor</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> + <artifactId>txnannprocessor</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-11-12 09:28:35 UTC (rev 8706) @@ -33,6 +33,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2008-11-12 09:28:35 UTC (rev 8706) @@ -67,6 +67,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/streambuffer.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-ex.jar" Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-11-12 09:28:35 UTC (rev 8706) @@ -31,6 +31,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2008-11-12 09:28:35 UTC (rev 8706) @@ -65,6 +65,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/streambuffer.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/stax-ex.jar" Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -36,6 +36,7 @@ <include name="**/jbossws-metro-wsit-rt.jar"/> <include name="**/jbossws-metro-wsit-tools.jar"/> <include name="**/jbossws-spi.jar"/> + <include name="**/policy.jar"/> <include name="**/streambuffer.jar"/> <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> @@ -86,17 +87,16 @@ <include name="**/jsr181-api.jar"/> <include name="**/jsr250-api.jar"/> <include name="**/mimepull.jar"/> + <include name="**/policy.jar"/> <include name="**/resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> - <include name="**/sjsxp.jar"/> <include name="**/stax-ex.jar"/> <include name="**/stax-utils.jar"/> <include name="**/streambuffer.jar"/> <include name="**/txnannprocessor.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/wstx.jar"/> - <include name="**/xmldsig.jar"/> <include name="**/xmlsec.jar"/> <include name="**/xws-security.jar"/> </patternset> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/server/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -70,12 +70,12 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.wsit</groupId> - <artifactId>txnannprocessor</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> + <artifactId>txnannprocessor</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -68,7 +68,7 @@ <sun.sjsxp.version>1.0.1</sun.sjsxp.version> <sun.http-transport.version>2.1.3</sun.http-transport.version> <sun.jaxws.version>2.1.4</sun.jaxws.version> - <sun.wsit.version>1.1</sun.wsit.version> + <sun.wsit.version>1.3.1</sun.wsit.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.1</wsdl4j.version> </properties> @@ -210,6 +210,11 @@ <version>${sun.jaxws.version}</version> </dependency> <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.wsit</groupId> <artifactId>wsit-rt</artifactId> <version>${sun.wsit.version}</version> @@ -226,11 +231,6 @@ </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> - <version>${sun.wsit.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.wsit</groupId> <artifactId>xmlsec</artifactId> <version>${sun.wsit.version}</version> </dependency> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -37,16 +37,15 @@ <include>*:jsr181-api:jar</include> <include>*:jsr250-api:jar</include> <include>*:mimepull:jar</include> + <include>*:policy:jar</include> <include>*:resolver:jar</include> <include>*:saaj-api:jar</include> <include>*:saaj-impl:jar</include> - <include>*:sjsxp:jar</include> <include>*:stax-api:jar</include> <include>*:stax-ex:jar</include> <include>*:streambuffer:jar</include> <include>*:txnannprocessor:jar</include> <include>*:wsdl4j:jar</include> - <include>*:xmldsig:jar</include> <include>*:xmlsec:jar</include> <include>*:xws-security:jar</include> <include>*:junit:jar</include>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8705 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 04:24:23 -0500 (Wed, 12 Nov 2008) New Revision: 8705 Modified: stack/metro/trunk/pom.xml Log: [JBWS-2391] Updating to JAXWS-RI 2.1.4 and JAXB impl 2.1.9 Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-11 19:44:25 UTC (rev 8704) +++ stack/metro/trunk/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) @@ -59,14 +59,15 @@ <jboss.common.version>1.2.1.GA</jboss.common.version> <commons.logging.version>1.1.1</commons.logging.version> <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.6</jaxb.impl.version> + <jaxb.impl.version>2.1.9</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> <apache.scout.version>0.7rc2</apache.scout.version> <juddi.version>0.9RC4</juddi.version> <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.sjsxp.version>1.0.1</sun.sjsxp.version> - <sun.jaxws.version>2.1.3</sun.jaxws.version> + <sun.http-transport.version>2.1.3</sun.http-transport.version> + <sun.jaxws.version>2.1.4</sun.jaxws.version> <sun.wsit.version>1.1</sun.wsit.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.1</wsdl4j.version> @@ -191,12 +192,12 @@ <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>http</artifactId> - <version>${sun.jaxws.version}</version> + <version>${sun.http-transport.version}</version> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-local-transport</artifactId> - <version>${sun.jaxws.version}</version> + <version>${sun.http-transport.version}</version> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8704 - stack/native/trunk/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-11 14:44:25 -0500 (Tue, 11 Nov 2008) New Revision: 8704 Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: remove AS 421 staff Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-11 14:39:49 UTC (rev 8703) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-11 19:44:25 UTC (rev 8704) @@ -61,15 +61,6 @@ <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> -  - <dependencySet> - <outputFileNameMapping>jboss-xml-binding.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <includes> - <include>org.jboss:jbossxb:jar:1.0.0.SP2</include> - </includes> - </dependencySet> </dependencySets> </binaries> </moduleSet>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8703 - stack/native/branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-11 09:39:49 -0500 (Tue, 11 Nov 2008) New Revision: 8703 Removed: stack/native/branches/dlofthouse/JBWS-2389/ Log: No longer required

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8702 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-11 09:36:09 -0500 (Tue, 11 Nov 2008) New Revision: 8702 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java Log: [JBWS-2389] Remove System.out Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:34:51 UTC (rev 8701) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:36:09 UTC (rev 8702) @@ -88,7 +88,6 @@ 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); }

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r8701 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/tools and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-11 09:34:51 -0500 (Tue, 11 Nov 2008) New Revision: 8701 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: [JBWS-2389] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -100,7 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; - private Map<String, String> namespacePackageMap = new HashMap<String,String>(); + private Map<String, String> namespacePackageMap = new HashMap<String, String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -718,10 +718,11 @@ XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; XSTypeDefinition baseType = xc.getBaseType(); short der = xc.getDerivationMethod(); + String typeQName = ""; if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) { - addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types } // handleContentTypeElementsWithDerivationNone @@ -749,15 +750,17 @@ javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) - temp.append(">").append(containingType); + temp.append(containingType); temp.append(">").append(name); localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); + typeQName = localName; } else { javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); + typeQName = xc.getName(); } if (typeNamespace == null) @@ -794,7 +797,15 @@ } if (xm != null) - addGroup(xm, name, xc.getName(), jwm); + { + String container = containingElement; + if (container == null || container.length() == 0) + { + container = name; + } + + addGroup(xm, container, typeQName, jwm); + } } // Add enum simpleType support @@ -816,7 +827,7 @@ XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); - + // JBWS-1170 Convert characters which are illegal in Java identifiers vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name))); vm.setXmlElementName(name); @@ -924,7 +935,8 @@ { jtype = JavaUtils.getSourceName(javaType); } - else jtype = javaType.getName(); + else + jtype = javaType.getName(); } return jtype + arraySuffix; Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389 (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389) Deleted: stack/native/trunk/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/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,109 +0,0 @@ -/* - * 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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -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/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389 (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389) Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class Lookup -{ - -protected org.jboss.test.ws.jbws2389.LookupDetails details; -public Lookup(){} - -public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class Lookup +{ + +protected org.jboss.test.ws.jbws2389.LookupDetails details; +public Lookup(){} + +public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class LookupDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupName name; -public LookupDetails(){} - -public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ -this.name=name; -} -public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} - -public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupName name; +public LookupDetails(){} + +public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ +this.name=name; +} +public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} + +public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class LookupName -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public LookupName(){} - -public LookupName(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupName +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public LookupName(){} + +public LookupName(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class LookupResponse -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; -public LookupResponse(){} - -public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponse +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; +public LookupResponse(){} + +public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class LookupResponseDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; -public LookupResponseDetails(){} - -public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ -this.number=number; -} -public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponseDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; +public LookupResponseDetails(){} + +public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ +this.number=number; +} +public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} + +public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } + +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws2389; - - -public class LookupResponseNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public LookupResponseNumber(){} - -public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponseNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public LookupResponseNumber(){} + +public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/trunk/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/PhoneBook.wsdl 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,79 +0,0 @@ -<?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/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-11 14:34:51 UTC (rev 8701) @@ -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 Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws2389; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; -} Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws2389; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,103 +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.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws2389.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws2389.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</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.jbws2389.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-11 14:34:51 UTC (rev 8701) @@ -0,0 +1,103 @@ +<?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.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>Name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws2389.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws2389.Lookup</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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.jbws2389.LookupResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-11 14:08:59 UTC (rev 8700) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-11 14:34:51 UTC (rev 8701) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="${test.resources.directory}/tools/jbws2389/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml) =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-11 14:34:51 UTC (rev 8701) @@ -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

1
0
0 / 0

JBossWS SVN: r8700 - 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 09:08:59 -0500 (Tue, 11 Nov 2008) New Revision: 8700 Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml Modified: stack/native/branches/dlofthouse/JBWS-2389/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: Complete test case and implement fix. Modified: stack/native/branches/dlofthouse/JBWS-2389/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-11 12:56:57 UTC (rev 8699) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -100,7 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; - private Map<String, String> namespacePackageMap = new HashMap<String,String>(); + private Map<String, String> namespacePackageMap = new HashMap<String, String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -718,10 +718,11 @@ XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; XSTypeDefinition baseType = xc.getBaseType(); short der = xc.getDerivationMethod(); + String typeQName = ""; if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) { - addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types } // handleContentTypeElementsWithDerivationNone @@ -749,15 +750,17 @@ javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) - temp.append(">").append(containingType); + temp.append(containingType); temp.append(">").append(name); localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); + typeQName = localName; } else { javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); + typeQName = xc.getName(); } if (typeNamespace == null) @@ -794,7 +797,15 @@ } if (xm != null) - addGroup(xm, name, xc.getName(), jwm); + { + String container = containingElement; + if (container == null || container.length() == 0) + { + container = name; + } + + addGroup(xm, container, typeQName, jwm); + } } // Add enum simpleType support @@ -816,7 +827,7 @@ XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); - + // JBWS-1170 Convert characters which are illegal in Java identifiers vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name))); vm.setXmlElementName(name); @@ -924,7 +935,8 @@ { jtype = JavaUtils.getSourceName(javaType); } - else jtype = javaType.getName(); + else + jtype = javaType.getName(); } return jtype + arraySuffix; Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class Lookup +{ + +protected org.jboss.test.ws.jbws2389.LookupDetails details; +public Lookup(){} + +public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupName name; +public LookupDetails(){} + +public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ +this.name=name; +} +public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} + +public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupName +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public LookupName(){} + +public LookupName(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponse +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; +public LookupResponse(){} + +public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponseDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; +public LookupResponseDetails(){} + +public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ +this.number=number; +} +public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} + +public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws2389; + + +public class LookupResponseNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public LookupResponseNumber(){} + +public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws2389; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; +} Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-11 14:08:59 UTC (rev 8700) @@ -0,0 +1,103 @@ +<?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.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>Name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws2389.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws2389.Lookup</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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.jbws2389.LookupResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2008