May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3267 - in trunk: build/ant-import and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-26 07:44:22 -0400 (Sat, 26 May 2007) New Revision: 3267 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/integration/native/ant-import/build-testsuite.xml trunk/integration/native/src/main/etc/bindist-build.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/src/main/etc/bindist-build.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Include testsuite jaxws samples in core testsuite Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,14 +10,13 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/etc"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> -    +  + <fail message="Tests output dir not set." unless="tests.output.dir"/> +  <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> <isset property="debug"/> @@ -71,13 +70,10 @@ <isset property="jboss.home"/> </condition> - <fail message="Excludes file not set. Run tests-jboss50 or tests-jboss42" unless="excludesfile"/> - <echo/> <echo message="-----------------------------------------------"/> <echo message="jboss.home = ${jboss.home}"/> <echo message="java.home = ${java.home}"/> - <echo message="excludesfile = ${excludesfile}"/> <echo message="-----------------------------------------------"/> <tstamp> @@ -163,11 +159,13 @@  <macrodef name="macro-compile-classes"> + <attribute name="excludesfile"/> <attribute name="srcdir"/> <sequential> <mkdir dir="${tests.output.dir}/classes"/> + <echo message="excludesfile = @{excludesfile}"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + failonerror="${javac.fail.onerror}" excludesfile="@{excludesfile}"> <src path="@{srcdir}"/> <classpath refid="tests.javac.classpath"/> </javac> @@ -186,6 +184,7 @@ <copy todir="${tests.output.dir}/classes"> <fileset dir="@{srcdir}/etc"> <include name="jndi.properties"/> + <include name="tst.policy"/> <include name="log4j.xml"/> </fileset> </copy> @@ -250,7 +249,7 @@  <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-run-internal"> @@ -270,12 +269,12 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> @@ -287,14 +286,14 @@ <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> + <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> </batchtest> </junit> </target>  <target name="one-test" depends="tests-init" if="test" description="Run a single unit test"> <mkdir dir="${tests.output.dir}/reports"/> @@ -306,14 +305,14 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>   <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/build/build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + +    @@ -9,8 +11,93 @@   - + + <project default="main" basedir=".." name="JBossWS-Build"> <import file="${basedir}/build/ant-import/build-setup.xml"/> Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.native.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - +  <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - +    @@ -48,7 +46,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/native/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -99,7 +99,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target>  Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - +  <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - +    @@ -57,7 +55,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -108,7 +108,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target>  Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - +  <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - +    @@ -77,7 +75,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -127,7 +127,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target>  Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -11,16 +11,14 @@ <project> <property name="tests.dir" value="${core.dir}/src/test"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> <property name="tests.output.dir" value="${core.dir}/output-tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> -  - <property name="integration.target.${jbossws.integration.target}" value="true"/> -  <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> - <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> + <property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>  @@ -193,8 +191,9 @@  <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> - <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java"/> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -203,14 +202,16 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <macro-copy-resources srcdir="${testsuite.dir}/src"/> <macro-copy-resources srcdir="${tests.dir}"/> </target> - <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> + <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (from rev 3266, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-26 11:44:22 UTC (rev 3267) @@ -0,0 +1,277 @@ +/* + * 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.jaxws.complex; + +// $Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * A complex JAX-WS test + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +public class ComplexTestCase extends JBossWSTest +{ + private Registration port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ComplexTestCase.class, "jaxws-complex.war"); + } + + protected void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService"); + Service service = Service.create(wsdlURL, serviceName); + port = (Registration)service.getPort(Registration.class); + } + + public void testRegistration() throws Exception + { + Customer customer = getFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + XMLGregorianCalendar cal = getCalendar(); + + port.register(customer, cal); + + customer = getAlCapone(); + try + { + port.register(customer, cal); + fail("Expected AlreadyRegisteredFault"); + } + catch (AlreadyRegisteredFault_Exception e) + { + assertEquals(456, e.getFaultInfo().getExistingId()); + } + } + + public void testInvoiceRegistration() throws Exception + { + InvoiceCustomer customer = getInvoiceFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + assertTrue(port.registerForInvoice(customer)); + } + + public void testOtherPackage() throws Exception + { + Statistics stats = port.getStatistics(getFredJackson()); + + System.out.println(stats.getActivationTime()); + assertEquals(10, stats.getHits()); + } + + public void testBulkRegistration() throws Exception + { + List<Customer> customers = new ArrayList<Customer>(); + customers.add(getFredJackson()); + customers.add(getJohnDoe()); + + List<Long> result = port.bulkRegister(customers, getCalendar()); + + assertEquals(123, result.get(0).longValue()); + assertEquals(124, result.get(1).longValue()); + + customers.clear(); + customers.add(getFredJackson()); + customers.add(getInvalid(754)); + customers.add(getInvalid(753)); + customers.add(getJohnDoe()); + customers.add(getInvalid(752)); + + try + { + port.bulkRegister(customers, getCalendar()); + } + catch (ValidationFault_Exception e) + { + List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); + assertEquals(754, failedCustomers.get(0).longValue()); + assertEquals(753, failedCustomers.get(1).longValue()); + assertEquals(752, failedCustomers.get(2).longValue()); + } + } + + private Customer getFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + Customer customer = new Customer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + return customer; + } + + private InvoiceCustomer getInvoiceFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + InvoiceCustomer customer = new InvoiceCustomer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + customer.setCycleDay(10); + return customer; + } + + private Customer getJohnDoe() + { + Name name = new Name(); + name.setFirstName("John"); + name.setLastName("Doe"); + + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(124); + return customer; + } + + private Customer getInvalid(long id) + { + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(id); + return customer; + } + + private Customer getAlCapone() + { + Name name = new Name(); + name.setFirstName("Al"); + name.setLastName("Capone"); + + Address address = new Address(); + address.setCity("Chicago"); + address.setState("Illinois"); + address.setZip("60619"); + address.setStreet("7244 South Prairie Avenue."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("888"); + number1.setExchange("722"); + number1.setLine("7322"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(125); + return customer; + } + + private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } +} \ No newline at end of file Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,277 +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.jaxws.complex; - -// $Id$ - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * A complex JAX-WS test - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @author Thomas.Diesler(a)jboss.com - */ -public class JSR181ComplexTestCase extends JBossWSTest -{ - private Registration port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, "jaxws-complex.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); - QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService"); - Service service = Service.create(wsdlURL, serviceName); - port = (Registration)service.getPort(Registration.class); - } - - public void testRegistration() throws Exception - { - Customer customer = getFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - XMLGregorianCalendar cal = getCalendar(); - - port.register(customer, cal); - - customer = getAlCapone(); - try - { - port.register(customer, cal); - fail("Expected AlreadyRegisteredFault"); - } - catch (AlreadyRegisteredFault_Exception e) - { - assertEquals(456, e.getFaultInfo().getExistingId()); - } - } - - public void testInvoiceRegistration() throws Exception - { - InvoiceCustomer customer = getInvoiceFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - assertTrue(port.registerForInvoice(customer)); - } - - public void testOtherPackage() throws Exception - { - Statistics stats = port.getStatistics(getFredJackson()); - - System.out.println(stats.getActivationTime()); - assertEquals(10, stats.getHits()); - } - - public void testBulkRegistration() throws Exception - { - List<Customer> customers = new ArrayList<Customer>(); - customers.add(getFredJackson()); - customers.add(getJohnDoe()); - - List<Long> result = port.bulkRegister(customers, getCalendar()); - - assertEquals(123, result.get(0).longValue()); - assertEquals(124, result.get(1).longValue()); - - customers.clear(); - customers.add(getFredJackson()); - customers.add(getInvalid(754)); - customers.add(getInvalid(753)); - customers.add(getJohnDoe()); - customers.add(getInvalid(752)); - - try - { - port.bulkRegister(customers, getCalendar()); - } - catch (ValidationFault_Exception e) - { - List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); - assertEquals(754, failedCustomers.get(0).longValue()); - assertEquals(753, failedCustomers.get(1).longValue()); - assertEquals(752, failedCustomers.get(2).longValue()); - } - } - - private Customer getFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - Customer customer = new Customer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - return customer; - } - - private InvoiceCustomer getInvoiceFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - InvoiceCustomer customer = new InvoiceCustomer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - customer.setCycleDay(10); - return customer; - } - - private Customer getJohnDoe() - { - Name name = new Name(); - name.setFirstName("John"); - name.setLastName("Doe"); - - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(124); - return customer; - } - - private Customer getInvalid(long id) - { - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(id); - return customer; - } - - private Customer getAlCapone() - { - Name name = new Name(); - name.setFirstName("Al"); - name.setLastName("Capone"); - - Address address = new Address(); - address.setCity("Chicago"); - address.setState("Illinois"); - address.setZip("60619"); - address.setStreet("7244 South Prairie Avenue."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("888"); - number1.setExchange("722"); - number1.setLine("7322"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(125); - return customer; - } - - private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException - { - DatatypeFactory calFactory = DatatypeFactory.newInstance(); - XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); - return cal; - } -} \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,17 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# JBossAS-4.2 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/serviceref/** - -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3266 - trunk/build/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 13:29:47 -0400 (Fri, 25 May 2007) New Revision: 3266 Modified: trunk/build/hudson/hudson-home/config.xml Log: typo Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-05-25 17:26:52 UTC (rev 3265) +++ trunk/build/hudson/hudson-home/config.xml 2007-05-25 17:29:47 UTC (rev 3266) @@ -116,7 +116,7 @@ <name>Release QA</name> <description> <![CDATA[ -A collection of jobs that covers the JBossWS release matrix. +A collection of jobs that cover the JBossWS release matrix. <p/> <table border=1> <tr align=center><th> </th> <th>Core-Tests</th> <th colspan=3>Integration Tests</th></tr>

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3265 - in trunk/build/hudson/hudson-home/jobs: Release-Matrix-Step2 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 13:26:52 -0400 (Fri, 25 May 2007) New Revision: 3265 Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml Log: Enable periodical builds Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-05-25 16:48:34 UTC (rev 3264) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-05-25 17:26:52 UTC (rev 3265) @@ -13,7 +13,7 @@ <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>0 6 * * *</spec> + <spec>0 2 * * *</spec> </hudson.triggers.TimerTrigger> </triggers> <description>Build the relase matrix target containers.</description> Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-25 16:48:34 UTC (rev 3264) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-25 17:26:52 UTC (rev 3265) @@ -11,7 +11,11 @@ <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 4 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> <description>Run the entire JBossWS relase matrix</description> <keepDependencies>false</keepDependencies> <properties/>

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3264 - in trunk/integration/native: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:48:34 -0400 (Fri, 25 May 2007) New Revision: 3264 Modified: trunk/integration/native/ant-import/build-distro.xml trunk/integration/native/src/main/etc/bindist-build.xml Log: Fix jboss42 distros Modified: trunk/integration/native/ant-import/build-distro.xml =================================================================== --- trunk/integration/native/ant-import/build-distro.xml 2007-05-25 16:43:10 UTC (rev 3263) +++ trunk/integration/native/ant-import/build-distro.xml 2007-05-25 16:48:34 UTC (rev 3264) @@ -47,6 +47,12 @@ <fileset dir="${int.native.dir}/ant-import"> <include name="macros-deploy-native.xml"/> </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> <fileset dir="${testsuite.dir}/ant-import"> <include name="build-jars-jaxws.xml"/> </fileset> Modified: trunk/integration/native/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-25 16:43:10 UTC (rev 3263) +++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-25 16:48:34 UTC (rev 3264) @@ -51,6 +51,8 @@ <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/>   @@ -121,7 +123,8 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> - <macro-undeploy-native50/> + <macro-undeploy-sunri50/> + <macro-undeploy-xfire50/> <macro-deploy-native50 spilibs="${lib.dir}" jbosslibs="${lib.dir}" @@ -135,6 +138,23 @@ <macro-undeploy-native50/> </target> +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-xfire42/> + <macro-deploy-native42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42"> + <macro-undeploy-native42/> + </target> +

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3263 - in trunk/integration: sunri/src/main/etc and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:43:10 -0400 (Fri, 25 May 2007) New Revision: 3263 Modified: trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-distro.xml trunk/integration/xfire/src/main/etc/bindist-build.xml Log: Fix jboss42 distros Modified: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml 2007-05-25 16:32:35 UTC (rev 3262) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-05-25 16:43:10 UTC (rev 3263) @@ -53,6 +53,9 @@ <fileset dir="${int.sunri.dir}/ant-import"> <include name="macros-deploy-sunri.xml"/> </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> <fileset dir="${testsuite.dir}/ant-import"> <include name="build-jars-jaxws.xml"/> </fileset> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-25 16:32:35 UTC (rev 3262) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-25 16:43:10 UTC (rev 3263) @@ -52,6 +52,7 @@ <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/>   @@ -132,6 +133,7 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> <macro-undeploy-native50/> + <macro-undeploy-xfire50/> <macro-deploy-sunri50 spilibs="${lib.dir}" jbosslibs="${lib.dir}" @@ -144,6 +146,22 @@ <macro-undeploy-sunri50/> </target> +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-xfire42/> + <macro-deploy-sunri42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + </target> +    Modified: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml 2007-05-25 16:32:35 UTC (rev 3262) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-05-25 16:43:10 UTC (rev 3263) @@ -51,6 +51,9 @@ <fileset dir="${int.native.dir}/ant-import"> <include name="macros-deploy-native.xml"/> </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> <fileset dir="${int.xfire.dir}/ant-import"> <include name="macros-deploy-xfire.xml"/> </fileset> Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-25 16:32:35 UTC (rev 3262) +++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-25 16:43:10 UTC (rev 3263) @@ -51,6 +51,7 @@ <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> <import file="${basedir}/build/macros-deploy-xfire.xml"/>  @@ -151,6 +152,7 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50"> <macro-undeploy-native50/> + <macro-undeploy-sunri50/> <macro-deploy-xfire50 spilibs="${lib.dir}" jbosslibs="${lib.dir}" @@ -163,6 +165,22 @@ <macro-undeploy-xfire50/> </target> +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-sunri42/> + <macro-deploy-xfire42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> + <macro-undeploy-xfire42/> + </target> +

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3262 - in trunk/build/hudson/hudson-home/jobs: AS-Tests-AS-5.0 and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:32:35 -0400 (Fri, 25 May 2007) New Revision: 3262 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml Log: force.thirdparty.get=true Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS42_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS50_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS42_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS50_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS42_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -13,14 +13,14 @@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS_INSTANCE=$JBOSS50_INSTANCE -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-25 16:25:48 UTC (rev 3261) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-25 16:32:35 UTC (rev 3262) @@ -11,14 +11,14 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # # copy ant.properties # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clobber +ant clean # # stop jbossas

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3261 - trunk/integration/xfire/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:25:48 -0400 (Fri, 25 May 2007) New Revision: 3261 Modified: trunk/integration/xfire/ant-import/build-distro.xml Log: Add sun thirdparty Modified: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml 2007-05-25 16:20:35 UTC (rev 3260) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-05-25 16:25:48 UTC (rev 3261) @@ -21,6 +21,7 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/>

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3260 - trunk/integration/xfire/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:20:35 -0400 (Fri, 25 May 2007) New Revision: 3260 Added: trunk/integration/xfire/src/main/etc/bindist-build.xml Modified: trunk/integration/xfire/src/main/etc/ Log: Fix bindist Property changes on: trunk/integration/xfire/src/main/etc ___________________________________________________________________ Name: svn:ignore - bindist-build.xml Added: trunk/integration/xfire/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bindist-build.xml (rev 0) +++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-25 16:20:35 UTC (rev 3260) @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS/XFire"> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + +  + + <path id="sunri.classpath"> + <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/client/http.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/client/resolver.jar"/> + <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/client/wstx.jar"/> + </path> + + <path id="xfire.classpath"> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jdom.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> + </path> + + <path id="ws.stack.classpath"> + <path refid="sunri.classpath"/> + </path> + + <path id="tests.extra.classpath"> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50"> + <macro-undeploy-native50/> + <macro-deploy-xfire50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> + <macro-undeploy-xfire50/> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> Property changes on: trunk/integration/xfire/src/main/etc/bindist-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3259 - trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 12:12:14 -0400 (Fri, 25 May 2007) New Revision: 3259 Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java Log: Fix xfire jboss50 Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java 2007-05-25 16:12:14 UTC (rev 3259) @@ -38,18 +38,6 @@ */ public class ModifyWebMetaDataDeployer extends org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer { - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - @Override public void create(Deployment dep) {

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r3258 - in trunk/integration: sunri/ant-import and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-25 11:27:43 -0400 (Fri, 25 May 2007) New Revision: 3258 Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ModifyWebMetaDataDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java Removed: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java Modified: trunk/integration/sunri/.classpath trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml Log: Resolve dependency on jboss50 Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/.classpath 2007-05-25 15:27:43 UTC (rev 3258) @@ -23,5 +23,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -70,28 +70,12 @@ <target name="thirdparty-classpath" depends="thirdparty-init">  - <path id="sunri50.integration.classpath"> + <path id="sunri.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> @@ -102,6 +86,13 @@ <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> +  + <path id="sunri50.integration.classpath"> + <path refid="sunri.integration.classpath"/> + <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + </path> + </target> </project> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/build.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -58,11 +58,21 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="compile-classes" depends="init"> + <target name="compile-classes" depends="compile-classes-sunri,compile-classes-sunri50"/> + <target name="compile-classes-sunri" depends="init"> <mkdir dir="${sunri.output.classes.dir}"/> <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/sunri/**"/> + <classpath refid="sunri.integration.classpath"/> + </javac> + </target> + <target name="compile-classes-sunri50" depends="init" if="jboss50.home"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${sunri.output.classes.dir}"/> + <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/sunri50/**"/> <classpath refid="sunri50.integration.classpath"/> </javac> </target> @@ -95,7 +105,7 @@  - <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <target name="jars-common" depends="compile"> @@ -104,6 +114,7 @@ <mkdir dir="${sunri.output.lib.dir}"/> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> + <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/**"/> </fileset> </jar> @@ -127,8 +138,6 @@ <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> -  <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">  - <path id="xfire50.integration.classpath"> + <path id="xfire.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/spring.jar"/> @@ -97,6 +80,12 @@ <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> </path> + <path id="xfire50.integration.classpath"> + <path refid="xfire.integration.classpath"/> + <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + </path> + </target> </project> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/build.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -58,11 +58,21 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="compile-classes" depends="init"> + <target name="compile-classes" depends="compile-classes-xfire,compile-classes-xfire50"/> + <target name="compile-classes-xfire" depends="init"> <mkdir dir="${xfire.output.classes.dir}"/> <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/xfire/**"/> + <classpath refid="xfire.integration.classpath"/> + </javac> + </target> + <target name="compile-classes-xfire50" depends="init" if="jboss50.home"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${xfire.output.classes.dir}"/> + <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/xfire50/**"/> <classpath refid="xfire50.integration.classpath"/> </javac> </target> @@ -95,7 +105,7 @@  - <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <target name="jars-common" depends="compile"> @@ -104,6 +114,7 @@ <mkdir dir="${xfire.output.lib.dir}"/> <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire.jar" manifest="${xfire.output.etc.dir}/default.mf"> <fileset dir="${xfire.output.classes.dir}"> + <include name="org/jboss/wsf/stack/xfire50/**"/> <include name="org/jboss/wsf/stack/xfire/**"/> </fileset> </jar> Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -1,121 +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.wsf.stack.xfire; - -//$Id$ - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.ParamValue; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mai-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - @Override - public void create(Deployment dep) - { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans == null) - throw new IllegalStateException("Cannot obtain services.xml meta data"); - - // Add the path to sun-jaxws.xml - ParamValue ctxParam = new ParamValue(); - ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); - ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); - webMetaData.addContextParam(ctxParam); - - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) - { - servlet.setServletClass(servletClass); - } - } - } - } - - @Override - public void destroy(Deployment dep) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans != null) - { - ddbeans.destroyFileURL(); - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } -} \ No newline at end of file Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -0,0 +1,85 @@ +/* + * 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.wsf.stack.xfire50; + +//$Id$ + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.stack.xfire.XFireConfigurableServletExt; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Mai-2007 + */ +public class ModifyWebMetaDataDeployer extends org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer +{ + private String servletClass; + + public String getServletClass() + { + return servletClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + super.create(dep); + + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) + throw new IllegalStateException("Cannot obtain services.xml meta data"); + + // Add the path to sun-jaxws.xml + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); + ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + } + } + + @Override + public void destroy(Deployment dep) + { + super.destroy(dep); + + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans != null) + { + ddbeans.destroyFileURL(); + } + } +} \ No newline at end of file Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -137,7 +137,7 @@ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire.ModifyWebMetaDataDeployer"> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire50.ModifyWebMetaDataDeployer"> <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> </bean> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>

17 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007