JBossWS SVN: r4097 - container.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 08:41:02 -0400 (Thu, 02 Aug 2007)
New Revision: 4097
Added:
container/jboss42/
Log:
create container integration projects
17 years, 5 months
- 1
- 0
JBossWS SVN: r4096 - container.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 08:40:54 -0400 (Thu, 02 Aug 2007)
New Revision: 4096
Added:
container/jboss50/
Log:
create container integration projects
17 years, 5 months
- 1
- 0
JBossWS SVN: r4095 - /.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 08:40:45 -0400 (Thu, 02 Aug 2007)
New Revision: 4095
Added:
container/
Log:
create container integration projects
17 years, 5 months
- 1
- 0
JBossWS SVN: r4094 - in trunk: integration/jboss42 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 08:38:10 -0400 (Thu, 02 Aug 2007)
New Revision: 4094
Modified:
trunk/integration/jboss40/.classpath
trunk/integration/jboss42/.classpath
trunk/integration/jboss50/.classpath
trunk/integration/native/.classpath
trunk/integration/spi/.classpath
trunk/integration/sunri/.classpath
trunk/integration/xfire/.classpath
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/testsuite/.classpath
Log:
Fix eclipse classpath
Modified: trunk/integration/jboss40/.classpath
===================================================================
--- trunk/integration/jboss40/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/jboss40/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -12,5 +12,6 @@
<classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss42/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/jboss42/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -10,5 +10,6 @@
<classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss50/.classpath
===================================================================
--- trunk/integration/jboss50/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/jboss50/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -10,5 +10,6 @@
<classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/native/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -10,5 +10,6 @@
<classpathentry kind="lib" path="/integration-framework/thirdparty/activation.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/spi/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -24,5 +24,6 @@
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/sunri/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -25,5 +25,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/integration/xfire/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -20,5 +20,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/jbossws-core/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -38,5 +38,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 12:38:10 UTC (rev 4094)
@@ -29,6 +29,8 @@
<path id="ws.stack.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-08-02 11:15:49 UTC (rev 4093)
+++ trunk/testsuite/.classpath 2007-08-02 12:38:10 UTC (rev 4094)
@@ -14,5 +14,6 @@
<classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years, 5 months
- 1
- 0
JBossWS SVN: r4093 - in branches/jbossws-1.2.1.GA_JBWS-1768: jbossws-tests/src/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-02 07:15:49 -0400 (Thu, 02 Aug 2007)
New Revision: 4093
Added:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml
Removed:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml
Modified:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
Log:
JBWS-1768 - WSDL-JAVA Derivation of a complex type from a Simple type: bas64Binary is not mapped to byte[].
Modified: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-02 11:14:11 UTC (rev 4092)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-02 11:15:49 UTC (rev 4093)
@@ -56,6 +56,7 @@
/** Class that converts a XSD Type into Java class
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ * @author mageshbk(a)jboss.com
* @since Apr 4, 2005
*/
public class XSDTypeToJava
@@ -202,7 +203,17 @@
XSSimpleTypeDefinition xssimple = type.getSimpleType();
QName q = new QName(xssimple.getNamespace(), xssimple.getName());
QName qn = schemautils.patchXSDQName(q);
- VAR v = new VAR("_value", typeMapping.getJavaType(qn).getName(), false);
+ Class javaType = typeMapping.getJavaType(qn);
+ String jtype = null;
+ if (javaType.isArray())
+ {
+ jtype = JavaUtils.getSourceName(javaType);
+ }
+ else
+ {
+ jtype = javaType.getName();
+ }
+ VAR v = new VAR("_value", jtype, false);
vars.add(v);
}
}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725 (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1725)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2007-07-19 12:08:44 UTC (rev 3948)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2007-08-02 11:15:49 UTC (rev 4093)
@@ -1,61 +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.test.ws.tools.jbws1725;
-
-import java.io.File;
-
-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.spi.test.JBossWSTest;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1725
- *
- * WSDL-JAVA Derivation of a complex type from a Simple type: bas64Binary
- * is not mapped to byte[]
- *
- * @author mageshbk(a)jboss.com
- * @since Jul 19, 2007
- */
-public class JBWS1725TestCase extends JBossWSTest
-{
-
- public void testExtensionType() throws Exception
- {
- String resourceDir = "resources/tools/jbws1725";
- String toolsDir = "tools/jbws1725";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- compareSource(resourceDir + "/PasswordType.java", toolsDir + "/org/jboss/test/ws/jbws1725/PasswordType.java");
- }
-
- 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();
- }
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2007-08-02 11:15:49 UTC (rev 4093)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1725;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1725
+ *
+ * WSDL-JAVA Derivation of a complex type from a Simple type: bas64Binary
+ * is not mapped to byte[]
+ *
+ * @author mageshbk(a)jboss.com
+ * @since Jul 19, 2007
+ */
+public class JBWS1725TestCase extends JBossWSTest
+{
+
+ public void testExtensionType() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1725";
+ String toolsDir = "tools/jbws1725";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource(resourceDir + "/PasswordType.java", toolsDir + "/org/jboss/test/ws/jbws1725/PasswordType.java");
+ }
+
+ 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();
+ }
+}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725 (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/Extension.wsdl 2007-07-19 12:08:44 UTC (rev 3948)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl 2007-08-02 11:15:49 UTC (rev 4093)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1725' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1725/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1725' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1725/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1725/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name="PasswordType">
- <simpleContent>
- <extension base="xsd:base64Binary"/>
- </simpleContent>
- </complexType>
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- <element name='password' type='tns:PasswordType'/>
- </sequence>
- </complexType>
- <complexType name='TelephoneNumber'>
- <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 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'/>
- </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: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/Extension.wsdl)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/Extension.wsdl 2007-08-02 11:15:49 UTC (rev 4093)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1725' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1725/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1725' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1725/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1725/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name="PasswordType">
+ <simpleContent>
+ <extension base="xsd:base64Binary"/>
+ </simpleContent>
+ </complexType>
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='password' type='tns:PasswordType'/>
+ </sequence>
+ </complexType>
+ <complexType name='TelephoneNumber'>
+ <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 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'/>
+ </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: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/PasswordType.java 2007-07-19 12:08:44 UTC (rev 3948)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java 2007-08-02 11:15:49 UTC (rev 4093)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Jul 16 18:47:44 IST 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.jbws1725;
-
-
-public class PasswordType
-{
-
-protected byte[] _value;
-public PasswordType(){}
-
-public PasswordType(byte[] _value){
-this._value=_value;
-}
-public byte[] get_value() { return _value ;}
-
-public void set_value(byte[] _value){ this._value=_value; }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/PasswordType.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/PasswordType.java 2007-08-02 11:15:49 UTC (rev 4093)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Jul 16 18:47:44 IST 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.jbws1725;
+
+
+public class PasswordType
+{
+
+protected byte[] _value;
+public PasswordType(){}
+
+public PasswordType(byte[] _value){
+this._value=_value;
+}
+public byte[] get_value() { return _value ;}
+
+public void set_value(byte[] _value){ this._value=_value; }
+
+}
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/wstools-config.xml 2007-07-19 12:08:44 UTC (rev 3948)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml 2007-08-02 11:15:49 UTC (rev 4093)
@@ -1,9 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <wsdl-java location="resources/tools/jbws1725/Extension.wsdl" parameter-style="bare">
- <mapping file="extended-mapping.xml"/>
- </wsdl-java>
-
-</configuration>
\ No newline at end of file
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml (from rev 3948, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1725/wstools-config.xml)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1725/wstools-config.xml 2007-08-02 11:15:49 UTC (rev 4093)
@@ -0,0 +1,9 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <wsdl-java location="resources/tools/jbws1725/Extension.wsdl" parameter-style="bare">
+ <mapping file="extended-mapping.xml"/>
+ </wsdl-java>
+
+</configuration>
\ No newline at end of file
17 years, 5 months
- 1
- 0
JBossWS SVN: r4092 - in trunk: integration/jboss40/ant-import and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 07:14:11 -0400 (Thu, 02 Aug 2007)
New Revision: 4092
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/common/
trunk/integration/spi/src/main/java/org/jboss/wsf/test/
Modified:
trunk/build/version.properties
trunk/integration/jboss40/ant-import/build-thirdparty.xml
trunk/integration/jboss42/ant-import/build-thirdparty.xml
trunk/integration/jboss50/ant-import/build-thirdparty.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/build-thirdparty.xml
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/integration/spi/ant-import/macros-deploy-wsf.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
Log:
Externalize jbossws-common.jar
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/build/version.properties 2007-08-02 11:14:11 UTC (rev 4092)
@@ -24,6 +24,7 @@
jboss-jaxr=1.2.0.GA
jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
+jbossws-common=2.0.1.CR1
jbossws-spi=2.0.1.CR1
junit=3.8.1
stax-api=1.0
Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -34,6 +34,7 @@
<path id="jbws40.integration.classpath">
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -33,6 +33,7 @@
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -33,6 +33,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.integration.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -28,6 +28,8 @@
<path id="ws.stack.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: trunk/integration/native/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -36,6 +36,7 @@
<pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
<pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
<pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${framework.dir}/thirdparty/servlet-api.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -48,6 +48,7 @@
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
@@ -88,6 +89,7 @@
<pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
Modified: trunk/integration/spi/ant-import/macros-deploy-wsf.xml
===================================================================
--- trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -29,6 +29,7 @@
<include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
<include name="jbossws-spi.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
@@ -40,6 +41,7 @@
<include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
<include name="jbossws-spi.jar"/>
</fileset>
</copy>
@@ -58,6 +60,7 @@
<!-- CLIENT JARS-->
<fileset dir="@{jbosshome}/client">
+ <include name="jbossws-common.jar"/>
<include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
<include name="wsdl4j.jar"/>
@@ -65,6 +68,7 @@
<!-- SERVER JARS-->
<fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-common.jar"/>
<include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
</fileset>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -28,6 +28,7 @@
<path id="ws.stack.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -43,6 +43,7 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
@@ -83,6 +84,7 @@
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -28,6 +28,7 @@
<path id="ws.stack.classpath">
<pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -58,6 +58,7 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
@@ -80,6 +81,7 @@
<pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092)
@@ -67,6 +67,8 @@
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
@@ -82,7 +84,6 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -137,6 +138,7 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
17 years, 5 months
- 1
- 0
JBossWS SVN: r4091 - trunk/integration/xfire/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 07:05:57 -0400 (Thu, 02 Aug 2007)
New Revision: 4091
Modified:
trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt
Log:
update exclude files
Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-08-02 10:49:01 UTC (rev 4090)
+++ trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-08-02 11:05:57 UTC (rev 4091)
@@ -55,5 +55,5 @@
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/tools/**
+org/jboss/test/ws/jaxws/smoke/tools/**
Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-08-02 10:49:01 UTC (rev 4090)
+++ trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-08-02 11:05:57 UTC (rev 4091)
@@ -55,5 +55,5 @@
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/tools/**
+org/jboss/test/ws/jaxws/smoke/tools/**
17 years, 5 months
- 1
- 0
JBossWS SVN: r4090 - in common/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 06:49:01 -0400 (Thu, 02 Aug 2007)
New Revision: 4090
Modified:
common/trunk/ant-import/build-thirdparty.xml
common/trunk/src/main/etc/default.mf
common/trunk/version.properties
Log:
Cleanup thirdparty
Modified: common/trunk/ant-import/build-thirdparty.xml
===================================================================
--- common/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:49:01 UTC (rev 4090)
@@ -38,9 +38,6 @@
<target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
@@ -49,15 +46,11 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<checksum file="${common.dir}/version.properties" fileext=".md5"/>
</target>
@@ -66,19 +59,14 @@
<!-- The compile classpath for jbossws common -->
<path id="common.thirdparty.classpath">
<pathelement location="${thirdparty.dir}/activation.jar"/>
- <pathelement location="${thirdparty.dir}/dom4j.jar"/>
- <pathelement location="${thirdparty.dir}/getopt.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
</target>
Modified: common/trunk/src/main/etc/default.mf
===================================================================
--- common/trunk/src/main/etc/default.mf 2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/src/main/etc/default.mf 2007-08-02 10:49:01 UTC (rev 4090)
@@ -8,4 +8,3 @@
Implementation-Version: @implementation.version@ (build=(a)build.id@)
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
-Class-Path: getopt.jar
\ No newline at end of file
Modified: common/trunk/version.properties
===================================================================
--- common/trunk/version.properties 2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/version.properties 2007-08-02 10:49:01 UTC (rev 4090)
@@ -14,18 +14,12 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-apache-ant=1.6.5
-dom4j=1.6.1
-gnu-getopt=1.0.10
jboss-common-core=2.0.2.GA
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0-SNAPSHOT
-jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
jbossws-spi=2.0.1.CR1
sun-jaf=1.1
sun-jaxb=2.1.4
sun-jaxrpc=1.1
sun-jaxws=2.1.1
-sun-servlet=2.5
17 years, 5 months
- 1
- 0
JBossWS SVN: r4089 - in branches/jbossws-1.2.1.GA_JBWS-1768: jbossws-tests/src/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-02 06:44:44 -0400 (Thu, 02 Aug 2007)
New Revision: 4089
Added:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml
Removed:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml
Modified:
branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
Log:
JBWS-1768 - NPE in WSDL to Java when webservices.xml requested but no global package mapping.
Modified: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-02 10:36:03 UTC (rev 4088)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-02 10:44:44 UTC (rev 4089)
@@ -331,7 +331,7 @@
if (wsdl.getInterfaces().length == 1)
{
- String seiPackage = wsdlToJava.getNamespacePackageMap().get(wsdl.getTargetNamespace());
+ String seiPackage = getPackageName(wsdl, glc);
seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]);
}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536 (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-01 17:29:10 UTC (rev 4064)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-02 10:44:44 UTC (rev 4089)
@@ -1,55 +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.jbws1536;
-
-import java.io.FileInputStream;
-
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.spi.test.JBossWSTest;
-import org.w3c.dom.Element;
-
-/**
- * [JBWS-1536] NPE in WSDL to Java when webservices.xml requested but no global package mapping
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1536
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Aug 1, 2007
- */
-public class JBWS1536TestCase extends JBossWSTest
-{
-
- public final void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1536";
- String toolsDir = "tools/jbws1536";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
-
- new WSTools().generate(args);
-
- Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml"));
- Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml"));
- assertEquals(expected, was);
- }
-
-}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-02 10:44:44 UTC (rev 4089)
@@ -0,0 +1,55 @@
+/*
+ * 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.jbws1536;
+
+import java.io.FileInputStream;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.tools.WSTools;
+import org.w3c.dom.Element;
+
+/**
+ * [JBWS-1536] NPE in WSDL to Java when webservices.xml requested but no global package mapping
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1536
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Aug 1, 2007
+ */
+public class JBWS1536TestCase extends JBossWSTest
+{
+
+ public final void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1536";
+ String toolsDir = "tools/jbws1536";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+
+ new WSTools().generate(args);
+
+ Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml"));
+ Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml"));
+ assertEquals(expected, was);
+ }
+
+}
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536 (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536)
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-01 17:29:10 UTC (rev 4064)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-02 10:44:44 UTC (rev 4089)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1536' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1536/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1536' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1536/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1536/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </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'/>
- </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: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-02 10:44:44 UTC (rev 4089)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1536' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1536/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1536' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1536/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1536/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </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'/>
+ </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: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml 2007-08-01 17:29:10 UTC (rev 4064)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml 2007-08-02 10:44:44 UTC (rev 4089)
@@ -1,15 +0,0 @@
-<webservices 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_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>PhoneBook</webservice-description-name>
- <wsdl-file>META-INF/wsdl/PhoneBook.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/null</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>PhoneBookPort</port-component-name>
- <wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1536'>portNS:PhoneBookPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1536.PhoneBook_PortType</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>PhoneBook</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/webservices.xml 2007-08-02 10:44:44 UTC (rev 4089)
@@ -0,0 +1,15 @@
+<webservices 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_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>PhoneBook</webservice-description-name>
+ <wsdl-file>META-INF/wsdl/PhoneBook.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/null</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>PhoneBookPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1536'>portNS:PhoneBookPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1536.PhoneBook_PortType</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link>PhoneBook</ejb-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml 2007-08-01 17:29:10 UTC (rev 4064)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml 2007-08-02 10:44:44 UTC (rev 4089)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <wsdl-java location="resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare">
- <webservices ejb-link="PhoneBook" />
- </wsdl-java>
-
-</configuration>
Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml)
===================================================================
--- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml (rev 0)
+++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1536/wstools-config.xml 2007-08-02 10:44:44 UTC (rev 4089)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <wsdl-java location="resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare">
+ <webservices ejb-link="PhoneBook" />
+ </wsdl-java>
+
+</configuration>
17 years, 5 months
- 1
- 0
JBossWS SVN: r4088 - common and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 06:36:03 -0400 (Thu, 02 Aug 2007)
New Revision: 4088
Added:
common/
common/trunk/
common/trunk/src/main/java/org/jboss/wsf/common/
common/trunk/src/main/java/org/jboss/wsf/test/
Removed:
common/trunk/
common/trunk/ant-import/macros-deploy-spi.xml
common/trunk/src/main/java/org/jboss/wsf/spi/
Modified:
common/trunk/.project
common/trunk/ant-import/build-release.xml
common/trunk/ant-import/build-setup.xml
common/trunk/ant-import/build-thirdparty.xml
common/trunk/build.xml
common/trunk/src/main/etc/component-info.xml
common/trunk/version.properties
Log:
Initial import
Copied: common (from rev 4077, spi)
Copied: common/trunk (from rev 4087, spi/trunk)
Modified: common/trunk/.project
===================================================================
--- spi/trunk/.project 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/.project 2007-08-02 10:36:03 UTC (rev 4088)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>spi</name>
+ <name>common</name>
<comment></comment>
<projects>
</projects>
Modified: common/trunk/ant-import/build-release.xml
===================================================================
--- spi/trunk/ant-import/build-release.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/ant-import/build-release.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -17,18 +17,18 @@
<target name="release" depends="jars"
description="Release to jboss.local.repository">
- <!-- jboss/jbossws-spi -->
+ <!-- jboss/jbossws-common -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true">
- <fileset dir="${spi.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-src.zip"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib" overwrite="true">
+ <fileset dir="${common.output.lib.dir}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-common-src.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" file="${common.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
- <filtersfile file="${spi.dir}/version.properties"/>
+ <filtersfile file="${common.dir}/version.properties"/>
</filterset>
</copy>
Modified: common/trunk/ant-import/build-setup.xml
===================================================================
--- spi/trunk/ant-import/build-setup.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/ant-import/build-setup.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -17,14 +17,14 @@
<!-- Setup -->
<!-- ================================================================== -->
- <property name="spi.dir" value="${basedir}"/>
+ <property name="common.dir" value="${basedir}"/>
<!-- Check if ant.properties is available -->
- <available property="ant.properties.available" file="${spi.dir}/ant.properties"/>
+ <available property="ant.properties.available" file="${common.dir}/ant.properties"/>
<fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
- <property file="${spi.dir}/ant.properties"/>
- <property file="${spi.dir}/version.properties"/>
+ <property file="${common.dir}/ant.properties"/>
+ <property file="${common.dir}/version.properties"/>
<!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
Modified: common/trunk/ant-import/build-thirdparty.xml
===================================================================
--- spi/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -21,8 +21,8 @@
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
- <checksum file="${spi.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <property name="thirdparty.dir" value="${common.dir}/thirdparty"/>
+ <checksum file="${common.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty">
<or>
<not>
@@ -50,6 +50,7 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
@@ -57,13 +58,13 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <checksum file="${spi.dir}/version.properties" fileext=".md5"/>
+ <checksum file="${common.dir}/version.properties" fileext=".md5"/>
</target>
<target name="thirdparty-classpath" depends="thirdparty-get">
- <!-- The compile classpath for jbossws spi -->
- <path id="spi.thirdparty.classpath">
+ <!-- The compile classpath for jbossws common -->
+ <path id="common.thirdparty.classpath">
<pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
@@ -73,6 +74,7 @@
<pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
Deleted: common/trunk/ant-import/macros-deploy-spi.xml
===================================================================
--- spi/trunk/ant-import/macros-deploy-spi.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/ant-import/macros-deploy-spi.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <macrodef name="macro-deploy-spi">
- <attribute name="spilibs"/>
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS-->
- <copy todir="@{jbosshome}/client">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS-->
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-spi">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
- <!-- CLIENT JARS-->
- <fileset dir="@{jbosshome}/client">
- <include name="jbossws-spi.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS-->
- <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Modified: common/trunk/build.xml
===================================================================
--- spi/trunk/build.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/build.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -21,15 +21,15 @@
<!-- Setup -->
<!-- ================================================================== -->
- <property name="spi.src.dir" value="${spi.dir}/src/main"/>
- <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
- <property name="spi.output.dir" value="${spi.dir}/output"/>
- <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
- <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
- <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
- <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
+ <property name="common.src.dir" value="${common.dir}/src/main"/>
+ <property name="common.etc.dir" value="${common.src.dir}/etc"/>
+ <property name="common.java.dir" value="${common.src.dir}/java"/>
+ <property name="common.resources.dir" value="${common.src.dir}/resources"/>
+ <property name="common.output.dir" value="${common.dir}/output"/>
+ <property name="common.output.apidocs.dir" value="${common.output.dir}/apidocs"/>
+ <property name="common.output.etc.dir" value="${common.output.dir}/etc"/>
+ <property name="common.output.classes.dir" value="${common.output.dir}/classes"/>
+ <property name="common.output.lib.dir" value="${common.output.dir}/lib"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -56,20 +56,20 @@
<!-- Compile java sources -->
<target name="compile-classes" depends="init">
- <!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${spi.output.classes.dir}"/>
- <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <!-- Compile common classes with jdk1.5 -->
+ <mkdir dir="${common.output.classes.dir}"/>
+ <javac srcdir="${common.java.dir}" sourcepath="" destdir="${common.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="org/jboss/wsf/**"/>
- <classpath refid="spi.thirdparty.classpath"/>
+ <classpath refid="common.thirdparty.classpath"/>
</javac>
</target>
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${spi.output.etc.dir}"/>
- <copy todir="${spi.output.etc.dir}" filtering="yes">
- <fileset dir="${spi.etc.dir}">
+ <mkdir dir="${common.output.etc.dir}"/>
+ <copy todir="${common.output.etc.dir}" filtering="yes">
+ <fileset dir="${common.etc.dir}">
<include name="default.mf"/>
</fileset>
<filterset>
@@ -77,7 +77,7 @@
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${spi.dir}/version.properties"/>
+ <filtersfile file="${common.dir}/version.properties"/>
</filterset>
</copy>
</target>
@@ -97,17 +97,17 @@
-->
<target name="module-jars">
- <!-- Build jbossws-spi.jar -->
- <mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
- <fileset dir="${spi.output.classes.dir}">
+ <!-- Build jbossws-common.jar -->
+ <mkdir dir="${common.output.lib.dir}"/>
+ <jar jarfile="${common.output.lib.dir}/jbossws-common.jar" manifest="${common.output.etc.dir}/default.mf">
+ <fileset dir="${common.output.classes.dir}">
<include name="org/jboss/wsf/**"/>
</fileset>
</jar>
- <!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
- <fileset dir="${spi.java.dir}"/>
+ <!-- Build jbossws-common-src.zip -->
+ <zip zipfile="${common.output.lib.dir}/jbossws-common-src.zip" >
+ <fileset dir="${common.java.dir}"/>
</zip>
</target>
@@ -119,10 +119,10 @@
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
- <mkdir dir="${spi.output.apidocs.dir}"/>
- <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="spi.thirdparty.classpath"/>
- <packageset dir="${spi.java.dir}" defaultexcludes="yes">
+ <mkdir dir="${common.output.apidocs.dir}"/>
+ <javadoc destdir="${common.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath refid="common.thirdparty.classpath"/>
+ <packageset dir="${common.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
<include name="org/jboss/wsf/**"/>
</packageset>
@@ -132,11 +132,11 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${spi.output.dir}"/>
+ <delete dir="${common.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${spi.dir}/thirdparty"/>
+ <delete dir="${common.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: common/trunk/src/main/etc/component-info.xml
===================================================================
--- spi/trunk/src/main/etc/component-info.xml 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/src/main/etc/component-info.xml 2007-08-02 10:36:03 UTC (rev 4088)
@@ -1,14 +1,14 @@
-<project name="jboss/jbossws-spi">
+<project name="jboss/jbossws-common">
- <component id="jboss/jbossws-spi"
+ <component id="jboss/jbossws-common"
description="JBossWS SPI"
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-spi.jar"/>
+ <artifact id="jbossws-common.jar"/>
<export>
- <include input="jbossws-spi.jar"/>
+ <include input="jbossws-common.jar"/>
</export>
</component>
Copied: common/trunk/src/main/java/org/jboss/wsf/common (from rev 4087, trunk/integration/spi/src/main/java/org/jboss/wsf/common)
Copied: common/trunk/src/main/java/org/jboss/wsf/test (from rev 4087, trunk/integration/spi/src/main/java/org/jboss/wsf/test)
Modified: common/trunk/version.properties
===================================================================
--- spi/trunk/version.properties 2007-08-02 10:14:28 UTC (rev 4087)
+++ common/trunk/version.properties 2007-08-02 10:36:03 UTC (rev 4088)
@@ -23,6 +23,7 @@
jboss-javaee=5.0.0-SNAPSHOT
jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
+jbossws-spi=2.0.1.CR1
sun-jaf=1.1
sun-jaxb=2.1.4
sun-jaxrpc=1.1
17 years, 5 months
- 1
- 0