June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3368 - trunk/build/hudson/jboss/bin.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 11:01:54 -0400 (Fri, 01 Jun 2007) New Revision: 3368 Modified: trunk/build/hudson/jboss/bin/http-spider.sh Log: Restore previous timeout settings Modified: trunk/build/hudson/jboss/bin/http-spider.sh =================================================================== --- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 14:53:27 UTC (rev 3367) +++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 15:01:54 UTC (rev 3368) @@ -14,9 +14,9 @@ # ############################################################# -TIMEOUT=10 # wget timeout in sec -SLEEP_TIME=5 # the actual sleep time in between test -NUM_RETRIES=2 # equals 120 seconds before exit +TIMEOUT=2 # wget timeout in sec +SLEEP_TIME=10 # the actual sleep time in between test +NUM_RETRIES=12 # equals 120 seconds before exit if [ "x$1" = "x" ]; then echo "Usage: http.sh <hostname:port> <output_dir>"

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3367 - trunk/build/hudson/jboss/bin.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 10:53:27 -0400 (Fri, 01 Jun 2007) New Revision: 3367 Modified: trunk/build/hudson/jboss/bin/http-spider.sh Log: Create spider.txt relative to job dir Modified: trunk/build/hudson/jboss/bin/http-spider.sh =================================================================== --- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 14:43:54 UTC (rev 3366) +++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 14:53:27 UTC (rev 3367) @@ -10,26 +10,30 @@ # # @author Heiko.Braun(a)jboss.com # -# $Revision: $ +# $Id: $ # ############################################################# -TIMEOUT=2 # wget timeout in sec -SLEEP_TIME=10 # the actual sleep time in between test -NUM_RETRIES=12 # equals 120 seconds before exit +TIMEOUT=10 # wget timeout in sec +SLEEP_TIME=5 # the actual sleep time in between test +NUM_RETRIES=2 # equals 120 seconds before exit if [ "x$1" = "x" ]; then - echo "Usage: http.sh <hostname:port>" + echo "Usage: http.sh <hostname:port> <output_dir>" fi +if [ "x$2" = "x" ]; then + echo "Usage: http.sh <hostname:port> <output_dir>" +fi + # cleanup -rm ./spider.success 2&>1 /dev/null -rm ./spider.failed 2&>1 /dev/null +rm $2/spider.success 2&>1 /dev/null +rm $2/spider.failed 2&>1 /dev/null COUNTER=0 while [ $COUNTER -lt $NUM_RETRIES ]; do if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then - touch ./spider.success + touch $2/spider.success echo "Try $COUNTER: '$1' is available" > ./spider.success exit 0 else @@ -39,7 +43,7 @@ let COUNTER=COUNTER+1 done -touch ./spider.failed +touch $2/spider.failed echo "Unable to connect to $1, exiting..." > spider.failed exit 0

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3366 - trunk/build/hudson/jboss/bin.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 10:43:54 -0400 (Fri, 01 Jun 2007) New Revision: 3366 Modified: trunk/build/hudson/jboss/bin/http-spider.sh Log: Restore previous timeout settings Modified: trunk/build/hudson/jboss/bin/http-spider.sh =================================================================== --- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 14:25:39 UTC (rev 3365) +++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 14:43:54 UTC (rev 3366) @@ -14,9 +14,9 @@ # ############################################################# -TIMEOUT=10 # wget timeout in sec -SLEEP_TIME=5 # the actual sleep time in between test -NUM_RETRIES=2 # equals 120 seconds before exit +TIMEOUT=2 # wget timeout in sec +SLEEP_TIME=10 # the actual sleep time in between test +NUM_RETRIES=12 # equals 120 seconds before exit if [ "x$1" = "x" ]; then echo "Usage: http.sh <hostname:port>"

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3365 - in trunk: integration/sunri/src/test/resources and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-01 10:25:39 -0400 (Fri, 01 Jun 2007) New Revision: 3365 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPO.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPOResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java Removed: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.java Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java Log: Enable sunri soapbinding Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -192,56 +192,68 @@ if (sepMetaData == null) throw new IllegalStateException("Cannot obtain endpoint meta data"); - ServletRequestContext reqContext = (ServletRequestContext)context; - Type type = sepMetaData.getType(); - - ServletContext servletContext = reqContext.getServletContext(); - HttpServletRequest httpRequest = reqContext.getHttpServletRequest(); - HttpServletResponse httpResponse = reqContext.getHttpServletResponse(); - ServletHeaderSource headerSource = new ServletHeaderSource(httpRequest, httpResponse); - + // Build the message context CommonMessageContext msgContext; if (type == EndpointMetaData.Type.JAXRPC) { msgContext = new SOAPMessageContextJAXRPC(); - msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); } else { msgContext = new SOAPMessageContextJAXWS(); msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, new Boolean(false)); msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_HEADERS, headerSource.getHeaderMap()); - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_METHOD, httpRequest.getMethod()); - msgContext.put(MessageContextJAXWS.QUERY_STRING, httpRequest.getQueryString()); - msgContext.put(MessageContextJAXWS.PATH_INFO, httpRequest.getPathInfo()); - msgContext.put(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); + } + // Set servlet specific properties + HttpServletResponse httpResponse = null; + ServletHeaderSource headerSource = null; + if (context instanceof ServletRequestContext) + { + ServletRequestContext reqContext = (ServletRequestContext)context; + + ServletContext servletContext = reqContext.getServletContext(); + HttpServletRequest httpRequest = reqContext.getHttpServletRequest(); + httpResponse = reqContext.getHttpServletResponse(); + headerSource = new ServletHeaderSource(httpRequest, httpResponse); + + if (type == EndpointMetaData.Type.JAXRPC) + { + msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); + msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); + msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); + } + else + { + msgContext.put(MessageContextJAXWS.HTTP_REQUEST_HEADERS, headerSource.getHeaderMap()); + msgContext.put(MessageContextJAXWS.HTTP_REQUEST_METHOD, httpRequest.getMethod()); + msgContext.put(MessageContextJAXWS.QUERY_STRING, httpRequest.getQueryString()); + msgContext.put(MessageContextJAXWS.PATH_INFO, httpRequest.getPathInfo()); + msgContext.put(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); + msgContext.put(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); + msgContext.put(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); + } } - msgContext.setEndpointMetaData(sepMetaData); // Associate a message context with the current thread MessageContextAssociation.pushMessageContext(msgContext); + msgContext.setEndpointMetaData(sepMetaData); try { - MessageAbstraction resMessage = processRequest(endpoint, headerSource, reqContext, inStream); + MessageAbstraction resMessage = processRequest(endpoint, headerSource, context, inStream); // Replace the message context with the response context msgContext = MessageContextAssociation.peekMessageContext(); Map<String, List<String>> headers = (Map<String, List<String>>)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_HEADERS); - if (headers != null) + if (headerSource != null && headers != null) headerSource.setHeaderMap(headers); Integer code = (Integer)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_CODE); - if (code != null) + if (httpResponse != null && code != null) httpResponse.setStatus(code.intValue()); boolean isFault = false; @@ -258,7 +270,7 @@ // by a null envelope. SOAPEnvelope soapEnv = part.getEnvelope(); isFault = soapEnv != null && soapEnv.getBody().hasFault(); - if (isFault && httpResponse != null) + if (httpResponse != null && isFault) { httpResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } @@ -308,7 +320,7 @@ /** * Handle a request to this web service endpoint */ - private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, ServletRequestContext reqContext, InputStream inputStream) + private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, InvocationContext reqContext, InputStream inputStream) throws BindingException { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 14:25:39 UTC (rev 3365) @@ -8,9 +8,10 @@ # [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** -#org/jboss/test/ws/jaxws/samples/provider/** +# [JBWS-1674] Fix @WebServiceRef with SunRI org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/soapbinding/** + +#org/jboss/test/ws/jaxws/samples/soapbinding/** org/jboss/test/ws/jaxws/samples/swaref/** org/jboss/test/ws/jaxws/samples/webmethod/** org/jboss/test/ws/jaxws/samples/webservice/** Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 14:25:39 UTC (rev 3365) @@ -201,6 +201,8 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> @@ -208,8 +210,6 @@ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> </classes> </war> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -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.jaxws.samples.soapbinding; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the JSR-181 annotation: javax.jws.SOAPBinding + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @since 16-Oct-2005 + */ +@WebService(name = "DocBare", serviceName = "DocBareService") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface DocBare +{ + @WebMethod(operationName = "SubmitPO") + SubmitBareResponse submitPO(SubmitBareRequest poRequest); + + @WebMethod(operationName = "SubmitNamespacedPO") + @WebResult(targetNamespace = "http://namespace/result", name = "SubmitBareResponse") + SubmitBareResponse submitNamespacedPO(@WebParam(targetNamespace = "http://namespace/request") SubmitBareRequest poRequest); +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -38,10 +38,10 @@ */ @WebService(name = "DocBare", serviceName="DocBareService") @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -public class DocBareServiceImpl +public class DocBareServiceImpl implements DocBare { // Provide logging - private static Logger log = Logger.getLogger(ExampleServiceImpl.class); + private static Logger log = Logger.getLogger(DocBareServiceImpl.class); @WebMethod(operationName = "SubmitPO") public SubmitBareResponse submitPO(SubmitBareRequest poRequest) Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -33,12 +33,12 @@ { @WebMethod(operationName = "SubmitPO") @WebResult(name = "PurchaseOrderAck") - public PurchaseOrderAck submitPO(@WebParam(name = "PurchaseOrder") - PurchaseOrder purchaseOrder); + public String submitPO(@WebParam(name = "PurchaseOrder") + String product); @WebMethod(operationName = "SubmitNamespacedPO") @WebResult(name = "NamespacedPurchaseOrderAck", targetNamespace = "http://namespace/result") - public PurchaseOrderAck submitNamespacedPO(@WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase") - PurchaseOrder purchaseOrder, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string") + public String submitNamespacedPO(@WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase") + String product, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string") String string); } \ No newline at end of file Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -1,27 +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. - */ + * 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.samples.soapbinding; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; @@ -33,23 +37,27 @@ * @since 16-Oct-2005 */ -@WebService(name="DocWrapped", serviceName="DocWrappedService", endpointInterface = "org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped") +@WebService(name = "DocWrapped", serviceName = "DocWrappedService") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) public class DocWrappedServiceImpl implements DocWrapped { // Provide logging - private static Logger log = Logger.getLogger(ExampleServiceImpl.class); + private static Logger log = Logger.getLogger(DocWrappedServiceImpl.class); - public PurchaseOrderAck submitPO(PurchaseOrder purchaseOrder) + @WebMethod(operationName = "SubmitPO") + @WebResult(name = "PurchaseOrderAck") + public String submitPO(@WebParam(name = "PurchaseOrder") String product) { - log.info("submitPO: " + purchaseOrder); - PurchaseOrderAck poAck = new PurchaseOrderAck(purchaseOrder.getProduct()); - return poAck; + log.info("submitPO: " + product); + return product; } - public PurchaseOrderAck submitNamespacedPO(PurchaseOrder purchaseOrder, String string) + @WebMethod(operationName = "SubmitNamespacedPO") + @WebResult(name = "NamespacedPurchaseOrderAck", targetNamespace = "http://namespace/result") + public String submitNamespacedPO(@WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase") + String product, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string") String string) { - log.info("submitNamespacedPO: " + purchaseOrder + ", " + string); - PurchaseOrderAck poAck = new PurchaseOrderAck(purchaseOrder.getProduct()); - return poAck; + log.info("submitNamespacedPO: " + product + ", " + string); + return product; } } Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -1,55 +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.samples.soapbinding; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", propOrder = { "product" }) -public class PurchaseOrder -{ - @XmlElement(namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", required = true) - private String product; - - public PurchaseOrder() - { - } - - public PurchaseOrder(String product) - { - this.product = product; - } - - public String getProduct() - { - return product; - } - - public void setProduct(String product) - { - this.product = product; - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -1,55 +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.samples.soapbinding; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", propOrder = { "product" }) -public class PurchaseOrderAck -{ - @XmlElement(namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", required = true) - private String product; - - public PurchaseOrderAck() - { - } - - public PurchaseOrderAck(String product) - { - this.product = product; - } - - public String getProduct() - { - return product; - } - - public void setProduct(String product) - { - this.product = product; - } -} Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-06-01 14:24:52 UTC (rev 3364) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -71,6 +71,19 @@ public void testDocBareService() throws Exception { QName serviceName = new QName(targetNS, "DocBareService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + DocBare port = (DocBare)service.getPort(DocBare.class); + + SubmitBareRequest poReq = new SubmitBareRequest("Ferrari"); + SubmitBareResponse poRes = port.submitPO(poReq); + assertEquals("Ferrari", poRes.getProduct()); + } + + public void testDocBareDispatchService() throws Exception + { + QName serviceName = new QName(targetNS, "DocBareService"); QName portName = new QName(targetNS, "DocBarePort"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl"); @@ -150,9 +163,11 @@ Service service = Service.create(wsdlURL, serviceName); DocWrapped port = (DocWrapped)service.getPort(DocWrapped.class); - PurchaseOrderAck poRes = port.submitPO(new PurchaseOrder("Ferarri")); - - assertEquals("Ferarri", poRes.getProduct()); + String poRes = port.submitPO("Ferrari"); + assertEquals("Ferrari", poRes); + + poRes = port.submitNamespacedPO("Ferrari", "message"); + assertEquals("Ferrari", poRes); } public void testDocWrappedServiceMessageAccess() throws Exception @@ -164,9 +179,7 @@ " <env:Header/>" + " <env:Body>" + " <ns1:SubmitPO xmlns:ns1='" + targetNS + "'>" + - " <PurchaseOrder>" + - " <ns1:product>Ferrari</ns1:product>" + - " </PurchaseOrder>" + + " <PurchaseOrder>Ferrari</PurchaseOrder>" + " </ns1:SubmitPO>" + " </env:Body>" + "</env:Envelope>"; @@ -183,7 +196,6 @@ QName qname = new QName(targetNS, "SubmitPOResponse"); SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); soapElement = (SOAPElement)soapElement.getChildElements(new QName("PurchaseOrderAck")).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } @@ -201,10 +213,8 @@ " <env:Header/>" + " <env:Body>" + " <ns1:SubmitNamespacedPO xmlns:ns1='" + targetNS + "'>" + - " <ns2:NamespacedPurchaseOrder xmlns:ns2='" + purchaseNamespace + "'>" + - " <ns1:product>Ferrari</ns1:product>" + - " </ns2:NamespacedPurchaseOrder>" + - " <ns3:NamespacedString xmlns:ns3='" + stringNamespace + "'>Ferrari</ns3:NamespacedString>" + + " <ns2:NamespacedPurchaseOrder xmlns:ns2='" + purchaseNamespace + "'>Ferrari</ns2:NamespacedPurchaseOrder>" + + " <ns3:NamespacedString xmlns:ns3='" + stringNamespace + "'>message</ns3:NamespacedString>" + " </ns1:SubmitNamespacedPO>" + " </env:Body>" + "</env:Envelope>"; @@ -216,7 +226,6 @@ QName qname = new QName(targetNS, "SubmitNamespacedPOResponse"); SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); soapElement = (SOAPElement)soapElement.getChildElements(new QName(resultNamespace, "NamespacedPurchaseOrderAck")).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } } Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPO.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPO.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPO.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -0,0 +1,59 @@ + +package org.jboss.test.ws.jaxws.samples.soapbinding.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "SubmitNamespacedPO", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SubmitNamespacedPO", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/", propOrder = { + "namespacedPurchaseOrder", + "namespacedString" +}) +public class SubmitNamespacedPO { + + @XmlElement(name = "NamespacedPurchaseOrder", namespace = "http://namespace/purchase") + private String namespacedPurchaseOrder; + @XmlElement(name = "NamespacedString", namespace = "http://namespace/string") + private String namespacedString; + + /** + * + * @return + * returns String + */ + public String getNamespacedPurchaseOrder() { + return this.namespacedPurchaseOrder; + } + + /** + * + * @param namespacedPurchaseOrder + * the value for the namespacedPurchaseOrder property + */ + public void setNamespacedPurchaseOrder(String namespacedPurchaseOrder) { + this.namespacedPurchaseOrder = namespacedPurchaseOrder; + } + + /** + * + * @return + * returns String + */ + public String getNamespacedString() { + return this.namespacedString; + } + + /** + * + * @param namespacedString + * the value for the namespacedString property + */ + public void setNamespacedString(String namespacedString) { + this.namespacedString = namespacedString; + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPO.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPOResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPOResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPOResponse.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.soapbinding.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "SubmitNamespacedPOResponse", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SubmitNamespacedPOResponse", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +public class SubmitNamespacedPOResponse { + + @XmlElement(name = "NamespacedPurchaseOrderAck", namespace = "http://namespace/result") + private String namespacedPurchaseOrderAck; + + /** + * + * @return + * returns String + */ + public String getNamespacedPurchaseOrderAck() { + return this.namespacedPurchaseOrderAck; + } + + /** + * + * @param namespacedPurchaseOrderAck + * the value for the namespacedPurchaseOrderAck property + */ + public void setNamespacedPurchaseOrderAck(String namespacedPurchaseOrderAck) { + this.namespacedPurchaseOrderAck = namespacedPurchaseOrderAck; + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitNamespacedPOResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.soapbinding.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "SubmitPO", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SubmitPO", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +public class SubmitPO { + + @XmlElement(name = "PurchaseOrder", namespace = "") + private String purchaseOrder; + + /** + * + * @return + * returns String + */ + public String getPurchaseOrder() { + return this.purchaseOrder; + } + + /** + * + * @param purchaseOrder + * the value for the purchaseOrder property + */ + public void setPurchaseOrder(String purchaseOrder) { + this.purchaseOrder = purchaseOrder; + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java 2007-06-01 14:25:39 UTC (rev 3365) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.soapbinding.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "SubmitPOResponse", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SubmitPOResponse", namespace = "http://soapbinding.samples.jaxws.ws.test.jboss.org/") +public class SubmitPOResponse { + + @XmlElement(name = "PurchaseOrderAck", namespace = "") + private String purchaseOrderAck; + + /** + * + * @return + * returns String + */ + public String getPurchaseOrderAck() { + return this.purchaseOrderAck; + } + + /** + * + * @param purchaseOrderAck + * the value for the purchaseOrderAck property + */ + public void setPurchaseOrderAck(String purchaseOrderAck) { + this.purchaseOrderAck = purchaseOrderAck; + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3364 - in trunk/integration: native/src/main/etc and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 10:24:52 -0400 (Fri, 01 Jun 2007) New Revision: 3364 Modified: trunk/integration/native/ant-import/build-distro.xml trunk/integration/native/src/main/etc/bindist-build.xml trunk/integration/spi/etc/wsconsume.sh trunk/integration/spi/etc/wsprovide.sh trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-distro.xml trunk/integration/xfire/src/main/etc/bindist-build.xml Log: Allow tools execution from distribution Modified: trunk/integration/native/ant-import/build-distro.xml =================================================================== --- trunk/integration/native/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/native/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -21,13 +21,14 @@ <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.bin.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> @@ -53,10 +54,6 @@ <fileset dir="${spi.dir}/ant-import"> <include name="macros-deploy-spi.xml"/> </fileset> - <fileset dir="${spi.dir}/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> <fileset dir="${int.xfire.dir}/ant-import"> <include name="macros-deploy-xfire.xml"/> </fileset> @@ -65,6 +62,14 @@ </fileset> </copy> + <copy todir="${bindist.bin.dir}"> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> +  <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> @@ -75,8 +80,11 @@  <copy todir="${bindist.lib.dir}" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> + <include name="jbossws-spi.jar"/> </fileset> + <fileset dir="${spi.dir}/thirdparty"> + <include name="getopt.jar"/> + </fileset> <fileset dir="${int.jboss42.dir}/output/lib"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -96,8 +104,6 @@ <include name="jbossws-native50.sar"/> <include name="jbossws-native50-deployer.zip"/> </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> <fileset dir="${core.dir}/thirdparty"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -106,7 +112,7 @@ <include name="jaxws-rt.jar"/> <include name="juddi-service.sar"/> <include name="policy.jar"/> - <include name="wsdl4j.jar"/> + <include name="wsdl4j.jar"/> </fileset> </copy> Modified: trunk/integration/native/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -18,6 +18,7 @@  <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> @@ -132,11 +133,11 @@ jbosslibs="${lib.dir}" corelibs="${lib.dir}" stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> + thirdpartylibs="${lib.dir}"/> <macro-deploy-spi spilibs="${lib.dir}" - spiscripts="${build.dir}" + spiscripts="${bin.dir}" thirdpartylibs="${lib.dir}"/> </target> @@ -155,10 +156,10 @@ jbosslibs="${lib.dir}" corelibs="${lib.dir}" stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> + thirdpartylibs="${lib.dir}"/> <macro-deploy-spi spilibs="${lib.dir}" - spiscripts="${lib.dir}" + spiscripts="${bin.dir}" thirdpartylibs="${lib.dir}"/> </target> Modified: trunk/integration/spi/etc/wsconsume.sh =================================================================== --- trunk/integration/spi/etc/wsconsume.sh 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/spi/etc/wsconsume.sh 2007-06-01 14:24:52 UTC (rev 3364) @@ -1,6 +1,12 @@ #!/bin/sh -# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ +# +# Invoke wsconsume with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# DIRNAME=`dirname $0` PROGNAME=`basename $0` @@ -46,49 +52,66 @@ # Setup the java endorsed dirs JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" -# is it a JBossWS-native or SunRI installation? -if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then +### +# Setup the LIBDIR +# This script maybe used form within the jbossws distribution +# or instaled under JBOSS_HOME/bin +### + +PARENT=`cd $DIRNAME/..; pwd` +if [ -d $PARENT/client ]; then + LIBDIR=$JBOSS_HOME/client +else + LIBDIR=$PARENT/lib +fi + +# Is it a JBossWS-native or SunRI installation? +if [ -a $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi -# +### # Setup the wsconsume classpath # The classpath is dynamically build depending on the stack that # is deployed. See $JBOSSWS_NATIVE above. -# +### # shared libs WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/activation.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/getopt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossall-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/log4j.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/mail.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar" # shared jaxws libs -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar" # stack specific dependencies if [ "x$JBOSSWS_NATIVE" = "x" ]; then echo "Seems to be a Sun-RI stack deployed" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" else echo "Seems to be a JBossWS-Native stack deployed" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar" fi +### +# Execute the JVM +### + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` @@ -97,7 +120,6 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi -# Execute the JVM "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ Modified: trunk/integration/spi/etc/wsprovide.sh =================================================================== --- trunk/integration/spi/etc/wsprovide.sh 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/spi/etc/wsprovide.sh 2007-06-01 14:24:52 UTC (rev 3364) @@ -1,6 +1,12 @@ #!/bin/sh -# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun(a)jboss.com $ +# +# Invoke wsprovide with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# DIRNAME=`dirname $0` PROGNAME=`basename $0` @@ -46,56 +52,73 @@ # Setup the java endorsed dirs JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" +### +# Setup the LIBDIR +# This script maybe used form within the jbossws distribution +# or instaled under JBOSS_HOME/bin +### + +PARENT=`cd $DIRNAME/..; pwd` +if [ -d $PARENT/client ]; then + LIBDIR=$JBOSS_HOME/client +else + LIBDIR=$PARENT/lib +fi + # is it a JBossWS-native or SunRI installation? -if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then +if [ -a $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi -# +### # Setup the wsprovide classpath # The classpath is dynamically build depending on the stack that # is deployed. See $JBOSSWS_NATIVE above. -# +### # shared libs WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar" # TODO: verify jbossall-client.jar dependency. It might be just logging -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar" # shared jaxws libs -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar" # stack specific dependencies if [ "x$JBOSSWS_NATIVE" = "x" ]; then echo "Seems to be a Sun-RI stack deployed" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar" else echo "Seems to be a JBossWS-Native stack deployed" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" fi +### +# Execute the JVM +### + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` @@ -104,7 +127,6 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi -# Execute the JVM "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ Modified: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -23,6 +23,7 @@ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> @@ -30,7 +31,7 @@ <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.bin.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> @@ -55,11 +56,7 @@ </fileset> <fileset dir="${spi.dir}/ant-import"> <include name="macros-deploy-spi.xml"/> - </fileset> - <fileset dir="${spi.dir}/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> + </fileset> <fileset dir="${int.xfire.dir}/ant-import"> <include name="macros-deploy-xfire.xml"/> </fileset> @@ -68,6 +65,14 @@ </fileset> </copy> + <copy todir="${bindist.bin.dir}"> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> +  <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> @@ -80,6 +85,9 @@ <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> </fileset> + <fileset dir="${spi.dir}/thirdparty"> + <include name="getopt.jar"/> + </fileset> <fileset dir="${int.jboss42.dir}/output/lib"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -91,9 +99,8 @@ <include name="jbossws-sunri42.sar"/> <include name="jbossws-sunri50.sar"/> <include name="jbossws-sunri50-deployer.zip"/> + <include name="jbossws-sunri-client.jar"/> </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> <fileset dir="${int.sunri.dir}/thirdparty"/> </copy> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -50,6 +50,7 @@ <available property="jboss42.available" file="${jboss42.available.file}"/> <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-sunri.xml"/> <import file="${basedir}/build/macros-deploy-xfire.xml"/> @@ -139,7 +140,7 @@ spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> + thirdpartylibs="${lib.dir}"/> <macro-deploy-spi spilibs="${lib.dir}" @@ -161,7 +162,7 @@ spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> + thirdpartylibs="${lib.dir}"/> <macro-deploy-spi spilibs="${lib.dir}" Modified: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -13,96 +13,110 @@ <project> -  -  -  - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> - - <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> +  +  +  - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty/client"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - -  - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> - <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/> - <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/> - -  - <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> - <fileset dir="${int.native.dir}/ant-import"> - <include name="macros-deploy-native.xml"/> - </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${int.xfire.dir}/ant-import"> - <include name="macros-deploy-xfire.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> - </copy> - -  - <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${int.xfire.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-xfire42.sar"/> - <include name="jbossws-xfire50.sar"/> - <include name="jbossws-xfire50-deployer.zip"/> - </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> - <fileset dir="${int.xfire.dir}/thirdparty"/> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty/client" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> - -  - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}/src"/> - <fileset dir="${int.xfire.dir}/src/test"/> - </copy> - - <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip"> - <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/> - </zip> - </target> - + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> + + <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.bin.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty/client"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> + <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${spi.dir}/ant-import"> + <include name="macros-deploy-spi.xml"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + + <copy todir="${bindist.bin.dir}"> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${spi.dir}/thirdparty"> + <include name="getopt.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.xfire.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-xfire42.sar"/> + <include name="jbossws-xfire50.sar"/> + <include name="jbossws-xfire50-deployer.zip"/> + </fileset> + +  + <fileset dir="${int.xfire.dir}/thirdparty"/> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.xfire.dir}/src/test"/> + </copy> + + <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip"> + <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/> + </zip> + </target> + </project> Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363) +++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364) @@ -12,188 +12,200 @@  <project default="main" basedir="." name="JBossWS/XFire"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${tests.dir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - <property file="${build.dir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> +  +  +  -  - - <path id="sunri.classpath"> - <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/client/http.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/client/resolver.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/> - <pathelement location="${thirdparty.dir}/client/wstx.jar"/> - </path> - - <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jdom.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - - <path id="ws.stack.classpath"> - <path refid="sunri.classpath"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-sunri50/> - <macro-deploy-xfire50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <macro-undeploy-xfire50/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-sunri42/> - <macro-deploy-xfire42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> - <macro-undeploy-xfire42/> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - + <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-spi.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + +  + + <path id="sunri.classpath"> + <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/client/http.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/client/resolver.jar"/> + <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/client/wstx.jar"/> + </path> + + <path id="xfire.classpath"> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jdom.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> + </path> + + <path id="ws.stack.classpath"> + <path refid="sunri.classpath"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-sunri50/> + <macro-deploy-xfire50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> + <macro-undeploy-xfire50/> + <macro-undeploy-spi/> + </target> + +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-sunri42/> + <macro-deploy-xfire42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> + <macro-undeploy-xfire42/> + <macro-undeploy-spi/> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + </project>

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3363 - trunk/jbossws-core/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 09:30:00 -0400 (Fri, 01 Jun 2007) New Revision: 3363 Removed: trunk/jbossws-core/src/main/etc/wsconsume.bat trunk/jbossws-core/src/main/etc/wsconsume.sh trunk/jbossws-core/src/main/etc/wsprovide.bat trunk/jbossws-core/src/main/etc/wsprovide.sh Log: Moved to intergation/spi Deleted: trunk/jbossws-core/src/main/etc/wsconsume.bat =================================================================== --- trunk/jbossws-core/src/main/etc/wsconsume.bat 2007-06-01 13:18:34 UTC (rev 3362) +++ trunk/jbossws-core/src/main/etc/wsconsume.bat 2007-06-01 13:30:00 UTC (rev 3363) @@ -1,53 +0,0 @@ -@echo off - -rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-wsconsume-impl.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsconsume %* Deleted: trunk/jbossws-core/src/main/etc/wsconsume.sh =================================================================== --- trunk/jbossws-core/src/main/etc/wsconsume.sh 2007-06-01 13:18:34 UTC (rev 3362) +++ trunk/jbossws-core/src/main/etc/wsconsume.sh 2007-06-01 13:30:00 UTC (rev 3363) @@ -1,82 +0,0 @@ -#!/bin/sh - -# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsconsume-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSCONSUME_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsconsume "$@" Deleted: trunk/jbossws-core/src/main/etc/wsprovide.bat =================================================================== --- trunk/jbossws-core/src/main/etc/wsprovide.bat 2007-06-01 13:18:34 UTC (rev 3362) +++ trunk/jbossws-core/src/main/etc/wsprovide.bat 2007-06-01 13:30:00 UTC (rev 3363) @@ -1,48 +0,0 @@ -@echo off - -rem $Id: wsprovide.bat 2464 2007-02-23 21:51:05Z jason.greene(a)jboss.com $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsprovide %* Deleted: trunk/jbossws-core/src/main/etc/wsprovide.sh =================================================================== --- trunk/jbossws-core/src/main/etc/wsprovide.sh 2007-06-01 13:18:34 UTC (rev 3362) +++ trunk/jbossws-core/src/main/etc/wsprovide.sh 2007-06-01 13:30:00 UTC (rev 3363) @@ -1,77 +0,0 @@ -#!/bin/sh - -# $Id: wsprovide.sh 2361 2007-02-14 14:52:02Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSPROVIDE_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsprovide "$@"

