JBossWS SVN: r4938 - stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 11:38:43 -0400 (Tue, 30 Oct 2007)
New Revision: 4938
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
Log:
rolback changes wrt soap-header decl in service-ref elements
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-10-30 12:15:40 UTC (rev 4937)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-10-30 15:38:43 UTC (rev 4938)
@@ -24,8 +24,8 @@
<handler>
<handler-name>Handler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.serviceref.ExampleHandler</handler-class>
- <soap-header xmlns:ns1="http://extra-header.org">ns1:extra-header</soap-header>
- <soap-role>extra-header-actor</soap-role>
+ <!--soap-header xmlns:soap-header_ns__="http://extra-header.org">soap-header_ns__:extra-header</soap-header>
+ <soap-role>extra-header-actor</soap-role-->
</handler>
</service-ref>
17 years, 1 month
JBossWS SVN: r4937 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 08:15:40 -0400 (Tue, 30 Oct 2007)
New Revision: 4937
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss421.txt
Log:
exclude jbws1762 for AS 421
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss421.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss421.txt 2007-10-30 12:07:34 UTC (rev 4936)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss421.txt 2007-10-30 12:15:40 UTC (rev 4937)
@@ -1,6 +1,8 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxrpc/jbws1762/**
# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
org/jboss/test/ws/jaxws/jbws1797/**
17 years, 1 month
JBossWS SVN: r4936 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-30 08:07:34 -0400 (Tue, 30 Oct 2007)
New Revision: 4936
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-30 11:44:47 UTC (rev 4935)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-30 12:07:34 UTC (rev 4936)
@@ -1,3 +1,6 @@
+# Fix BPEL before AS50 goes final
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
# [JBAS-4901] Reverse paths are not allowed (containing a . or ..)
org/jboss/test/ws/jaxws/jbws1798/**
org/jboss/test/ws/jaxrpc/jbws153/**
@@ -18,7 +21,9 @@
# [JBAS-4922] NPE in AssemblyDescriptorMetaData
org/jboss/test/ws/jaxrpc/jbws723/**
+#org/jboss/test/ws/jaxrpc/samples/secureejb/**
+org/jboss/test/ws/jaxrpc/wsse/**
# [JBAS-4923] No valid security context for the caller identity
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
+#org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
17 years, 1 month
JBossWS SVN: r4935 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 07:44:47 -0400 (Tue, 30 Oct 2007)
New Revision: 4935
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss422.txt
Log:
exclude jbws1762
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss422.txt 2007-10-30 11:04:02 UTC (rev 4934)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss422.txt 2007-10-30 11:44:47 UTC (rev 4935)
@@ -1,6 +1,8 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxrpc/jbws1762/**
# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
org/jboss/test/ws/jaxws/jbws1797/**
17 years, 1 month
JBossWS SVN: r4934 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-30 07:04:02 -0400 (Tue, 30 Oct 2007)
New Revision: 4934
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-30 10:28:22 UTC (rev 4933)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-30 11:04:02 UTC (rev 4934)
@@ -5,6 +5,9 @@
# [JBAS-4902] nested jar not deployed
org/jboss/test/ws/jaxrpc/jbws128/**
org/jboss/test/ws/jaxrpc/jbws165/**
+org/jboss/test/ws/jaxrpc/jbws331/**
+org/jboss/test/ws/jaxrpc/jbws358/**
+org/jboss/test/ws/jaxrpc/jbws772/**
org/jboss/test/ws/jaxws/jbws1813/**
# [JBAS-4890] EJBAccessException: Caller unauthorized
@@ -12,3 +15,10 @@
# [JBAS-4903] EJB 2.1 view cannot be realized
org/jboss/test/ws/jaxws/jbws944/**
+
+# [JBAS-4922] NPE in AssemblyDescriptorMetaData
+org/jboss/test/ws/jaxrpc/jbws723/**
+
+# [JBAS-4923] No valid security context for the caller identity
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
+
17 years, 1 month
JBossWS SVN: r4933 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1875: jbossws-core/src/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-10-30 06:28:22 -0400 (Tue, 30 Oct 2007)
New Revision: 4933
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml
Removed:
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1875] - WSDL to Java - Incorrect case of generated type for anonymous type.
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-30 10:06:49 UTC (rev 4932)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -555,7 +555,7 @@
XSElementDeclaration element = (XSElementDeclaration)term;
XSTypeDefinition type = element.getTypeDefinition();
- String tempContainingElement = containingElement + element.getName();
+ String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName());
QName xmlType = null;
if (type.getAnonymous() == false)
@@ -711,7 +711,7 @@
if (unwrapper.xmlType != null)
xmlType = unwrapper.xmlType;
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
if (unwrapper.array)
arraySuffix = "[]";
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-30 10:06:49 UTC (rev 4932)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -298,7 +298,7 @@
xt = element.getTypeDefinition();
primitive = unwrapper.primitive;
partName = element.getName();
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
array = unwrapper.array;
if (xt.getAnonymous())
{
@@ -632,7 +632,8 @@
QName xmlType;
if (type.getAnonymous())
{
- xmlType = new QName(type.getNamespace(), containingElement + element.getName());
+ String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName());
+ xmlType = new QName(type.getNamespace(), tempName);
}
else
{
@@ -715,7 +716,8 @@
// Anonymous
if (localName == null)
{
- javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true);
+ String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name);
+ javaType = getJavaTypeAsString(null, new QName(tempName), false, true);
StringBuilder temp = new StringBuilder();
if (containingType != null && containingType.length() > 0)
temp.append(">").append(containingType);
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1873;
-
-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-1873
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Oct 29, 2007
- */
-public class JBWS1873TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1873/" + scenario;
- String toolsDir = "tools/jbws1873/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.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/jbws1873/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
- 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]);
-
- 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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1873;
+
+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.test.ws.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1873
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 29, 2007
+ */
+public class JBWS1873TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1873/" + scenario;
+ String toolsDir = "tools/jbws1873/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.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/jbws1873/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
+ 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]);
+
+ 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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873)
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * 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.jbws1873;
-
-
-public class LookupRequest
-{
-
-protected java.lang.String surname;
-public LookupRequest(){}
-
-public LookupRequest(java.lang.String surname){
-this.surname=surname;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * 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.jbws1873;
+
+
+public class LookupRequest
+{
+
+protected java.lang.String surname;
+public LookupRequest(){}
+
+public LookupRequest(java.lang.String surname){
+this.surname=surname;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * 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.jbws1873;
-
-
-public class LookupResponseResponse
-{
-
-protected java.lang.String number;
-public LookupResponseResponse(){}
-
-public LookupResponseResponse(java.lang.String number){
-this.number=number;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * 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.jbws1873;
+
+
+public class LookupResponseResponse
+{
+
+protected java.lang.String number;
+public LookupResponseResponse(){}
+
+public LookupResponseResponse(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * 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.jbws1873;
-
-
-public class Person
-{
-
-protected org.jboss.test.ws.jbws1873.LookupRequest request;
-public Person(){}
-
-public Person(org.jboss.test.ws.jbws1873.LookupRequest request){
-this.request=request;
-}
-public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;}
-
-public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * 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.jbws1873;
+
+
+public class Person
+{
+
+protected org.jboss.test.ws.jbws1873.LookupRequest request;
+public Person(){}
+
+public Person(org.jboss.test.ws.jbws1873.LookupRequest request){
+this.request=request;
+}
+public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;}
+
+public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1873'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1873/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1873'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1873/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name="request" minOccurs="0">
- <complexType>
- <all>
- <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
- </all>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name="response" minOccurs="0">
- <complexType>
- <all>
- <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
- </all>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </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' parts='parameters'/>
- </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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1873'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name="request" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name="response" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </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' parts='parameters'/>
+ </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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * 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.jbws1873;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException;
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * 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.jbws1873;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException;
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * 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.jbws1873;
-
-
-public class TelephoneNumber
-{
-
-protected org.jboss.test.ws.jbws1873.LookupResponseResponse response;
-public TelephoneNumber(){}
-
-public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){
-this.response=response;
-}
-public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;}
-
-public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * 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.jbws1873;
+
+
+public class TelephoneNumber
+{
+
+protected org.jboss.test.ws.jbws1873.LookupResponseResponse response;
+public TelephoneNumber(){}
+
+public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){
+this.response=response;
+}
+public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;}
+
+public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,78 +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.jbws1873</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1873</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>request</java-variable-name>
- <xml-element-name>request</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <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.jbws1873.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>response</java-variable-name>
- <xml-element-name>response</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</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>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>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.jbws1873.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>request</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.jbws1873.LookupResponseResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>response</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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,78 @@
+<?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.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>request</java-variable-name>
+ <xml-element-name>request</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <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.jbws1873.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>response</java-variable-name>
+ <xml-element-name>response</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</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>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>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.jbws1873.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>request</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.jbws1873.LookupResponseResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>response</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: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 18:44:57 UTC (rev 4927)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-30 10:28:22 UTC (rev 4933)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl"
- parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-30 10:28:22 UTC (rev 4933)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl"
+ parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years, 1 month
JBossWS SVN: r4932 - stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-30 06:06:49 -0400 (Tue, 30 Oct 2007)
New Revision: 4932
Modified:
stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
Log:
Fix test
Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-10-30 09:15:48 UTC (rev 4931)
+++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-10-30 10:06:49 UTC (rev 4932)
@@ -132,8 +132,8 @@
targets.add(new WsuIdTarget("timestamp"));
LinkedList operations = new LinkedList();
- operations.add(new OperationDescription(TimestampOperation.class, null, null, "300", null));
- operations.add(new OperationDescription(SignatureOperation.class, targets, "wsse", null, null));
+ operations.add(new OperationDescription(TimestampOperation.class, null, null, "300", null, null));
+ operations.add(new OperationDescription(SignatureOperation.class, targets, "wsse", null, null, null));
name = new QName("http://org.jboss.ws/2004", "someHeader");
target = new QNameTarget(name);
@@ -144,8 +144,8 @@
target = new QNameTarget(name, true);
targets.add(target);
- operations.add(new OperationDescription(EncryptionOperation.class, targets, "wsse", null, null));
- operations.add(new OperationDescription(SendUsernameOperation.class, null, "hi", "there", null));
+ operations.add(new OperationDescription(EncryptionOperation.class, targets, "wsse", null, null, null));
+ operations.add(new OperationDescription(SendUsernameOperation.class, null, "hi", "there", null, null));
return operations;
}
@@ -161,8 +161,8 @@
targets.add(target);
//targets.add(new WsuIdTarget("timestamp"));
LinkedList operations = new LinkedList();
- operations.add(new OperationDescription(RequireSignatureOperation.class, targets, null, null, null));
- operations.add(new OperationDescription(RequireEncryptionOperation.class, targets, null, null, null));
+ operations.add(new OperationDescription(RequireSignatureOperation.class, targets, null, null, null, null));
+ operations.add(new OperationDescription(RequireEncryptionOperation.class, targets, null, null, null, null));
return operations;
}
17 years, 1 month
JBossWS SVN: r4931 - stack/native/branches/rest/src/main/java/org/jboss/rs/model.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 05:15:48 -0400 (Tue, 30 Oct 2007)
New Revision: 4931
Removed:
stack/native/branches/rest/src/main/java/org/jboss/rs/model/EntityResolver.java
Log:
Remove files that are not used
Deleted: stack/native/branches/rest/src/main/java/org/jboss/rs/model/EntityResolver.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/EntityResolver.java 2007-10-30 09:13:25 UTC (rev 4930)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/EntityResolver.java 2007-10-30 09:15:48 UTC (rev 4931)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.rs.model;
-
-import java.util.List;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class EntityResolver
-{
- List<ResourceModel> resourceModels;
-
- public EntityResolver(List<ResourceModel> resourceModels)
- {
- this.resourceModels = resourceModels;
- }
-
- public EntityModel resolveEntityModel(String uri)
- {
- assert !uri.startsWith("/");
-
-
- return null;
- }
-}
17 years, 1 month
JBossWS SVN: r4930 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 05:13:25 -0400 (Tue, 30 Oct 2007)
New Revision: 4930
Added:
stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-setup.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
stack/native/trunk/ant.properties.example
Log:
Added jboss-423 build targets
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2007-10-30 09:12:29 UTC (rev 4929)
+++ stack/native/trunk/ant-import/build-deploy.xml 2007-10-30 09:13:25 UTC (rev 4930)
@@ -56,7 +56,8 @@
<!-- Deploy jbossws to jboss422 -->
<target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422">
- <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-deploy-native422 jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
<macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss422.home}"/>
</target>
@@ -66,12 +67,34 @@
<!-- Remove jbossws from jboss422 -->
<target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422">
- <macro-undeploy-native422/>
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-native422 jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<target name="undeploy-jboss422-endorsed" depends="prepare">
<macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
+
+ <!-- Deploy jbossws to jboss423 -->
+ <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423">
+ <!--fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/-->
+ <macro-deploy-native422 jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss423.home}"/>
+ </target>
+
+ <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss423 -->
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423">
+ <!--fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/-->
+ <macro-undeploy-native422 jbosshome="${jboss423.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
+ </target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
<!-- Deploy jbossws to jboss500 -->
<target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500">
@@ -93,4 +116,4 @@
<macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: stack/native/trunk/ant-import/build-setup.xml
===================================================================
--- stack/native/trunk/ant-import/build-setup.xml 2007-10-30 09:12:29 UTC (rev 4929)
+++ stack/native/trunk/ant-import/build-setup.xml 2007-10-30 09:13:25 UTC (rev 4930)
@@ -72,6 +72,7 @@
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
@@ -96,4 +97,4 @@
</tstamp>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-30 09:12:29 UTC (rev 4929)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-30 09:13:25 UTC (rev 4930)
@@ -309,15 +309,16 @@
<macrodef name="macro-deploy-native422">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
<sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ <unzip dest="@{jbosshome}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss422.home}/client" overwrite="true">
+ <copy todir="@{jbosshome}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -339,20 +340,21 @@
</copy>
<!-- SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
<macrodef name="macro-undeploy-native422">
+ <attribute name="jbosshome"/>
<sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+
<delete>
<!-- BIN SCRIPTS -->
- <fileset dir="${jboss422.home}/bin">
+ <fileset dir="@{jbosshome}/bin">
<include name="wsconsume.*"/>
<include name="wsprovide.*"/>
<include name="wsrunclient.*"/>
@@ -360,7 +362,7 @@
</fileset>
<!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
+ <fileset dir="@{jbosshome}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -380,14 +382,14 @@
</fileset>
<!-- SERVER JARS -->
- <fileset dir="${jboss422.home}/lib/endorsed">
+ <fileset dir="@{jbosshome}/lib/endorsed">
<include name="jaxb-api.jar"/>
</fileset>
- <fileset dir="${jboss422.home}/lib">
+ <fileset dir="@{jbosshome}/lib">
<!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
- <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-jaxws-ext.jar"/>
@@ -396,8 +398,8 @@
<include name="jbossws-integration.jar"/>
</fileset>
</delete>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -509,4 +511,4 @@
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2007-10-30 09:12:29 UTC (rev 4929)
+++ stack/native/trunk/ant.properties.example 2007-10-30 09:13:25 UTC (rev 4930)
@@ -8,6 +8,7 @@
#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
#jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA/
#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500]
Added: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss423.txt (rev 0)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2007-10-30 09:13:25 UTC (rev 4930)
@@ -0,0 +1,7 @@
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+org/jboss/test/ws/jaxws/jbws1797/**
+
Property changes on: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBossWS SVN: r4929 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-30 05:12:29 -0400 (Tue, 30 Oct 2007)
New Revision: 4929
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
jboss-423 build target
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-29 21:10:36 UTC (rev 4928)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-30 09:12:29 UTC (rev 4929)
@@ -23,6 +23,9 @@
<condition property="jboss.home" value="${jboss422.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
</condition>
+ <condition property="jboss.home" value="${jboss423.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </condition>
<condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
</condition>
17 years, 1 month