October 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4808 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxrpc and 12 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-10-19 11:28:50 -0400 (Fri, 19 Oct 2007) New Revision: 4808 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.java stack/native/trunk/src/test/resources/jaxrpc/jbws1762/ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/webservices.xml stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/POJOBean.wsdl stack/native/trunk/src/test/resources/jaxrpc/jbws1762/wstools-config.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.java Log: [JBWS-1762] providing JAX-RPC based tests for war and sar packages Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-10-19 12:26:12 UTC (rev 4807) +++ stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -2547,8 +2547,29 @@ <include name="wsdl/**"/> </metainf> </jar> + +  + <war + warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> -  + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + <unwar + src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" + dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war" + /> + +  <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpoint.class"/> @@ -2561,7 +2582,8 @@ <include name="custom-endpoint-config.xml"/> <include name="wsdl/**"/> </webinf> - </war> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1792-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jbws1792/TestEndpoint.class"/> @@ -2576,7 +2598,26 @@ </metainf> </jar> -  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> + <copy + file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml" + todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> + <unwar + src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" + dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war" + /> + +  <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,70 @@ +/* + * 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.jaxrpc.jbws1762; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceFactory; + +import org.jboss.test.ws.jaxrpc.jbws1762.services.POJOIface; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 18, 2007 + */ +public abstract class AbstractPOJOTest extends JBossWSTest +{ + private String pojoTargetNS = "http://org.jboss.test.ws/jbws1762"; + private String pojoServiceName = "POJOBean"; + private POJOIface pojoProxy; + + public void setUp() throws Exception + { + super.setUp(); + + if (pojoProxy == null) + { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName(pojoTargetNS, pojoServiceName); + + Service service = factory.createService(wsdlURL, serviceName, mappingURL); + pojoProxy = (POJOIface)service.getPort(POJOIface.class); + } + } + + protected abstract String getWSDLLocation(); + + public void testPOJO() throws Exception + { + assertEquals(pojoProxy.echo("Hello!"), "Hello!"); + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,47 @@ +/* + * 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.jaxrpc.jbws1762.exploded_sar_pojo; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxrpc.jbws1762.AbstractPOJOTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration1TestCase extends AbstractPOJOTest +{ + public static Test suite() + { + return new JBossWSTestSetup(Iteration1TestCase.class, "jaxrpc-jbws1762-exploded.sar"); + } + + public String getWSDLLocation() + { + return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.exploded_sar_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.exploded_sar_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,47 @@ +/* + * 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.jaxrpc.jbws1762.exploded_war_pojo; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxrpc.jbws1762.AbstractPOJOTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration1TestCase extends AbstractPOJOTest +{ + public static Test suite() + { + return new JBossWSTestSetup(Iteration1TestCase.class, "jaxrpc-jbws1762-exploded.war"); + } + + public String getWSDLLocation() + { + return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.exploded_war_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.exploded_war_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,47 @@ +/* + * 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.jaxrpc.jbws1762.packaged_sar_pojo; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxrpc.jbws1762.AbstractPOJOTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration1TestCase extends AbstractPOJOTest +{ + public static Test suite() + { + return new JBossWSTestSetup(Iteration1TestCase.class, "jaxrpc-jbws1762-packaged.sar"); + } + + public String getWSDLLocation() + { + return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.packaged_sar_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.packaged_sar_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,47 @@ +/* + * 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.jaxrpc.jbws1762.packaged_war_pojo; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxrpc.jbws1762.AbstractPOJOTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration1TestCase extends AbstractPOJOTest +{ + public static Test suite() + { + return new JBossWSTestSetup(Iteration1TestCase.class, "jaxrpc-jbws1762-packaged.war"); + } + + public String getWSDLLocation() + { + return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.packaged_war_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,31 @@ +/* + * 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.jaxrpc.jbws1762.packaged_war_pojo; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 19, 2007 + */ +public class Iteration3TestCase extends Iteration2TestCase {} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,37 @@ +/* + * 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.jaxrpc.jbws1762.services; + +/** + * POJO bean + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 18, 2007 + */ +public class POJOBean implements POJOIface +{ + public String echo(String msg) + { + return msg; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,37 @@ +/* + * 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.jaxrpc.jbws1762.services; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * POJO interface + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 18, 2007 + */ +public interface POJOIface extends Remote +{ + String echo(String toEcho) throws RemoteException; +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.java 2007-10-19 12:26:12 UTC (rev 4807) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.java 2007-10-19 15:28:50 UTC (rev 4808) @@ -33,5 +33,5 @@ @WebService public interface POJOIface { - String echo(String toEcho); + String echo(String msg); } Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> +</server> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,39 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1762.services</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1762/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1762'>serviceNS:POJOBean</wsdl-service-name> + <port-mapping> + <port-name>POJOIfacePort</port-name> + <java-port-name>POJOIfacePort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOIface</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1762'>portTypeNS:POJOIface</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1762'>bindingNS:POJOIfaceBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1762'>wsdlMsgNS:POJOIface_echo</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1762'>wsdlMsgNS:POJOIface_echoResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + <servlet> + <servlet-name>POJOBean</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>POJOBean</servlet-name> + <url-pattern>/POJOBean</url-pattern> + </servlet-mapping> +</web-app> + Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/webservices.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/webservices.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/webservices.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,16 @@ + +<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>POJOBean</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/POJOBean.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>POJOIfacePort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1762'>portNS:POJOIfacePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOIface</service-endpoint-interface> + <service-impl-bean> + <servlet-link>POJOBean</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/webservices.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/POJOBean.wsdl =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/POJOBean.wsdl (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/POJOBean.wsdl 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name='POJOBean' targetNamespace='http://org.jboss.test.ws/jbws1762' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1762' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='POJOIface_echo'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='POJOIface_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='POJOIface'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:POJOIface_echo'/> + <output message='tns:POJOIface_echoResponse'/> + </operation> + </portType> + <binding name='POJOIfaceBinding' type='tns:POJOIface'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1762' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1762' use='literal'/> + </output> + </operation> + </binding> + <service name='POJOBean'> + <port binding='tns:POJOIfaceBinding' name='POJOIfacePort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/wsdl/POJOBean.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/wstools-config.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/wstools-config.xml 2007-10-19 15:28:50 UTC (rev 4808) @@ -0,0 +1,15 @@ +<?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"> + <java-wsdl> + <service name="POJOBean" endpoint="org.jboss.test.ws.jaxrpc.jbws1762.services.POJOIface" style="rpc"/> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1762" type-namespace="http://org.jboss.test.ws/jbws1762/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="POJOBean"/> + </java-wsdl> +</configuration> Property changes on: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years

1
0
0 / 0

JBossWS SVN: r4807 - in stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml: soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 08:26:12 -0400 (Fri, 19 Oct 2007) New Revision: 4807 Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/JAXRPCException.java stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/ServiceException.java stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/soap/SOAPException.java Log: Add serialversionUID Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/JAXRPCException.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/JAXRPCException.java 2007-10-19 12:16:56 UTC (rev 4806) +++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/JAXRPCException.java 2007-10-19 12:26:12 UTC (rev 4807) @@ -28,6 +28,8 @@ */ public class JAXRPCException extends RuntimeException { + private static final long serialVersionUID = 2012915834079496799L; + public JAXRPCException() { } Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/ServiceException.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/ServiceException.java 2007-10-19 12:16:56 UTC (rev 4806) +++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/ServiceException.java 2007-10-19 12:26:12 UTC (rev 4807) @@ -28,6 +28,8 @@ */ public class ServiceException extends Exception { + private static final long serialVersionUID = -4042547292194127311L; + public ServiceException() { } Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/soap/SOAPException.java =================================================================== --- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/soap/SOAPException.java 2007-10-19 12:16:56 UTC (rev 4806) +++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/soap/SOAPException.java 2007-10-19 12:26:12 UTC (rev 4807) @@ -28,6 +28,8 @@ */ public class SOAPException extends Exception { + private static final long serialVersionUID = -4385552115225336830L; + public SOAPException() { }

17 years

1
0
0 / 0

JBossWS SVN: r4806 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.1 and 25 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 08:16:56 -0400 (Fri, 19 Oct 2007) New Revision: 4806 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml Log: use explicit deploy targets Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/(a)hudson.jboss405.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405" # # stop jbossas @@ -27,8 +27,8 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 clean jars -ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss405 +ant $ENVIRONMENT -Djboss405.home=$JBOSS_INSTANCE-ejb3 clean jars +ant $ENVIRONMENT -Djboss405.home=$JBOSS_INSTANCE deploy-jboss405 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405 -Djboss405.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/(a)hudson.jboss405.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40.no.ejb3 -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405.no.ejb3 -Djboss405.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # Verify JDK1.6 availablility Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -17,7 +17,7 @@ JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS_INSTANCE=$JBOSS422_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -17,7 +17,7 @@ JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS_INSTANCE=$JBOSS500_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -17,7 +17,7 @@ JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS_INSTANCE=$JBOSS422_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -17,7 +17,7 @@ JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS_INSTANCE=$JBOSS500_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -18,7 +18,7 @@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS405_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE -Djboss40.home=$JBOSS405_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -18,7 +18,7 @@ JBOSS421_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS421_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS421_INSTANCE -Djboss40.home=$JBOSS405_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss500.home=$JBOSS500_INSTANCE -Djboss421.home=$JBOSS421_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -18,7 +18,7 @@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS422_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE -Djboss40.home=$JBOSS405_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -18,7 +18,7 @@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS422_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE -Djboss40.home=$JBOSS405_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE" # # Verify JDK1.6 availablility Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -18,7 +18,7 @@ JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS500_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS500_INSTANCE -Djboss42.home=$JBOSS422_INSTANCE -Djboss40.home=$JBOSS405_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3 -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405 -Djboss405.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 11:45:36 UTC (rev 4805) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 12:16:56 UTC (rev 4806) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas

17 years

1
0
0 / 0

JBossWS SVN: r4805 - in common/trunk: src/main/java/org/jboss/wsf/test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 07:45:36 -0400 (Fri, 19 Oct 2007) New Revision: 4805 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/trunk/version.properties Log: Fix integration target check Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-10-19 11:35:38 UTC (rev 4804) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-10-19 11:45:36 UTC (rev 4805) @@ -193,7 +193,7 @@ // ignore, we are not running on jboss-4.2 or greater } - if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false) + if (jbossVersion != null && integrationTarget.startsWith(jbossVersion) == false) throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion); } return integrationTarget; Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2007-10-19 11:35:38 UTC (rev 4804) +++ common/trunk/version.properties 2007-10-19 11:45:36 UTC (rev 4805) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.GA -repository.id=1.0.0.GA +version.id=1.0.1.GA +repository.id=snapshot implementation.title=JBoss Web Services - Common implementation.url=http://www.jboss.org/products/jbossws

17 years

1
0
0 / 0

JBossWS SVN: r4804 - in stack/native/trunk: ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 07:35:38 -0400 (Fri, 19 Oct 2007) New Revision: 4804 Added: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss405.txt stack/native/trunk/src/test/resources/test-excludes-jboss421.txt stack/native/trunk/src/test/resources/test-excludes-jboss422.txt stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Removed: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss40.txt stack/native/trunk/src/test/resources/test-excludes-jboss42.txt stack/native/trunk/src/test/resources/test-excludes-jboss50.txt Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/ant.properties.example stack/native/trunk/build.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: use explicit deploy targets Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -16,83 +16,106 @@ <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> -  -  -  +  + <target name="deploy-jboss405" depends="jars-jboss40,undeploy-jboss405,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/> + + <target name="deploy-jboss405-ejb3"> + <macro-deploy-native405 + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" + jbosshome="${jboss405.home}"/> + </target> + + <target name="deploy-jboss405-no-ejb3" depends="jars-jboss40,undeploy-jboss405,deploy-jboss405-ejb3" unless="jboss405.ejb3.available" + description="Deploy jbossws to jboss405 without EJB3 support"> + <macro-setup-native40-no-ejb3/> + </target> + +  + <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws from jboss405"> + <macro-undeploy-native405/> + <macro-undeploy-framework jbosshome="${jboss405.home}"/> + </target> -  - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50"> - <macro-deploy-native50 +  + <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> + <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss421.home}"/> </target> - <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss50.home}" + jbosshome="${jboss421.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> -  - <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> +  + <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws from jboss421"> + <macro-undeploy-native421/> + <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> + <target name="undeploy-jboss421-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> + </target> - <target name="undeploy-jboss50-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss50.home}"/> - </target> - -  - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42"> - <macro-deploy-native42 +  + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> + <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> - <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss42.home}" + jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> -  - <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-framework jbosshome="${jboss42.home}"/> +  + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> + <macro-undeploy-native422/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss42-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + <target name="undeploy-jboss422-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> -  - <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/> - - <target name="deploy-jboss40-ejb3"> - <macro-deploy-native40 +  + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> + <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss40.home}"/> - </target> + jbosshome="${jboss500.home}"/> + </target> - <target name="deploy-jboss40-no-ejb3" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-ejb3" unless="jboss40.ejb3.available" - description="Deploy jbossws to jboss40 without EJB3 support"> - <macro-setup-native40-no-ejb3/> + <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss500.home}" + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> </target> + +  + <target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500"> + <macro-undeploy-native500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> -  - <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> - <macro-undeploy-native40/> - <macro-undeploy-framework jbosshome="${jboss40.home}"/> + <target name="undeploy-jboss500-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> </target> + </project> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-setup.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -24,37 +24,60 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/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="jboss405.lib" value="${jboss405.home}/lib"/> + <property name="jboss405.client" value="${jboss405.home}/client"/> + <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> + <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> + <property name="jboss405.server.deploy" value="${jboss405.server}/deploy"/> - <property name="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + <property name="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + <property name="jboss.server.instance.${jboss.server.instance}" 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"/> - <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> + <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/> + <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <available property="jboss405.available" file="${jboss405.available.file}"/> + <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/> + <available property="jboss421.available" file="${jboss421.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <condition property="jbossws.integration.jboss40" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss405"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/> + </or> + </condition> + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>  Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -56,6 +56,8 @@ <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -12,379 +12,501 @@  <project> - -  -  -  - - <macrodef name="macro-deploy-native50"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + +  +  +  + +  + <macrodef name="macro-deploy-endorsed"> + <attribute name="jbosshome"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-endorsed"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <fileset dir="@{jbosshome}/lib/endorsed"> + <include name="jaxb-api.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-native405"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/> + +  + <unzip dest="${jboss405.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss405.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss405.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss40.jar"/> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <include name="wstx.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss405.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss405.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss40.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> + <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> + <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-setup-native405-no-ejb3"> + <sequential> + + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> + + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native405"> + <sequential> + <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/> + <delete>  - <unzip dest="${jboss50.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> + <fileset dir="${jboss405.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset>  - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> + <fileset dir="${jboss405.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss40.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + <include name="jbossws14-client.jar"/> + </fileset>  - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> + <fileset dir="${jboss405.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss405.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-jboss40.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> +  + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-native421"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + +  + <unzip dest="${jboss421.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jbossws-jboss421.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss421.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native421"> + <sequential> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <delete> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native50"> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <delete> -  - <fileset dir="${jboss50.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - -  - <fileset dir="${jboss50.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> -  - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - -  - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> -  - <include name="jbossws-integration.jar"/> - </fileset> - </delete> +  + <fileset dir="${jboss421.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-native42"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - -  - <unzip dest="${jboss42.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native42"> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - -  - <fileset dir="${jboss42.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - -  - <fileset dir="${jboss42.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> -  - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - -  - <fileset dir="${jboss42.home}/lib/endorsed"> - <include name="jaxb-api.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> -  - <include name="jbossws-integration.jar"/> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> -  - <include name="jbossws-integration.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-native40"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - -  - <unzip dest="${jboss40.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="${jboss40.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss40.jar"/> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> - <include name="stax-api.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <include name="wstx.jar"/> - </fileset> - </copy> - -  - <copy todir="${jboss40.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss40.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-setup-native40-no-ejb3"> - <sequential> - - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> - - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native40"> - <sequential> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - <delete> - -  - <fileset dir="${jboss40.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - -  - <fileset dir="${jboss40.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-jboss40.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> -  - <include name="jbossws-wsconsume-impl.jar"/> - <include name="jbossws14-client.jar"/> - </fileset> - -  - <fileset dir="${jboss40.home}/lib"> -  - <include name="jbossws-integration.jar"/> - </fileset> - <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss40.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> -  - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - </sequential> - </macrodef> - -  - <macrodef name="macro-deploy-endorsed"> - <attribute name="jbosshome"/> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - </fileset> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - -  - <macrodef name="macro-undeploy-endorsed"> - <attribute name="jbosshome"/> - <sequential> - <delete> - <fileset dir="@{jbosshome}/lib/endorsed"> - <include name="jaxb-api.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> +  + <fileset dir="${jboss421.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss421.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss421.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-native422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + +  + <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss422.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + +  + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <delete> + +  + <fileset dir="${jboss422.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss422.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss422.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss422.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-native500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + +  + <unzip dest="${jboss500.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss500.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <copy todir="${jboss500.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native500"> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <delete> +  + <fileset dir="${jboss500.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss500.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant.properties.example 2007-10-19 11:35:38 UTC (rev 4804) @@ -4,12 +4,13 @@ # $Id$ # Optional JBoss Home -#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA -#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +#jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA +#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3] -jbossws.integration.target=jboss50 +# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500] +jbossws.integration.target=jboss500 # The JBoss server instance jboss.server.instance=default Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/build.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -262,7 +262,7 @@ </target> - <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> + <target name="jars-jboss50" depends="jars-common" if="jboss500.home">  <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml"> @@ -301,7 +301,7 @@ </target> - <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> + <target name="jars-jboss42" depends="jars-common" if="jboss422.home"> <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> @@ -352,7 +352,7 @@ </jar> </target> - <target name="jars-jboss40" depends="jars-common" if="jboss40.home"> + <target name="jars-jboss40" depends="jars-common" if="jboss405.home"> <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -28,36 +28,36 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/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="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.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="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - <property name="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + <property name="jboss405.lib" value="${jboss405.home}/lib"/> + <property name="jboss405.client" value="${jboss405.home}/client"/> + <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> + <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> + <property name="jboss405.server.deploy" value="${jboss405.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"/> - <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/> - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss405.available" file="${jboss405.available.file}"/> - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/>  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> @@ -77,10 +77,10 @@ <target name="prepare">  - <condition property="jboss.home" value="${jboss50.home}"> + <condition property="jboss.home" value="${jboss500.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="jboss.home" value="${jboss42.home}"> + <condition property="jboss.home" value="${jboss422.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -24,11 +24,11 @@ thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss50.home}" + jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> @@ -36,7 +36,7 @@  <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> <macro-undeploy-native50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target>  @@ -46,11 +46,11 @@ thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss42.home}" + jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> @@ -58,10 +58,10 @@  <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42"> <macro-undeploy-native42/> - <macro-undeploy-framework jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target>  @@ -74,10 +74,10 @@ <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss40.home}"/> + jbosshome="${jboss405.home}"/> </target> - <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss405.ejb3.available"> <macro-setup-native40-no-ejb3/> <echo> *********************************** @@ -90,7 +90,7 @@  <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> <macro-undeploy-native40/> - <macro-undeploy-framework jbosshome="${jboss40.home}"/> + <macro-undeploy-framework jbosshome="${jboss405.home}"/> </target> </project> Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,65 +0,0 @@ -# JBossAS-4.0 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3 compilation excludes -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/context/EndpointEJB* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/eardeployment/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/serviceref/*EJB* -org/jboss/test/ws/jaxws/samples/webservice/*EJB3* -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1446/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1556/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/jbws1611/** -org/jboss/test/ws/jaxws/jbws1665/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1809/** -org/jboss/test/ws/jaxws/jbws1813/** -org/jboss/test/ws/jaxws/jbws1815/** -org/jboss/test/ws/jaxws/jbws1840/** -org/jboss/test/ws/jaxws/jbws771/** -org/jboss/test/ws/jaxws/jbws944/** -org/jboss/test/ws/jaxws/jbws981/** -org/jboss/test/ws/jaxws/namespace/** -org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/handlerlifecycle/** -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean* -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/context/** -org/jboss/test/ws/jaxws/binding/** - -# EJB3 runtime excludes -org/jboss/test/ws/interop/wsa/AddressingTestCase* -org/jboss/test/ws/interop/wsse/EncryptTestCase* -org/jboss/test/ws/interop/wsse/SignTestCase* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* -org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase* -org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* -org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* -org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* -org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* -org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* -org/jboss/test/ws/jaxws/wseventing/EventingTestCase* -org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* -org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* -org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* -org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss40.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,13 +0,0 @@ -# JBossAS-4.0 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - Copied: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,65 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3 compilation excludes +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/context/EndpointEJB* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/swaref/** +org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/serviceref/*EJB* +org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1446/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1556/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1611/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** +org/jboss/test/ws/jaxws/jbws1799/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1813/** +org/jboss/test/ws/jaxws/jbws1815/** +org/jboss/test/ws/jaxws/jbws1840/** +org/jboss/test/ws/jaxws/jbws771/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/namespace/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/handlerlifecycle/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean* +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/context/** +org/jboss/test/ws/jaxws/binding/** + +# EJB3 runtime excludes +org/jboss/test/ws/interop/wsa/AddressingTestCase* +org/jboss/test/ws/interop/wsse/EncryptTestCase* +org/jboss/test/ws/interop/wsse/SignTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase* +org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* +org/jboss/test/ws/jaxws/wseventing/EventingTestCase* +org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* +org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* +org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* +org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** Copied: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss40.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,13 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,7 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - Added: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Property changes on: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt ___________________________________________________________________ Name: svn:executable + * Copied: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss42.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,7 +0,0 @@ -# Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* -org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* -org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxrpc/wsdlpublish/** - Copied: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss50.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# Fix before JBoss50 goes final +org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* +org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* +org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxrpc/wsdlpublish/** +

17 years

1
0
0 / 0

JBossWS SVN: r4803 - in framework/trunk: hudson/hudson-home/jobs/AS-Tests-AS-4.2.1 and 26 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 07:34:04 -0400 (Fri, 19 Oct 2007) New Revision: 4803 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml framework/trunk/src/test/ant-import/build-testsuite.xml Log: use explicit deploy targets Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0.5/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -28,7 +28,7 @@ cd $STACKNATIVE cp ant.properties.example ant.properties ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 clean jars -ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40 +ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss405 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss50 +ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,7 +27,7 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss40 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss405 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0.5-No-EJB3/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,7 +27,7 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss40-no-ejb3 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss405-no-ejb3 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -37,21 +37,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss50 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -29,14 +29,14 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-metro # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # Build distro @@ -49,7 +49,7 @@ # Deploy distro # cd output/jbossws-cxf-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -29,14 +29,14 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-metro # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # Build distro @@ -49,7 +49,7 @@ # Deploy distro # cd output/jbossws-cxf-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss50 +./build.sh $ENVIRONMENT deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -29,14 +29,14 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # Build distro @@ -49,7 +49,7 @@ # Deploy distro # cd output/jbossws-metro-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -29,14 +29,14 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # Build distro @@ -49,7 +49,7 @@ # Deploy distro # cd output/jbossws-metro-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss50 +./build.sh $ENVIRONMENT deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0.5/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -36,7 +36,7 @@ # Deploy distro # cd output/jbossws-native-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss40 +./build.sh $ENVIRONMENT deploy-jboss405 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -30,14 +30,14 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # Build distro @@ -50,7 +50,7 @@ # Deploy distro # cd output/jbossws-native-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss421 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -30,14 +30,14 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # Build distro @@ -50,7 +50,7 @@ # Deploy distro # cd output/jbossws-native-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -40,14 +40,14 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # Build distro @@ -60,7 +60,7 @@ # Deploy distro # cd output/jbossws-native-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -30,14 +30,14 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # Build distro @@ -50,7 +50,7 @@ # Deploy distro # cd output/jbossws-native-(a)version.id@ -./build.sh $ENVIRONMENT deploy-jboss50 +./build.sh $ENVIRONMENT deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-metro # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-metro # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # build and deploy # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss50 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # build and deploy # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss50 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0.5/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,7 +27,7 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss40 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss405 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss421 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss42 +./build.sh $ENVIRONMENT undeploy-jboss422 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss42 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 # # start jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -27,21 +27,21 @@ # cd $STACKMETRO cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # undeploy stack-cxf # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT undeploy-jboss50 +./build.sh $ENVIRONMENT undeploy-jboss500 # # build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss50 +./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 # # start jbossas Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-19 10:07:13 UTC (rev 4802) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-19 11:34:04 UTC (rev 4803) @@ -11,18 +11,21 @@ <project>  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + <condition property="jboss.home" value="${jboss405.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss405"/> </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + <condition property="jboss.home" value="${jboss405.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/> </condition> - <condition property="jboss.home" value="${jboss40.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + <condition property="jboss.home" value="${jboss421.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> </condition> - <condition property="jboss.home" value="${jboss40.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss40.no.ejb3"/> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> </condition> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition>   @@ -209,6 +212,7 @@ <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jbossws-jboss42.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss421.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> @@ -274,7 +278,7 @@ </path> </target> - <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss40.no.ejb3"> + <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss405.no.ejb3"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/>

17 years

1
0
0 / 0

JBossWS SVN: r4802 - projects/wiki/extensions/htdig.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-10-19 06:07:13 -0400 (Fri, 19 Oct 2007) New Revision: 4802 Modified: projects/wiki/extensions/htdig/htdig.conf Log: Update search to host environment Modified: projects/wiki/extensions/htdig/htdig.conf =================================================================== --- projects/wiki/extensions/htdig/htdig.conf 2007-10-19 10:06:38 UTC (rev 4801) +++ projects/wiki/extensions/htdig/htdig.conf 2007-10-19 10:07:13 UTC (rev 4802) @@ -37,7 +37,7 @@ # You could also index all the URLs in a file like so: # start_url: `${common_dir}/start.url` # -start_url: http://localhost/mediawiki/index.php?title=JBossWS +start_url: http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS # # This attribute limits the scope of the indexing process. The default is to @@ -50,7 +50,7 @@ # seen as part of the scope of the index. # #limit_urls_to: ${start_url} -limit_urls_to: http://localhost/ +limit_urls_to: http://jbws.dyndns.org/ # # This attribute is used for compressing the database. The default is to @@ -71,7 +71,7 @@ # may not work on your web server. Check the path prefix used on your web # server.) # -exclude_urls: /cgi-bin/ .cgi printable=yes Image: +exclude_urls: /cgi-bin/ .cgi printable=yes Image: action= spi-apidocs # # Since ht://Dig does not (and cannot) parse every document type, this

17 years

1
0
0 / 0

JBossWS SVN: r4801 - in projects/wiki: skins and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-10-19 06:06:38 -0400 (Fri, 19 Oct 2007) New Revision: 4801 Modified: projects/wiki/extensions/htdig/EmbedSearch.php projects/wiki/skins/Devmo.php Log: Update search to host environment Modified: projects/wiki/extensions/htdig/EmbedSearch.php =================================================================== --- projects/wiki/extensions/htdig/EmbedSearch.php 2007-10-19 09:37:26 UTC (rev 4800) +++ projects/wiki/extensions/htdig/EmbedSearch.php 2007-10-19 10:06:38 UTC (rev 4801) @@ -52,7 +52,7 @@ $height = "650"; } - $htdig="http://localhost/cgi-bin/htsearch?config=&restrict=&exclude=&method=and&f...".$_GET["words"]; + $htdig="/cgi-bin/htsearch?config=&restrict=&exclude=&method=and&format=builtin-long&sort=score&words=".$_GET["words"]; $output = "<iframe src='".$htdig."' style='width:".$width."px;height:".$height."px;' scrolling='yes' marginwidth='0' marginheight='0' frameborder='0'></iframe>"; return $output; Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-10-19 09:37:26 UTC (rev 4800) +++ projects/wiki/skins/Devmo.php 2007-10-19 10:06:38 UTC (rev 4801) @@ -100,7 +100,7 @@ </div>  - <form name="searchform" action="http://localhost/mediawiki/index.php" id="searchform" method="GET"> + <form name="searchform" action="/mediawiki/index.php" id="searchform" method="GET"> <input type="hidden" name="title" value="Search"/> <input type="hidden" name="config" value=""> <input type="hidden" name="restrict" value="">

17 years

1
0
0 / 0

JBossWS SVN: r4800 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-10-19 05:37:26 -0400 (Fri, 19 Oct 2007) New Revision: 4800 Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase3.java Log: [JBWS-1762] removing obsolete test Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-10-19 08:27:40 UTC (rev 4799) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-10-19 09:37:26 UTC (rev 4800) @@ -1,32 +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.jbws1762; - -import javax.jws.WebService; - -@WebService -public interface JBWS1762 -{ - - String echo(String toEcho); - -} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-10-19 08:27:40 UTC (rev 4799) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-10-19 09:37:26 UTC (rev 4800) @@ -1,35 +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.jbws1762; - -import javax.jws.WebService; - -@WebService(name = "JBWS1762", serviceName = "JBWS1762Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1762.JBWS1762") -public class JBWS1762Impl implements JBWS1762 -{ - - public String echo(String toEcho) - { - return toEcho; - } - -} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-10-19 08:27:40 UTC (rev 4799) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-10-19 09:37:26 UTC (rev 4800) @@ -1,69 +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.jbws1762; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author Richard.Opalka(a)jboss.com - * @since 13-Aug-2007 - */ -public class JBWS1762TestCase1 extends JBossWSTest -{ - - private String targetNS = "http://jbws1762.jaxws.ws.test.jboss.org/"; - private JBWS1762 proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1762TestCase1.class, "jaxws-jbws1762.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1762Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1762/JBWS1762Service?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1762)service.getPort(JBWS1762.class); - } - - public void testIssue() throws Exception - { - assertEquals(proxy.echo("Hello!"), "Hello!"); - } - -} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-10-19 08:27:40 UTC (rev 4799) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-10-19 09:37:26 UTC (rev 4800) @@ -1,30 +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.jbws1762; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author Richard.Opalka(a)jboss.com - * @since 13-Aug-2007 - */ -public class JBWS1762TestCase2 extends JBWS1762TestCase1 {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase3.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase3.java 2007-10-19 08:27:40 UTC (rev 4799) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase3.java 2007-10-19 09:37:26 UTC (rev 4800) @@ -1,30 +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.jbws1762; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author Richard.Opalka(a)jboss.com - * @since 25-Sep-2007 - */ -public class JBWS1762TestCase3 extends JBWS1762TestCase1 {}

17 years

1
0
0 / 0

JBossWS SVN: r4799 - in projects/wiki: extensions and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-10-19 04:27:40 -0400 (Fri, 19 Oct 2007) New Revision: 4799 Added: projects/wiki/extensions/htdig/ projects/wiki/extensions/htdig/EmbedSearch.php projects/wiki/extensions/htdig/ExtensionClass.php projects/wiki/extensions/htdig/footer.html projects/wiki/extensions/htdig/header.html projects/wiki/extensions/htdig/htdig.conf projects/wiki/extensions/htdig/index.html projects/wiki/extensions/htdig/long.html projects/wiki/extensions/htdig/nomatch.html projects/wiki/extensions/htdig/search.html projects/wiki/extensions/htdig/short.html projects/wiki/extensions/htdig/syntax.html projects/wiki/extensions/htdig/wrapper.html Modified: projects/wiki/LocalSettings.php projects/wiki/skins/Devmo.php Log: Replace default search with htdig Modified: projects/wiki/LocalSettings.php =================================================================== --- projects/wiki/LocalSettings.php 2007-10-19 08:20:22 UTC (rev 4798) +++ projects/wiki/LocalSettings.php 2007-10-19 08:27:40 UTC (rev 4799) @@ -156,4 +156,7 @@ # Graphwiz include("extensions/Graphviz.php"); $wgGraphVizSettings->dotCommand = "/usr/bin/dot"; + +# htdig +include("extensions/htdig/EmbedSearch.php"); ?> Added: projects/wiki/extensions/htdig/EmbedSearch.php =================================================================== --- projects/wiki/extensions/htdig/EmbedSearch.php (rev 0) +++ projects/wiki/extensions/htdig/EmbedSearch.php 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,60 @@ +<?php + # To activate the extension, include it at the end from your LocalSettings.php at + # with: include("extensions/EmbedURL.php"); + # + # Syntax: (2007-02-17) + # <embedurl>http://www.my-url.com/</embedurl> + # <embedurl>http://www.my-url.com/{width=640}{height=480}</embedurl> + # + $wgExtensionFunctions[] = "wfEmbedURL"; + + function wfEmbedURL() { + global $wgParser; + + $wgParser->setHook( "embedsearch", "renderEmbedSearch" ); + } + + # The callback function for converting the input text to HTML output + function renderEmbedSearch( $input, $params, &$parser ) { + global $_GET; + # Building the code + + # disable caching + $parser->disableCache(); + + $pos = strpos($input, "{width="); + if ($pos == false) { + $url = $input; + } else { + $url = substr($input, 0, $pos); + $width = substr($input, $pos+7); + $pos1 = strpos($width, "}"); + if ($pos1 != false) { + $width = substr($width, 0, $pos1); + } + } + $pos = strpos($input, "{height="); + if ($pos != false) { + $height = substr($input, $pos+8); + $pos1 = strpos($height, "}"); + if ($pos1 != false) { + $height = substr($height, 0, $pos1); + } + } + + if ($url == false ) { + $url = "http://www.mediawiki.org/wiki/Extension:EmbedURL"; + } + if ($width == false ) { + $width = "735"; + } + if ($height == false ) { + $height = "650"; + } + + $htdig="http://localhost/cgi-bin/htsearch?config=&restrict=&exclude=&method=and&f...".$_GET["words"]; + $output = "<iframe src='".$htdig."' style='width:".$width."px;height:".$height."px;' scrolling='yes' marginwidth='0' marginheight='0' frameborder='0'></iframe>"; + + return $output; + } + Added: projects/wiki/extensions/htdig/ExtensionClass.php =================================================================== --- projects/wiki/extensions/htdig/ExtensionClass.php (rev 0) +++ projects/wiki/extensions/htdig/ExtensionClass.php 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,481 @@ +<?php +/* + * ExtensionClass.php + * + * MediaWiki extension + * @author: Jean-Lou Dupont (http://www.bluecortex.com) + * + * Purpose: Provides a toolkit for easier Mediawiki + * extension development. + * + * FEATURES: + * - 'singleton' implementation suited for extensions that require single instance + * - 'magic word' helper functionality + * - limited pollution of global namespace + * + * Tested Compatibility: MW 1.8.2 (PHP5), 1.9.3, 1.10 + * + * History: + * v1.0 Initial availability + * v1.01 Small enhancement in processArgList + * v1.02 Corrected minor bug + * v1.1 Added function 'checkPageEditRestriction' + * v1.2 Added 'getArticle' function + * ---- Moved to SVN management + * v1.3 Added wgExtensionCredits updating upon Special:Version viewing + * v1.4 Fixed broken singleton functionality + * v1.5 Added automatic registration of hook functions based + * on the definition of an handler in the derived class + * (e.g. if handler 'hArticleSave' exists, then the appropriate + * 'ArticleSave' hook is registered) + * v1.51 Fixed '$passingStyle' bug (thanks to Joshua C. Lerner) + * v1.6 Added 'updateCreditsDescription' helper method. + * v1.7 Added 'depth' parameter support: more than 1 class depth can be created. + * Added 'setupTags' method (support for parser tags) + * Enhancement to 'getParam' method + * Added 'formatParams' method + * v1.8 Added 'initFirst' parameter + * v1.9 Added support for including 'head' scripts and stylesheeets + * in a manner compatible with parser caching functionality. + * (Original idea from [user:Jimbojw] + * v1.91 Added check for screening script duplicates in 'addHeadScript' + * v1.92 Added optional removal of parameters not listed in template. + * + */ +$wgExtensionCredits['other'][] = array( + 'name' => 'ExtensionClass', + 'version' => 'v1.92 $LastChangedRevision: 174 $', + 'author' => 'Jean-Lou Dupont', + 'url' => 'http://www.bluecortex.com', +); + +class ExtensionClass +{ + static $gObj; // singleton instance + +// List up-to-date with MW 1.10 SVN 21828 +static $hookList = array( +'ArticlePageDataBefore', +'ArticlePageDataAfter', +'ArticleAfterFetchContent', +'ArticleViewRedirect', +'ArticleViewHeader', +'ArticlePurge', +'ArticleSave', +'ArticleInsertComplete', +'ArticleSaveComplete', +'MarkPatrolled', +'MarkPatrolledComplete', +'WatchArticle', +'WatchArticleComplete', +'UnwatchArticle', +'UnwatchArticleComplete', +'ArticleProtect', +'ArticleProtectComplete', +'ArticleDelete', +'ArticleDeleteComplete', +'ArticleEditUpdatesDeleteFromRecentchanges', +'ArticleEditUpdateNewTalk', +'DisplayOldSubtitle', +'IsFileCacheable', +'CategoryPageView', +'FetchChangesList', +'DiffViewHeader', +'AlternateEdit', +'EditFormPreloadText', +'EditPage::attemptSave', +'EditFilter', +'EditPage::showEditForm:initial', +'EditPage::showEditForm:fields', +'SiteNoticeBefore', +'SiteNoticeAfter', +'FileUpload', +'BadImage', +'MagicWordMagicWords', +'MagicWordwgVariableIDs', +'MathAfterTexvc', +'MessagesPreLoad', +'LoadAllMessages', +'OutputPageParserOutput', +'OutputPageBeforeHTML', +'AjaxAddScript', +'PageHistoryBeforeList', +'PageHistoryLineEnding', +'ParserClearState', +'ParserBeforeStrip', +'ParserAfterStrip', +'ParserBeforeTidy', +'ParserAfterTidy', +'ParserBeforeStrip', +'ParserAfterStrip', +'ParserBeforeStrip', +'ParserAfterStrip', +'ParserBeforeInternalParse', +'InternalParseBeforeLinks', +'ParserGetVariableValueVarCache', +'ParserGetVariableValueTs', +'ParserGetVariableValueSwitch', +'IsTrustedProxy', +'wgQueryPages', +'RawPageViewBeforeOutput', +'RecentChange_save', +'SearchUpdate', +'AuthPluginSetup', +'LogPageValidTypes', +'LogPageLogName', +'LogPageLogHeader', +'LogPageActionText', +'SkinTemplateTabs', +'BeforePageDisplay', +'SkinTemplateOutputPageBeforeExec', +'PersonalUrls', +'SkinTemplatePreventOtherActiveTabs', +'SkinTemplateTabs', +'SkinTemplateBuildContentActionUrlsAfterSpecialPage', +'SkinTemplateContentActions', +'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', +'SkinTemplateSetupPageCss', +'BlockIp', +'BlockIpComplete', +'BookInformation', +'SpecialContributionsBeforeMainOutput', +'EmailUser', +'EmailUserComplete', +'SpecialMovepageAfterMove', +'SpecialMovepageAfterMove', +'SpecialPage_initList', +'SpecialPageExecuteBeforeHeader', +'SpecialPageExecuteBeforePage', +'SpecialPageExecuteAfterPage', +'PreferencesUserInformationPanel', +'SpecialSearchNogomatch', +'ArticleUndelete', +'UndeleteShowRevision', +'UploadForm:BeforeProcessing', +'UploadVerification', +'UploadComplete', +'UploadForm:initial', +'AddNewAccount', +'AbortNewAccount', +'UserLoginComplete', +'UserCreateForm', +'UserLoginForm', +'UserLogout', +'UserLogoutComplete', +'UserRights', +/*'SpecialVersionExtensionTypes',*/ // reserved special treatment +'UnwatchArticle', +'AutoAuthenticate', +'GetFullURL', +'GetLocalURL', +'GetInternalURL', +'userCan', +'TitleMoveComplete', +'isValidPassword', +'UserToggles', +'GetBlockedStatus', +'PingLimiter', +'UserRetrieveNewTalks', +'UserClearNewTalkNotification', +'PageRenderingHash', +'EmailConfirmed', +'ArticleFromTitle', +'CustomEditor', +'UnknownAction', +/*'LanguageGetMagic', */ // reserved a special treatment in this class +'LangugeGetSpecialPageAliases', +'MonoBookTemplateToolboxEnd', +'SkinTemplateSetupPageCss', +'SkinTemplatePreventOtherActiveTabs' +); + + var $className; + + var $paramPassingStyle; + var $ext_mgwords; + + // Parameter passing style. + const mw_style = 1; + const tk_style = 2; + + public static function &singleton( $mwlist=null ,$globalObjName=null, + $passingStyle = self::mw_style, $depth = 1, + $initFirst = false ) + { + // Let's first extract the callee's classname + $trace = debug_backtrace(); + $cname = $trace[$depth]['class']; + + // If no globalObjName was given, create a unique one. + if ($globalObjName === null) + $globalObjName = substr(create_function('',''), 1 ); + + // Since there can only be one extension with a given child class name, + // Let's store the $globalObjName in a static array. + if (!isset(self::$gObj[$cname]) ) + self::$gObj[$cname] = $globalObjName; + + if ( !isset( $GLOBALS[self::$gObj[$cname]] ) ) + $GLOBALS[self::$gObj[$cname]] = new $cname( $mwlist, $passingStyle, $depth, $initFirst ); + + return $GLOBALS[self::$gObj[$cname]]; + } + public function ExtensionClass( $mgwords=null, $passingStyle = self::mw_style, + $depth = 1, $initFirst = false ) + /* + * $mgwords: array of 'magic words' to subscribe to *if* required. + */ + { + global $wgHooks; + + if ($passingStyle == null) $passingStyle = self::mw_style; // prevention... + $this->paramPassingStyle = $passingStyle; + + // Let's first extract the callee's classname + $trace = debug_backtrace(); + $this->className= $cname = $trace[$depth]['class']; + // And let's retrieve the global object's name + $n = self::$gObj[$cname]; + + global $wgExtensionFunctions; + + // v1.8 feature + $initFnc = create_function('',"global $".$n."; $".$n."->setup();"); + if ($initFirst) + array_unshift( $wgExtensionFunctions, $initFnc ); + else $wgExtensionFunctions[] = $initFnc; + + $this->ext_mgwords = $mgwords; + if (is_array($this->ext_mgwords) ) + $wgHooks['LanguageGetMagic'][] = array($this, 'getMagic'); + + // v1.3 feature + if ( in_array( 'hUpdateExtensionCredits', get_class_methods($this->className) ) ) + $wgHooks['SpecialVersionExtensionTypes'][] = array( &$this, 'hUpdateExtensionCredits' ); + + // v1.5 feature + foreach (self::$hookList as $index => $hookName) + if ( in_array( 'h'.$hookName, get_class_methods($this->className) ) ) + $wgHooks[$hookName][] = array( &$this, 'h'.$hookName ); + } + public function getParamPassingStyle() { return $this->passingStyle; } + public function setup() + { + if (is_array($this->ext_mgwords)) + $this->setupMagic(); + } + // ================== MAGIC WORD HELPER FUNCTIONS =========================== + public function getMagic( &$magicwords, $langCode ) + { + foreach($this->ext_mgwords as $index => $key) + $magicwords [$key] = array( 0, $key ); + return true; + } + public function setupMagic( ) + { + global $wgParser; + foreach($this->ext_mgwords as $index => $key) + $wgParser->setFunctionHook( "$key", array( $this, "mg_$key" ) ); + } + public function setupTags( $tagList ) + { + global $wgParser; + foreach($tagList as $index => $key) + $wgParser->setHook( "$key", array( $this, "tag_$key" ) ); + } + // ================== GENERAL PURPOSE HELPER FUNCTIONS =========================== + public function processArgList( $list, $getridoffirstparam=false ) + /* + * The resulting list contains: + * - The parameters extracted by 'key=value' whereby (key => value) entries in the list + * - The parameters extracted by 'index' whereby ( index = > value) entries in the list + */ + { + if ($getridoffirstparam) + array_shift( $list ); + + // the parser sometimes includes a boggie + // null parameter. get rid of it. + if (count($list) >0 ) + if (empty( $list[count($list)-1] )) + unset( $list[count($list)-1] ); + + $result = array(); + foreach ($list as $index => $el ) + { + $t = explode("=", $el); + if (!isset($t[1])) + continue; + $result[ "{$t[0]}" ] = $t[1]; + unset( $list[$index] ); + } + if (empty($result)) + return $list; + return array_merge( $result, $list ); + } + public function getParam( &$alist, $key, $index, $default ) + /* + * Gets a parameter by 'key' if present + * or fallback on getting the value by 'index' and + * ultimately fallback on default if both previous attempts fail. + */ + { + if (array_key_exists($key, $alist) ) + return $alist[$key]; + elseif (array_key_exists($index, $alist) && $index!==null ) + return $alist[$index]; + else + return $default; + } + public function initParams( &$alist, &$templateElements, $removeNotInTemplate = true ) + { + #var_dump( $alist ); + // v1.92 feature. + if ($removeNotInTemplate) + foreach( $templateElements as $index => &$el ) + if ( !isset($alist[ $el['key'] ]) ) + unset( $alist[$el['key']] ); + + foreach( $templateElements as $index => &$el ) + $alist[$el['key']] = $this->getParam( $alist, $el['key'], $el['index'], $el['default'] ); + } + public function formatParams( &$alist , &$template ) + // look at yuiPanel extension for usage example. + // $alist = { 'key' => 'value' ... } + { + foreach ( $alist as $key => $value ) + // format the entry. + $this->formatParam( $key, $value, $template ); + } + private function formatParam( &$key, &$value, &$template ) + { + $format = $this->getFormat( $key, $template ); + if ($format !==null ) + { + switch ($format) + { + case 'bool': $value = (bool) $value; break; + case 'int': $value = (int) $value; break; + default: + case 'string': $value = (string) $value; break; + } + } + } + public function getFormat( &$key, &$template ) + { + $format = null; + foreach( $template as $index => &$el ) + if ( $el['key'] == $key ) + $format = $el['format']; + + return $format; + } + public function checkPageEditRestriction( &$title ) + // v1.1 feature + // where $title is a Mediawiki Title class object instance + { + $proceed = false; + + $state = $title->getRestrictions('edit'); + foreach ($state as $index => $group ) + if ( $group == 'sysop' ) + $proceed = true; + return $proceed; + } + public function getArticle( $article_title ) + { + $title = Title::newFromText( $article_title ); + + // Can't load page if title is invalid. + if ($title == null) return null; + $article = new Article($title); + + return $article; + } + + function isSysop( $user = null ) // v1.5 feature + { + if ($user == null) + { + global $wgUser; + $user = $wgUser; + } + return in_array( 'sysop', $user->getGroups() ); + } + + function updateCreditsDescription( &$text ) // v1.6 feature. + { + global $wgExtensionCredits; + + foreach ( $wgExtensionCredits[self::thisType] as $index => &$el ) + if ($el['name']==self::thisName) + $el['description'].=$text; + } + +/* Add scripts & stylesheets functionality. +This process must be done in two phases: +phase 1- encode information related to the required + scripts & stylesheets in a 'meta form' in + the parser cache text. +phase 2- when the page is rendered, extract the meta information + and include the information appropriately in the 'head' of the page. +************************************************************************************/ + static $scriptList; + static $scriptsAdded; + static $scriptsListed; + + function addHeadScript( $st ) + { + if ( !isset($st) ) return; + + if ( !isset(self::$scriptList) ) + self::$scriptList[] = $st; + elseif (!in_array($st, self::$scriptList)) + self::$scriptList[] = $st; + + self::$scriptsAdded = false; + self::$scriptsListed = false; + } + + function hParserAfterTidy( &$parser, &$text ) + // set the meta information in the parsed 'wikitext'. + { + if (self::$scriptsListed) return true; + self::$scriptsListed = true; + + if (!empty(self::$scriptList)) + foreach(self::$scriptList as $sc) + $text .= ''; + + return true; + } + function hOutputPageBeforeHTML( &$op, &$text ) + // This function sifts through 'meta tags' embedded in html comments + // and picks out scripts & stylesheet references that need to be put + // in the page's HEAD. + { + // some hooks get called more than once... + // In this case, since ExtensionClass provides a + // base class for numerous extensions, then it is very + // likely this method will be called more than once; + // so, we want to make sure we include the head scripts just once. + if (self::$scriptsAdded) return true; + self::$scriptsAdded = true; + + if (preg_match_all( + '//m', + $text, + $matches)===false) return true; + + $data = $matches[1]; + + foreach ($data AS $item) + { + $content = @base64_decode($item); + if ($content) $op->addScript( $content ); + } + return true; + } + +} // end class definition. +?> Added: projects/wiki/extensions/htdig/footer.html =================================================================== --- projects/wiki/extensions/htdig/footer.html (rev 0) +++ projects/wiki/extensions/htdig/footer.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,5 @@ +$(PAGEHEADER) +$(PREVPAGE) $(PAGELIST) $(NEXTPAGE) +<hr size=1/> +Powered by <a href="http://www.htdig.org/">ht://Dig</a> +</body></html> Added: projects/wiki/extensions/htdig/header.html =================================================================== --- projects/wiki/extensions/htdig/header.html (rev 0) +++ projects/wiki/extensions/htdig/header.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,47 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Search results for '$&(WORDS)'</title> +<style type="text/css"> +// override unwanted main css elements +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + font-size: 0.9em; + color: #ffffff; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +</style> + +</head> +<body> +Search results for '$&(LOGICAL_WORDS)'</h2> +<form method="get" action="$(CGI)"> +<font size="-1"> +<input type="hidden" name="config" value="$&(CONFIG)"> +<input type="hidden" name="restrict" value="$&(RESTRICT)"> +<input type="hidden" name="exclude" value="$&(EXCLUDE)"> +Match: $(METHOD) +Format: $(FORMAT) +Sort by: $(SORT) +<br> +Refine search: +<input type="text" size="30" name="words" value="$&(WORDS)"> +<input type="submit" value="Search"> +</font> +</form> +<strong>Documents $(FIRSTDISPLAYED) - $(LASTDISPLAYED) of $(MATCHES) matches. +More <img src="/htdig/star.gif" alt="*">'s indicate a better match. +</strong> +<hr noshade size="1"> Added: projects/wiki/extensions/htdig/htdig.conf =================================================================== --- projects/wiki/extensions/htdig/htdig.conf (rev 0) +++ projects/wiki/extensions/htdig/htdig.conf 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,203 @@ +# +# Example config file for ht://Dig. +# +# This configuration file is used by all the programs that make up ht://Dig. +# Please refer to the attribute reference manual for more details on what +# can be put into this file. (http://www.htdig.org/confindex.html) +# Note that most attributes have very reasonable default values so you +# really only have to add attributes here if you want to change the defaults. +# +# What follows are some of the common attributes you might want to change. +# + +# +# Specify where the database files need to go. Make sure that there is +# plenty of free disk space available for the databases. They can get +# pretty big. +# +database_dir: /var/lib/htdig + +# +# Define common_dir, which is used in several of the examples. +# +common_dir: /usr/share/htdig + +# +# Disable the translation of the ISO Latin 1 SGML entities from the +# documents into upper end 8-bit characters in the database, +# and then back to the Latin 1 SGML entities in htsearch results. +# +translate_latin1: false + +# +# This specifies the URL where the robot (htdig) will start. You can specify +# multiple URLs here. Just separate them by some whitespace. +# The example here will cause the ht://Dig homepage and related pages to be +# indexed. +# You could also index all the URLs in a file like so: +# start_url: `${common_dir}/start.url` +# +start_url: http://localhost/mediawiki/index.php?title=JBossWS + +# +# This attribute limits the scope of the indexing process. The default is to +# set it to the same as the start_url above. This way only pages that are on +# the sites specified in the start_url attribute will be indexed and it will +# reject any URLs that go outside of those sites. +# +# Keep in mind that the value for this attribute is just a list of string +# patterns. As long as URLs contain at least one of the patterns it will be +# seen as part of the scope of the index. +# +#limit_urls_to: ${start_url} +limit_urls_to: http://localhost/ + +# +# This attribute is used for compressing the database. The default is to +# set it to the same as the limit_urls_to above, plus some common endings. +# +# Keep in mind that this list should be short. If your start_url is a very +# long list of URLs, it may be wise to replace it with something like +# http://www. or comment this out and use the compiled-in default. +# +common_url_parts: ${limit_urls_to} .html .htm .shtml .php + +# +# If there are particular pages that you definitely do NOT want to index, you +# can use the exclude_urls attribute. The value is a list of string patterns. +# If a URL matches any of the patterns, it will NOT be indexed. This is +# useful to exclude things like virtual web trees or database accesses. By +# default, all CGI URLs will be excluded. (Note that the /cgi-bin/ convention +# may not work on your web server. Check the path prefix used on your web +# server.) +# +exclude_urls: /cgi-bin/ .cgi printable=yes Image: + +# +# Since ht://Dig does not (and cannot) parse every document type, this +# attribute is a list of strings (extensions) that will be ignored during +# indexing. These are *only* checked at the end of a URL, whereas +# exclude_url patterns are matched anywhere. +# +# Also keep in mind that while other attributes allow regex, these must be +# actual strings. +# +bad_extensions: .wav .gz .z .sit .au .zip .tar .hqx .exe .com .gif \ + .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov .avi .css + +# +# The string htdig will send in every request to identify the robot. Change +# this to your email address. +# +maintainer: root@localhost + +# +# The excerpts that are displayed in long results rely on stored information +# in the index databases. The compiled default only stores 512 characters of +# text from each document (this excludes any HTML markup...) If you plan on +# using the excerpts you probably want to make this larger. The only concern +# here is that more disk space is going to be needed to store the additional +# information. Since disk space is cheap (! :-)) you might want to set this +# to a value so that a large percentage of the documents that you are going +# to be indexing are stored completely in the database. At SDSU we found +# that by setting this value to about 50k the index would get 97% of all +# documents completely and only 3% was cut off at 50k. You probably want to +# experiment with this value. +# Note that if you want to set this value low, you probably want to set the +# excerpt_show_top attribute to false so that the top excerpt_length characters +# of the document are always shown. +# +max_head_length: 10000 + +# +# To limit network connections, ht://Dig will only pull up to a certain limit +# of bytes. This prevents the indexing from dying because the server keeps +# sending information. However, several FAQs happen because people have files +# bigger than the default limit of 100KB. This sets the default a bit higher. +# (see <http://www.htdig.org/FAQ.html> for more) +# +max_doc_size: 200000 + +# +# Most people expect some sort of excerpt in results. By default, if the +# search words aren't found in context in the stored excerpt, htsearch shows +# the text defined in the no_excerpt_text attribute: +# (None of the search words were found in the top of this document.) +# This attribute instead will show the top of the excerpt. +# +no_excerpt_show_top: true + +# +# Depending on your needs, you might want to enable some of the fuzzy search +# algorithms. There are several to choose from and you can use them in any +# combination you feel comfortable with. Each algorithm will get a weight +# assigned to it so that in combinations of algorithms, certain algorithms get +# preference over others. Note that the weights only affect the ranking of +# the results, not the actual searching. +# The available algorithms are: +# accents +# exact +# endings +# metaphone +# prefix +# regex +# soundex +# speling [sic] +# substring +# synonyms +# By default only the "exact" algorithm is used with weight 1. +# Note that if you are going to use the endings, metaphone, soundex, accents, +# or synonyms algorithms, you will need to run htfuzzy to generate +# the databases they use. +# +search_algorithm: exact:1 synonyms:0.5 endings:0.1 + +# +# The following are the templates used in the builtin search results +# The default is to use compiled versions of these files, which produces +# slightly faster results. However, uncommenting these lines makes it +# very easy to change the format of search results. +# See <http://www.htdig.org/hts_templates.html> for more details. +# +# template_map: Long long ${common_dir}/long.html \ +# Short short ${common_dir}/short.html +# template_name: long + +# +# The following are used to change the text for the page index. +# The defaults are just boring text numbers. These images spice +# up the result pages quite a bit. (Feel free to do whatever, though) +# +next_page_text: <img src="/htdig/buttonr.gif" border="0" align="middle" width="30" height="30" alt="next"> +no_next_page_text: +prev_page_text: <img src="/htdig/buttonl.gif" border="0" align="middle" width="30" height="30" alt="prev"> +no_prev_page_text: +page_number_text: '<img src="/htdig/button1.gif" border="0" align="middle" width="30" height="30" alt="1">' \ + '<img src="/htdig/button2.gif" border="0" align="middle" width="30" height="30" alt="2">' \ + '<img src="/htdig/button3.gif" border="0" align="middle" width="30" height="30" alt="3">' \ + '<img src="/htdig/button4.gif" border="0" align="middle" width="30" height="30" alt="4">' \ + '<img src="/htdig/button5.gif" border="0" align="middle" width="30" height="30" alt="5">' \ + '<img src="/htdig/button6.gif" border="0" align="middle" width="30" height="30" alt="6">' \ + '<img src="/htdig/button7.gif" border="0" align="middle" width="30" height="30" alt="7">' \ + '<img src="/htdig/button8.gif" border="0" align="middle" width="30" height="30" alt="8">' \ + '<img src="/htdig/button9.gif" border="0" align="middle" width="30" height="30" alt="9">' \ + '<img src="/htdig/button10.gif" border="0" align="middle" width="30" height="30" alt="10">' +# +# To make the current page stand out, we will put a border around the +# image for that page. +# +no_page_number_text: '<img src="/htdig/button1.gif" border="2" align="middle" width="30" height="30" alt="1">' \ + '<img src="/htdig/button2.gif" border="2" align="middle" width="30" height="30" alt="2">' \ + '<img src="/htdig/button3.gif" border="2" align="middle" width="30" height="30" alt="3">' \ + '<img src="/htdig/button4.gif" border="2" align="middle" width="30" height="30" alt="4">' \ + '<img src="/htdig/button5.gif" border="2" align="middle" width="30" height="30" alt="5">' \ + '<img src="/htdig/button6.gif" border="2" align="middle" width="30" height="30" alt="6">' \ + '<img src="/htdig/button7.gif" border="2" align="middle" width="30" height="30" alt="7">' \ + '<img src="/htdig/button8.gif" border="2" align="middle" width="30" height="30" alt="8">' \ + '<img src="/htdig/button9.gif" border="2" align="middle" width="30" height="30" alt="9">' \ + '<img src="/htdig/button10.gif" border="2" align="middle" width="30" height="30" alt="10">' + +# local variables: +# mode: text +# eval: (if (eq window-system 'x) (progn (setq font-lock-keywords (list '("^#.*" . font-lock-keyword-face) '("^[a-zA-Z][^ :]+" . font-lock-function-name-face) '("[+$]*:" . font-lock-comment-face) )) (font-lock-mode))) +# end: Added: projects/wiki/extensions/htdig/index.html =================================================================== --- projects/wiki/extensions/htdig/index.html (rev 0) +++ projects/wiki/extensions/htdig/index.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,71 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>ht://Dig WWW Search</title> + +<style type="text/css"> +// override unwanted main css elements +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + font-size: 0.9em; + color: #ffffff; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +</style> + +</head> +<body> +<h1> +<a href="http://www.htdig.org"><IMG SRC="/htdig/htdig.gif" align="bottom" alt="ht://Dig" border="0"></a> +WWW Site Search</h1> +<hr noshade size="1"> +This search will allow you to search the contents of +all the publicly available WWW documents at this site. +<br> +<p> +<form method="post" action="/cgi-bin/htsearch"> +<font size="-1"> +Match: <select name="method"> +<option value="and">All +<option value="or">Any +<option value="boolean">Boolean +</select> +Format: <select name="format"> +<option value="builtin-long">Long +<option value="builtin-short">Short +</select> +Sort by: <select name="sort"> +<option value="score">Score +<option value="time">Time +<option value="title">Title +<option value="revscore">Reverse Score +<option value="revtime">Reverse Time +<option value="revtitle">Reverse Title +</select> +</font> +<input type="hidden" name="config" value="htdig"> +<input type="hidden" name="restrict" value=""> +<input type="hidden" name="exclude" value=""> +<br> +Search: +<input type="text" size="30" name="words" value=""> +<input type="submit" value="Search"> +</form> +<hr noshade size="4"> +<a href="http://www.htdig.org/"> +Powered by ht://Dig $(VERSION)</a> +</body> +</html> + Added: projects/wiki/extensions/htdig/long.html =================================================================== --- projects/wiki/extensions/htdig/long.html (rev 0) +++ projects/wiki/extensions/htdig/long.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,6 @@ +<dl><dt><strong><a href="$&(URL)">$&(TITLE)</a></strong>$(STARSLEFT) +</dt><dd>$(EXCERPT)<br> +<em><a href="$&(URL)">$&(URL)</a></em> +<font size="-1">$(MODIFIED), $(SIZE) bytes</font> +</dd></dl> + Added: projects/wiki/extensions/htdig/nomatch.html =================================================================== --- projects/wiki/extensions/htdig/nomatch.html (rev 0) +++ projects/wiki/extensions/htdig/nomatch.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,58 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>No match for '$&(LOGICAL_WORDS)'</title> +<style type="text/css"> +// override unwanted main css elements +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + font-size: 0.9em; + color: #ffffff; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +</style> + +</head> +<body> +Search results</h1> +<hr size=1/> +<h2>No matches were found for '$&(LOGICAL_WORDS)'</h2> +<p> +Check the spelling of the search word(s) you used. +If the spelling is correct and you only used one word, +try using one or more similar search words with "<strong>Any</strong>." +</p><p> +If the spelling is correct and you used more than one +word with "<strong>Any</strong>," try using one or more similar search +words with "<strong>Any</strong>."</p><p> +If the spelling is correct and you used more than one +word with "<strong>All</strong>," try using one or more of the same words +with "<strong>Any</strong>."</p> +<hr noshade size="1"> +<form method="get" action="$(CGI)"> +<font size="-1"> +<input type="hidden" name="config" value="$&(CONFIG)"> +<input type="hidden" name="restrict" value="$&(RESTRICT)"> +<input type="hidden" name="exclude" value="$&(EXCLUDE)"> +Match: $(METHOD) +Format: $(FORMAT) +Sort by: $(SORT) +<br> +Refine search: +<input type="text" size="30" name="words" value="$&(WORDS)"> +<input type="submit" value="Search"> +</font> +</form> +</body></html> Added: projects/wiki/extensions/htdig/search.html =================================================================== --- projects/wiki/extensions/htdig/search.html (rev 0) +++ projects/wiki/extensions/htdig/search.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,71 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>ht://Dig WWW Search</title> + +<style type="text/css"> +// override unwanted main css elements +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + font-size: 0.9em; + color: #ffffff; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +</style> + +</head> +<body> +<h1> +<a href="http://www.htdig.org"><IMG SRC="/htdig/htdig.gif" align="bottom" alt="ht://Dig" border="0"></a> +WWW Site Search</h1> +<hr noshade size="1"> +This search will allow you to search the contents of +all the publicly available WWW documents at this site. +<br> +<p> +<form method="post" action="/cgi-bin/htsearch"> +<font size="-1"> +Match: <select name="method"> +<option value="and">All +<option value="or">Any +<option value="boolean">Boolean +</select> +Format: <select name="format"> +<option value="builtin-long">Long +<option value="builtin-short">Short +</select> +Sort by: <select name="sort"> +<option value="score">Score +<option value="time">Time +<option value="title">Title +<option value="revscore">Reverse Score +<option value="revtime">Reverse Time +<option value="revtitle">Reverse Title +</select> +</font> +<input type="hidden" name="config" value="htdig"> +<input type="hidden" name="restrict" value=""> +<input type="hidden" name="exclude" value=""> +<br> +Search: +<input type="text" size="30" name="words" value=""> +<input type="submit" value="Search"> +</form> +<hr noshade size="4"> +<a href="http://www.htdig.org/"> +Powered by ht://Dig $(VERSION)</a> +</body> +</html> + Added: projects/wiki/extensions/htdig/short.html =================================================================== --- projects/wiki/extensions/htdig/short.html (rev 0) +++ projects/wiki/extensions/htdig/short.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1 @@ +$(STARSRIGHT) <strong><a href="$&(URL)">$&(TITLE)</a></strong><br> Added: projects/wiki/extensions/htdig/syntax.html =================================================================== --- projects/wiki/extensions/htdig/syntax.html (rev 0) +++ projects/wiki/extensions/htdig/syntax.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html><head><title>Error in Boolean search for '$&(WORDS)'</title></head> +<body bgcolor="#eef7ff"> +<h1><img src="/htdig/htdig.gif" alt="ht://Dig"> +Error in Boolean search for '$&(LOGICAL_WORDS)'</h1> +<hr noshade size="4"> +Boolean expressions need to be 'correct' in order for the search +system to use them. +The expression you entered has errors in it.<p> +Examples of correct expressions are: <strong>cat and dog</strong>, <strong>cat +not dog</strong>, <strong>cat or (dog not nose)</strong>.<br>Note that +the operator <strong>not</strong> has the meaning of 'without'. +<blockquote><strong> +$(SYNTAXERROR) +</strong></blockquote> +<hr noshade size="4"> +<form method="get" action="$(CGI)"> +<font size="-1"> +<input type="hidden" name="config" value="$&(CONFIG)"> +<input type="hidden" name="restrict" value="$&(RESTRICT)"> +<input type="hidden" name="exclude" value="$&(EXCLUDE)"> +Match: $(METHOD) +Format: $(FORMAT) +Sort: $(SORT) +<br> +Refine search: +<input type="text" size="30" name="words" value="$&(WORDS)"> +<input type="submit" value="Search"> +</font> +</form> +<hr noshade size="4"> +<a href="http://www.htdig.org/"> +<img src="/htdig/htdig.gif" border="0" alt="">ht://Dig $(VERSION)</a> +</body></html> + Added: projects/wiki/extensions/htdig/wrapper.html =================================================================== --- projects/wiki/extensions/htdig/wrapper.html (rev 0) +++ projects/wiki/extensions/htdig/wrapper.html 2007-10-19 08:27:40 UTC (rev 4799) @@ -0,0 +1,55 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html><head> +<title>Search results for '$&(WORDS)'</title> + +<style type="text/css"> +// override unwanted main css elements +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + font-size: 0.9em; + color: #ffffff; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +</style> + +</head> +<body> +Search results for '$&(LOGICAL_WORDS)'</h2> +<hr noshade size="1"> +<form method="get" action="$(CGI)"> +<font size="-1"> +<input type="hidden" name="config" value="$&(CONFIG)"> +<input type="hidden" name="restrict" value="$&(RESTRICT)"> +<input type="hidden" name="exclude" value="$&(EXCLUDE)"> +Match: $(METHOD) +Format: $(FORMAT) +Sort by: $(SORT) +<br> +Refine search: +<input type="text" size="30" name="words" value="$&(WORDS)"> +<input type="submit" value="Search"> +</font> +</form> +<hr noshade size="1"> +<strong>Documents $(FIRSTDISPLAYED) - $(LASTDISPLAYED) of $(MATCHES) matches. +More <img src="/htdig/star.gif" alt="*">'s indicate a better match. +</strong> +<hr noshade size="1"> +$(HTSEARCH_RESULTS) +$(PAGEHEADER) +$(PREVPAGE) $(PAGELIST) $(NEXTPAGE) +<hr noshade size="1"> +<a href="http://www.htdog.org">ht://Dig $(VERSION)</a> +</body></html> Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-10-19 08:20:22 UTC (rev 4798) +++ projects/wiki/skins/Devmo.php 2007-10-19 08:27:40 UTC (rev 4799) @@ -100,18 +100,15 @@ </div>  - <form name="searchform" action="<?php $this->text('searchaction') ?>" id="searchform"> - <input id="searchInput" name="search" type="text" - <?php if($this->haveMsg('accesskey-search')) { - ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php } - if( isset( $this->data['search'] ) ) { - ?> value="<?php $this->text('search') ?>"<?php } ?> /> - <input type='submit' name="go" class="searchButton" id="searchGoButton" - value="<?php $this->msg('go') ?>" - /> <input type='submit' name="fulltext" - class="searchButton" - value="<?php $this->msg('search') ?>" /> - </form> + <form name="searchform" action="http://localhost/mediawiki/index.php" id="searchform" method="GET"> + <input type="hidden" name="title" value="Search"/> + <input type="hidden" name="config" value=""> + <input type="hidden" name="restrict" value=""> + <input type="hidden" name="exclude" value=""> + <input id="searchInput" name="words" type="text"/> +   + <input type='submit' name="fulltext" class="searchButton" value="<?php $this->msg('search') ?>" /> + </form>  </div>

17 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits October 2007