17 years, 6 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 09:18:34 -0400 (Fri, 01 Jun 2007) New Revision: 3362 Modified: trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/etc/bindist-build.xml Log: Deploy SPI from distribution Modified: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:14:42 UTC (rev 3361) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:18:34 UTC (rev 3362) @@ -13,92 +13,99 @@ <project> -  -  -  - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> +  +  +  - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - -  - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> - <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> - <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> - -  - <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> - <fileset dir="${int.native.dir}/ant-import"> - <include name="macros-deploy-native.xml"/> - </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${int.xfire.dir}/ant-import"> - <include name="macros-deploy-xfire.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> - </copy> - -  - <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${int.sunri.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-sunri42.sar"/> - <include name="jbossws-sunri50.sar"/> - <include name="jbossws-sunri50-deployer.zip"/> - </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> - -  - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}/src"/> - <fileset dir="${int.sunri.dir}/src/test"/> - </copy> - - <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> - </zip> - </target> - + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> + <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${spi.dir}/ant-import"> + <include name="macros-deploy-spi.xml"/> + </fileset> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.sunri.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-sunri42.sar"/> + <include name="jbossws-sunri50.sar"/> + <include name="jbossws-sunri50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.sunri.dir}/src/test"/> + </copy> + + <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> + <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> + </zip> + </target> + </project> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:14:42 UTC (rev 3361) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:18:34 UTC (rev 3362) @@ -12,169 +12,181 @@  <project default="main" basedir="." name="JBossWS/SunRI"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${tests.dir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - <property file="${build.dir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> +  +  +  - <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/http.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/resolver.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/streambuffer.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-xfire50/> - <macro-deploy-sunri50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri50/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-xfire42/> - <macro-deploy-sunri42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/resolver.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-xfire50/> + <macro-deploy-sunri50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-spi/> + </target> + +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-xfire42/> + <macro-deploy-sunri42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-spi/> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + </project>

17 years, 6 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 09:14:42 -0400 (Fri, 01 Jun 2007) New Revision: 3361 Modified: trunk/integration/native/ant-import/build-distro.xml trunk/integration/native/src/main/etc/bindist-build.xml Log: Deploy SPI from distribution Modified: trunk/integration/native/ant-import/build-distro.xml =================================================================== --- trunk/integration/native/ant-import/build-distro.xml 2007-06-01 11:50:51 UTC (rev 3360) +++ trunk/integration/native/ant-import/build-distro.xml 2007-06-01 13:14:42 UTC (rev 3361) @@ -13,105 +13,112 @@ <project> -  -  -  - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> +  +  +  - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - -  - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> - <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/> - <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/> - -  - <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> - <fileset dir="${int.native.dir}/ant-import"> - <include name="macros-deploy-native.xml"/> - </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${int.xfire.dir}/ant-import"> - <include name="macros-deploy-xfire.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> - </copy> - -  - <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-core.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${int.native.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-native42.sar"/> - <include name="jbossws-native50.sar"/> - <include name="jbossws-native50-deployer.zip"/> - </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> - <fileset dir="${core.dir}/thirdparty"> + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/> + <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${spi.dir}/ant-import"> + <include name="macros-deploy-spi.xml"/> + </fileset> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-native42.sar"/> + <include name="jbossws-native50.sar"/> + <include name="jbossws-native50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${core.dir}/thirdparty"> <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="juddi-service.sar"/> - <include name="policy.jar"/> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> <include name="wsdl4j.jar"/> - </fileset> - </copy> - -  - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}/src"/> - <fileset dir="${int.native.dir}/src/test"/> - </copy> - - <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> - <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> - </zip> - </target> - + </fileset> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.native.dir}/src/test"/> + </copy> + + <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> + <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> + </zip> + </target> + </project> Modified: trunk/integration/native/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 11:50:51 UTC (rev 3360) +++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 13:14:42 UTC (rev 3361) @@ -12,162 +12,174 @@  <project default="main" basedir="." name="JBossWS/XFire"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${tests.dir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - <property file="${build.dir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${lib.dir}/jboss-jaxws.jar"/> - <pathelement location="${lib.dir}/jboss-saaj.jar"/> - <pathelement location="${lib.dir}/jbossws-core.jar"/> - <pathelement location="${lib.dir}/jbossws-client.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> - <macro-undeploy-sunri50/> - <macro-undeploy-xfire50/> - <macro-deploy-native50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> - <macro-undeploy-native50/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42"> - <macro-undeploy-sunri42/> - <macro-undeploy-xfire42/> - <macro-deploy-native42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42"> - <macro-undeploy-native42/> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-spi.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-core.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/policy.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-xfire50/> + <macro-deploy-native50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-spi/> + </target> + +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-xfire42/> + <macro-deploy-native42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-spi/> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + </project>

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3360 - in trunk/integration: spi and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-01 07:50:51 -0400 (Fri, 01 Jun 2007) New Revision: 3360 Added: trunk/integration/spi/ant-import/macros-deploy-spi.xml Removed: trunk/integration/spi/ant-import/build-deploy.xml Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml Log: Move SPI target to macro Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -12,46 +12,57 @@  <project> - - <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> - -  -  -  - -  - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50"> - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> - <macro-deploy-native50 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-native50/> - </target> - -  - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42"> - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <macro-deploy-native42 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss42.dir}/output/lib" - corelibs="${core.dir}/output/lib" - stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <macro-undeploy-native42/> - </target> + + <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> + <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/> + +  +  +  + +  + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-deploy-native50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-spi/> + </target> + +  + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-native42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-spi/> + </target> </project> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -27,10 +27,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>  - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -59,9 +56,6 @@  <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -99,8 +93,7 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/>  @@ -108,8 +101,7 @@ </fileset>  - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss50.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -132,10 +124,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -156,13 +145,7 @@ <include name="policy.jar"/> </fileset> </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -193,8 +176,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-integration-tools.jar"/> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/>  @@ -204,8 +186,7 @@  <include name="jbossws-integration.jar"/> </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> Deleted: trunk/integration/spi/ant-import/build-deploy.xml =================================================================== --- trunk/integration/spi/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <target name="_deploy-common"> - <copy todir="${jboss50.home}/client"> - <fileset dir="${spi.dir}/output/lib/"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <fileset dir="${spi.dir}/output/lib/"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${spi.dir}/etc"> - <include name="wsconsume.bat"/> - <include name="wsconsume.sh"/> - <include name="wsprovide.bat"/> - <include name="wsprovide.sh"/> - </fileset> - </copy> - - <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> - </target> - - <target name="_undeploy-common"> - <delete> - - <fileset dir="${jboss50.home}/client"> - <include name="jbossws-spi.jar"/> - </fileset> - - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - -  - <fileset dir="${jboss50.home}/bin"> - <include name="ws*.sh"/> - <include name="ws*.bat"/> - </fileset> - </delete> - </target> - -  - <target name="deploy-jboss50" description="Deploy jbossws to jboss50"> - <antcall target="_deploy-common"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <antcall target="_undeploy-common"/> - </target> - -  - <target name="deploy-jboss42" description="Deploy jbossws to jboss42"> - <antcall target="_deploy-common"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <antcall target="_undeploy-common"/> - </target> - -</project> Added: trunk/integration/spi/ant-import/macros-deploy-spi.xml =================================================================== --- trunk/integration/spi/ant-import/macros-deploy-spi.xml (rev 0) +++ trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <macrodef name="macro-deploy-spi"> + <attribute name="spilibs"/> + <attribute name="spiscripts"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <copy todir="${jboss50.home}/client"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="@{spiscripts}"> + <include name="wsconsume.bat"/> + <include name="wsconsume.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide.sh"/> + </fileset> + </copy> + + <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-spi"> + <sequential> + <delete> + + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + </fileset> + + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + +  + <fileset dir="${jboss50.home}/bin"> + <include name="wsconsume.bat"/> + <include name="wsconsume.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide.sh"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Property changes on: trunk/integration/spi/ant-import/macros-deploy-spi.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/build.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -14,8 +14,7 @@ <project default="main" basedir="../.."> <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${spi.dir}/ant-import/build-deploy.xml"/> + <import file="${spi.dir}/ant-import/build-release.xml"/> <import file="${spi.dir}/ant-import/build-thirdparty.xml"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-01 11:50:51 UTC (rev 3360) @@ -161,7 +161,8 @@ private ClassLoader getClasspathLoader(ClassLoader parent) { - return new AntClassLoader(parent, getProject(), classpath, false); + AntClassLoader loader = new AntClassLoader(parent, getProject(), classpath, false); + return loader; } public void executeNonForked() Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -13,44 +13,55 @@ <project> - <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> - -  -  -  - -  - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> - <macro-deploy-sunri50 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-sunri50/> - </target> - -  - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> - <macro-deploy-sunri42 - spilibs="${spi.dir}/output/lib" - jbosslibs="${int.jboss42.dir}/output/lib" - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - </target> - + <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> + <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/> + +  +  +  + +  + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-deploy-sunri50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-spi/> + </target> + +  + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-sunri42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${spi.dir}/output/lib" + spiscripts="${spi.dir}/etc" + thirdpartylibs="${spi.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-spi/> + </target> + </project> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 11:35:44 UTC (rev 3359) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 11:50:51 UTC (rev 3360) @@ -27,9 +27,6 @@  <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -92,8 +89,7 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> @@ -115,10 +111,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> + <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -171,8 +164,7 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r3359 - in trunk: testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-01 07:35:44 -0400 (Fri, 01 Jun 2007) New Revision: 3359 Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java Log: Enable sunri provider Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:35:44 UTC (rev 3359) @@ -8,7 +8,7 @@ # [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** -org/jboss/test/ws/jaxws/samples/provider/** +#org/jboss/test/ws/jaxws/samples/provider/** org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/soapbinding/** org/jboss/test/ws/jaxws/samples/swaref/** Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-01 11:35:44 UTC (rev 3359) @@ -77,7 +77,7 @@ Element root = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray())); String oldValue = DOMUtils.getTextContent(root); - String newValue = oldValue + ":" + direction + getHandlerName(); + String newValue = oldValue + ":" + direction + ":LogicalSourceHandler"; root.setTextContent(newValue); log.debug("oldValue: " + oldValue); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-06-01 11:35:44 UTC (rev 3359) @@ -41,11 +41,7 @@ * @author <a href="jason.greene(a)jboss.com"/>Jason T. Greene</a> * @since 29-Jun-2006 */ -@WebServiceProvider( - serviceName = "ProviderService", - portName = "ProviderPort", - targetNamespace = "http://org.jboss.ws/provider", - wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") +@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") @ServiceMode(value = Service.Mode.PAYLOAD) public class ProviderBeanJAXB implements Provider<Source> { @@ -56,7 +52,7 @@ { try { - JAXBContext jc = JAXBContext.newInstance(new Class[] {UserType.class}); + JAXBContext jc = JAXBContext.newInstance(new Class[] { UserType.class }); UserType user = (UserType)jc.createUnmarshaller().unmarshal(request); log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]"); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2007-06-01 11:35:44 UTC (rev 3359) @@ -63,7 +63,7 @@ transformer.transform(req, streamResult); String xmlReq = streamResult.getOutputStream().toString(); - String expReq = "<ns1:somePayload xmlns:ns1=\"http://org.jboss.ws/provider\">Hello:InboundLogicalHandler</ns1:somePayload>"; + String expReq = "<ns1:somePayload xmlns:ns1=\"http://org.jboss.ws/provider\">Hello:Inbound:LogicalSourceHandler</ns1:somePayload>"; if (!expReq.equals(xmlReq)) throw new WebServiceException("Unexpected payload: " + xmlReq); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-01 11:35:44 UTC (rev 3359) @@ -35,6 +35,7 @@ import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; import javax.xml.ws.Dispatch; import javax.xml.ws.Service; @@ -58,7 +59,6 @@ { private String msgString = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + " <env:Body>" + " <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" + " </env:Body>" + @@ -84,23 +84,13 @@ SOAPMessage resMsg = dispatch.invoke(reqMsg); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + SOAPHeader soapHeader = resEnv.getHeader(); + if (soapHeader != null) + soapHeader.detachNode(); + assertEquals(DOMUtils.parse(msgString), resEnv); } - private Dispatch<SOAPMessage> createDispatch(String target) throws MalformedURLException, JAXBException - { - String targetNS = "http://org.jboss.ws/provider"; - QName serviceName = new QName(targetNS, "ProviderService"); - QName portName = new QName(targetNS, "ProviderPort"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-message/" + target + "?wsdl"); - - Service service = Service.create(serviceName); - service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); - - Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE); - return dispatch; - } - public void testProviderMessage() throws Exception { SOAPMessage reqMsg = getRequestMessage(); @@ -111,6 +101,10 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + SOAPHeader soapHeader = resEnv.getHeader(); + if (soapHeader != null) + soapHeader.detachNode(); + assertEquals(reqEnv, resEnv); } @@ -120,4 +114,18 @@ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes())); return reqMsg; } + + private Dispatch<SOAPMessage> createDispatch(String target) throws MalformedURLException, JAXBException + { + String targetNS = "http://org.jboss.ws/provider"; + QName serviceName = new QName(targetNS, "ProviderService"); + QName portName = new QName(targetNS, "ProviderPort"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-message/" + target + "?wsdl"); + + Service service = Service.create(serviceName); + service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); + + Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE); + return dispatch; + } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-01 11:13:38 UTC (rev 3358) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-01 11:35:44 UTC (rev 3359) @@ -47,6 +47,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; /** @@ -61,7 +62,7 @@ "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello</ns1:somePayload>"; private String resString = - "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:InboundLogicalHandler:OutboundLogicalHandler</ns1:somePayload>"; + "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:Inbound:LogicalSourceHandler:Outbound:LogicalSourceHandler</ns1:somePayload>"; public static Test suite() { @@ -91,12 +92,6 @@ " <env:Body>" + reqString + "</env:Body>" + "</env:Envelope>"; - String resEnvString = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + resString + "</env:Body>" + - "</env:Envelope>"; - MessageFactory msgFactory = MessageFactory.newInstance(); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes())); @@ -105,7 +100,12 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - assertEquals(DOMUtils.parse(resEnvString), resEnv); + SOAPHeader soapHeader = resEnv.getHeader(); + if (soapHeader != null) + soapHeader.detachNode(); + + String resEnvStr = DOMWriter.printNode(resEnv, false); + assertTrue("Expected payload: " + resString, resEnvStr.indexOf(resString) > 0); } private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException

17 years, 6 months

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 June 2007