From commitsjasmine05@example.org Mon Jun 05 07:11:08 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 39865 invoked from network); 5 Jun 2006 07:11:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 Jun 2006 07:11:07 -0000 Received: (qmail 34112 invoked by uid 500); 5 Jun 2006 07:11:04 -0000 Delivered-To: jasmine05@example.org Received: (qmail 34088 invoked by uid 500); 5 Jun 2006 07:11:03 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 34077 invoked by uid 99); 5 Jun 2006 07:11:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 00:11:03 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO ajax.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2006 00:11:03 -0700 Received: from ajax.apache.org (localhost [83.161.120.155]) by ajax.apache.org (Postfix) with ESMTP id 320A5D49DD for <jasmine05@example.org>; Mon, 5 Jun 2006 08:10:42 +0100 (BST) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Apache Wiki <jasmine05@example.org> To: jasmine05@example.org Date: Mon, 05 Jun 2006 07:10:42 -0000 Message-ID: <jasmine05@example.org> Subject: [Beehive Wiki] Update of "WishList" by HosseinPurSultani X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Dear Wiki user, You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification. The following page has been changed by HosseinPurSultani: http://wiki.apache.org/beehive/WishList ------------------------------------------------------------------------------ Jakarta taglibs just annonced that Reusable Dialog Components (RDC) Tag Library are released as supported tag library. Maybe beehive should provide tight integration with these very useful tag libraries? + = Support for Workflow Engines = + + A facility for mapping a workflow of an application to its forms, reports and entries. By using this facility my PageFlowController is my business process description. + From commitsjasmine05@example.org Wed Jun 07 19:37:02 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 9240 invoked from network); 7 Jun 2006 19:37:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jun 2006 19:37:01 -0000 Received: (qmail 50586 invoked by uid 500); 7 Jun 2006 19:37:01 -0000 Delivered-To: jasmine05@example.org Received: (qmail 50515 invoked by uid 500); 7 Jun 2006 19:37:01 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Delivered-To: moderator for jasmine05@example.org Received: (qmail 44276 invoked by uid 99); 7 Jun 2006 19:33:14 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Message-ID: <jasmine05@example.org> From: "Gordon Robles" <jasmine05@example.org> To: <jasmine05@example.org> Subject: lib quantify Date: Wed, 7 Jun 2006 19:25:10 +0200 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="Windows-1252"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1409 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1409 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Trading alert! ***BREAKING NEWS ALERT ISSUED**** Sick of hedge funds and flippers getting all the great new issues? We have come across what we feel is one of those rear deals that the public has not heard about yet. They have cash and have made great strategic aquisitions. This is your chance to get in while it is still low. Date : 07.06.06 Name : AbsoluteSKY T i c k e r : A B S Y Price : $0.95 4-5 Day Trading : $1 - $4 Status : 5(5) From commitsjasmine05@example.org Wed Jun 07 20:19:16 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 28434 invoked from network); 7 Jun 2006 20:19:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jun 2006 20:19:16 -0000 Received: (qmail 51838 invoked by uid 500); 7 Jun 2006 20:19:16 -0000 Delivered-To: jasmine05@example.org Received: (qmail 51811 invoked by uid 500); 7 Jun 2006 20:19:16 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 51800 invoked by uid 99); 7 Jun 2006 20:19:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 13:19:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 13:19:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 603B81A983A; Wed, 7 Jun 2006 13:18:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412520 - in /beehive/trunk: samples/controls-webservices-blank/ system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ system-controls/src/webservice/control/org/apache/beehive/controls/system/webse... Date: Wed, 07 Jun 2006 20:18:53 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cschoett Date: Wed Jun 7 13:18:52 2006 New Revision: 412520 URL: http://svn.apache.org/viewvc?rev=412520&view=rev Log: Some cleanup to the WSC generator Ant Task. Consoldated srcDir, srcFile and srcUrl into a single parameter: wsdlSrc. Also fixed a minor wsdl processing bug in WsdlOpParameter for some implicit forms of an 'any' typed type. Updated build files which were using the WSC generator ant task for parameter name change. Modified: beehive/trunk/samples/controls-webservices-blank/build-svn.xml beehive/trunk/samples/controls-webservices-blank/build.xml beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/WebServiceControlGeneratorTask.java beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlOpParameter.java beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlUtils.java beehive/trunk/system-controls/test/webservice/build.xml beehive/trunk/system-controls/test/webservice/junit/build.xml Modified: beehive/trunk/samples/controls-webservices-blank/build-svn.xml URL: http://svn.apache.org/viewvc/beehive/trunk/samples/controls-webservices-blank/build-svn.xml?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/samples/controls-webservices-blank/build-svn.xml (original) +++ beehive/trunk/samples/controls-webservices-blank/build-svn.xml Wed Jun 7 13:18:52 2006 @@ -120,7 +120,7 @@ classname="org.apache.beehive.controls.system.webservice.generator.WebServiceControlGeneratorTask" classpathref="wscgen.dependencies"/> - <webservice-control-gen srcdir="${schema.dir}" destdir="${gen.source.dir}" destPackageName="${my.service.control.package}"/> + <webservice-control-gen wsdlsrc="${schema.dir}" destdir="${gen.source.dir}" destPackageName="${my.service.control.package}"/> <!-- have the wsdls, in the same dir as the jcx files --> <copy todir="${gen.source.dir}/${my.service.control.package}"> Modified: beehive/trunk/samples/controls-webservices-blank/build.xml URL: http://svn.apache.org/viewvc/beehive/trunk/samples/controls-webservices-blank/build.xml?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/samples/controls-webservices-blank/build.xml (original) +++ beehive/trunk/samples/controls-webservices-blank/build.xml Wed Jun 7 13:18:52 2006 @@ -105,7 +105,7 @@ classname="org.apache.beehive.controls.system.webservice.generator.WebServiceControlGeneratorTask" classpathref="wscgen.dependencies"/> - <webservice-control-gen srcdir="${schema.dir}" destdir="${gen.source.dir}" destPackageName="${my.service.control.package}"/> + <webservice-control-gen wsdlsrc="${schema.dir}" destdir="${gen.source.dir}" destPackageName="${my.service.control.package}"/> <!-- have the wsdls, in the same dir as the jcx files --> <copy todir="${gen.source.dir}/${my.service.control.package}"> Modified: beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/WebServiceControlGeneratorTask.java URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/WebServiceControlGeneratorTask.java?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/WebServiceControlGeneratorTask.java (original) +++ beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/WebServiceControlGeneratorTask.java Wed Jun 7 13:18:52 2006 @@ -36,9 +36,8 @@ * <li>serviceName, optional, If not set the first service in the WSDL will be used to generate the control.</li> * <li>serviceNamespace, optional, Used in conjunction with the serviceName parameter to specify a service in the WSDL.</li> * <li>servicePort, optional, If not set the first port in the service will be used for control generation.</li> - * <li>srcDir, optional, If specfied all WSDL files in the directory will be processed. Either srcDir or srcFile must be set.</li> - * <li>srcFile, optional, If specified the WSDL file will be used to generate the control.</li> * <li>wsdlRuntimePath, optional, Specifies the location of the WSDL for the jasmine05@example.org.</li> + * <li>wsdlSrc, optional, Specifies the location of the WSDL(s) for control generation, must be either a URL, file or directory.</li> * </ul> * * <xmp> @@ -47,25 +46,24 @@ * classpathref="wscgen.dependency.path"/> * <p/> * <p/> - * <webservice-control-gen srcDir="${build.wsdls}" destDir="${build.jcxgen}" destPackageName="${pkg.name}"/> + * <webservice-control-gen wsdlSrc="${build.wsdls}" destDir="${build.jcxgen}" destPackageName="${pkg.name}"/> * </xmp> */ public final class WebServiceControlGeneratorTask extends Task { - private File _srcfile; - private File _srcdir; private File _destdir; - private URL _srcURL; - + private String _wsdlSrc; private String _destPackageName; private String _wsdlRuntimePath; private String _serviceName; private String _serviceNamespace; private String _servicePortName; - private boolean _copyWsdl = false; + private File _wsdlSrcFile; + private URL _wsdlSrcURL; + //@todo: add option to compile generated service control /** @@ -103,7 +101,7 @@ * @param destPackageName Java package name. Package names may be of arbitrary depth, ex. xxx.yyy.zzz */ public void setDestPackageName(String destPackageName) { - _destPackageName = destPackageName; + _destPackageName = ("".equals(destPackageName)) ? null : destPackageName; } /** @@ -115,7 +113,7 @@ * @param serviceName Name of service to generate web service control from. */ public void setServiceName(String serviceName) { - _serviceName = serviceName; + _serviceName = ("".equals(serviceName)) ? null : serviceName; } /** @@ -126,7 +124,7 @@ * @param serviceNamespace Namespace of the service. */ public void setServiceNamespace(String serviceNamespace) { - _serviceNamespace = serviceNamespace; + _serviceNamespace = ("".equals(serviceNamespace)) ? null : serviceNamespace; } /** @@ -136,39 +134,42 @@ * @param servicePortName Name of the service port to use in control generation. */ public void setServicePort(String servicePortName) { - _servicePortName = servicePortName; - } - - /** - * Set the source directory to generate service control(s) from. All WSDL files - * in the directory will be processed, each one producing a service control. - * - * @param srcdir The directory to process WSDLs in. - */ - public void setSrcdir(File srcdir) { - _srcdir = srcdir; + _servicePortName = ("".equals(servicePortName)) ? null : servicePortName; } /** - * Set the source file (wsdl) to generate the service control from. - * - * @param srcfile WSDL used to generate a service control. + * Set the wsdlSrc attribute value. Value may be in a form of a URL, file or diectory. + * @param src wsdlSrc attribute value. */ - public void setSrcfile(File srcfile) { - _srcfile = srcfile; + public void setWsdlSrc(String src) { + _wsdlSrc = src; + if (!isUrl(src) && !isFile(src)) { + throw new BuildException("Invalid src attribute value, src must be a URL, file or directory."); + } } /** - * Set the source url to get the WSDL file from. - * @param urlStr + * Is the parameter a URL string? + * @param src Parameter to check. + * @return true if valid url. */ - public void setSrcUrl(String urlStr) { + private boolean isUrl(String src) { try { - _srcURL = new URL(urlStr); + _wsdlSrcURL = new URL(src); } catch (MalformedURLException e) { - throw new BuildException("Invalid srcUrl parameter!", e); } + return (_wsdlSrcURL == null) ? false : true; + } + + /** + * Is the parameter a file or directory? + * @param src Parameter to check. + * @return true if file or directory. + */ + private boolean isFile(String src) { + _wsdlSrcFile = new File(src); + return (_wsdlSrcFile.isFile() || _wsdlSrcFile.isDirectory()); } /** @@ -179,7 +180,7 @@ * @param wsdlRuntimePath The value for the WSDL path annotation. */ public void setWsdlRuntimePath(String wsdlRuntimePath) { - _wsdlRuntimePath = wsdlRuntimePath; + _wsdlRuntimePath = ("".equals(wsdlRuntimePath)) ? null : wsdlRuntimePath; } /** @@ -203,19 +204,17 @@ } try { - if (_srcURL != null) { - WebServiceControlGenerator.generateWSC(_srcURL, _destdir, _destPackageName, - _wsdlRuntimePath, _copyWsdl, serviceQName, - _servicePortName); + if (_wsdlSrcURL != null) { + WebServiceControlGenerator.generateWSC(_wsdlSrcURL, _destdir, _destPackageName, _wsdlRuntimePath, + _copyWsdl, serviceQName, _servicePortName); } - else if (_srcfile != null) { - WebServiceControlGenerator.generateJCX(_srcfile, _destdir, _destPackageName, - _wsdlRuntimePath, _copyWsdl, serviceQName, - _servicePortName); + else if (_wsdlSrcFile.isFile()) { + WebServiceControlGenerator.generateJCX(_wsdlSrcFile, _destdir, _destPackageName, _wsdlRuntimePath, + _copyWsdl, serviceQName, _servicePortName); } else { - WebServiceControlGenerator.generateJCXs(_srcdir, _destdir, _destPackageName, - _wsdlRuntimePath, _copyWsdl); + WebServiceControlGenerator.generateJCXs(_wsdlSrcFile, _destdir, _destPackageName, _wsdlRuntimePath, + _copyWsdl); } } catch (Exception e) { @@ -233,26 +232,15 @@ */ private void validateAttributeSettings() { - if (_srcfile == null && _srcdir == null && _srcURL == null) { + if (_wsdlSrc == null) { throw new BuildException("The srcFile, srcDir or srcUrl attribute must be set"); } - if (_srcfile != null && _srcdir != null) { - throw new BuildException("The srcFile and srcDir attributes are both set"); - } - - if (_srcfile != null && !_srcfile.isFile()) { - throw new BuildException("The srcFile must be a file"); - } - - if (_srcfile == null && _srcURL == null && _serviceName != null) { + if ((_wsdlSrcFile != null && _wsdlSrcFile.isDirectory()) + && (_serviceName != null && !"".equals(_serviceName))) { throw new BuildException("The serviceName attribute can only be used with the srcFile or srcUrl attributes"); } - if (_srcdir != null && !_srcdir.isDirectory()) { - throw new BuildException("The srcDir must be a directory"); - } - if (_destdir == null) { throw new BuildException("The destDir attribute must be set"); } @@ -261,7 +249,7 @@ throw new BuildException("destDir must be a directory"); } - if (_wsdlRuntimePath != null && _copyWsdl) { + if ((_wsdlRuntimePath != null && !"".equals(_wsdlRuntimePath)) && _copyWsdl) { log("Warning: 'wsdlRuntimePath' and 'copyWsdl' attributes have both been set. The generated web service control will use the value of 'wsdlRuntimePath' to locate the WSDL jasmine05@example.org."); } } Modified: beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlOpParameter.java URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlOpParameter.java?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlOpParameter.java (original) +++ beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlOpParameter.java Wed Jun 7 13:18:52 2006 @@ -200,6 +200,16 @@ </complexType> </element> + or + + <element name="foo"> + <complexType> + <sequence> + <any/> + </sequence> + </complexType> + </element> + This code is extremely brittle, this is a construct used by dot net when DataTypes are employed. The code will need to be enhanced if other samples of this construct arise. @@ -207,17 +217,25 @@ Element child; if ((child = DomUtils.getChildElementByName(element, WsdlUtils.COMPLEX_TYPE_NAME)) != null) { if ((child = DomUtils.getChildElementByName(child, WsdlUtils.SEQUENCE_TAG_NAME)) != null) { - if ((child = DomUtils.getChildElementByName(child, WsdlUtils.ELEMENT_NAME)) != null) { + Element childElement = DomUtils.getChildElementByName(child, WsdlUtils.ELEMENT_NAME); + if (childElement != null) { if (child.hasAttribute(WsdlUtils.ELEMENT_REF_ATTR)) { return wsdlTypes.getTypeQName(child.getAttribute(WsdlUtils.ELEMENT_REF_ATTR)); } else if (child.hasAttribute(WsdlUtils.ELEMENT_TYPE_ATTR)) { - return wsdlTypes.getTypeQName(child.getAttribute(WsdlUtils.ELEMENT_REF_ATTR)); + return wsdlTypes.getTypeQName(child.getAttribute(WsdlUtils.ELEMENT_TYPE_ATTR)); } } + else if ((childElement = DomUtils.getChildElementByName(child, WsdlUtils.ANY_TAG_NAME)) != null) { + return new QName(childElement.getNamespaceURI(), childElement.getLocalName()); + } } } - throw new RuntimeException("Cannot determine type of element: " + element.getNodeName()); + else { + // no children / no type map to 'any' + return new QName("", "any"); + } + throw new RuntimeException("Cannot determine type of element: " + getName()); } /** Modified: beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlUtils.java URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlUtils.java?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlUtils.java (original) +++ beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/wsdl/WsdlUtils.java Wed Jun 7 13:18:52 2006 @@ -33,6 +33,7 @@ // schema names protected static final String ELEMENT_FORM_DEFAULT_ATTR = "elementFormDefault"; + protected static final String ANY_TAG_NAME = "any"; protected static final String TARGET_NAMESPACE_ATTR = "targetNamespace"; protected static final String ELEMENT_FORM_QUALIFIED = "qualified"; protected static final String ELEMENT_NAME = "element"; Modified: beehive/trunk/system-controls/test/webservice/build.xml URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/test/webservice/build.xml?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/system-controls/test/webservice/build.xml (original) +++ beehive/trunk/system-controls/test/webservice/build.xml Wed Jun 7 13:18:52 2006 @@ -253,7 +253,7 @@ classname="org.apache.beehive.controls.system.webservice.generator.WebServiceControlGeneratorTask" classpathref="client.classpath"/> - <webservice-control-gen srcdir="${schematypes.wsdls.dir}" destdir="${client.wscgensrc}" + <webservice-control-gen wsdlsrc="${schematypes.wsdls.dir}" destdir="${client.wscgensrc}" copyWsdl="yes" destPackageName="schematypestest"/> <!-- now gen the wsc's which require type support from xmlbeans and axis --> @@ -281,7 +281,7 @@ </fileset> </xmlbeanbuild> - <webservice-control-gen srcdir="${xmlbeangen.wsdls.dir}" destdir="${client.wscgensrc}" + <webservice-control-gen wsdlsrc="${xmlbeangen.wsdls.dir}" destdir="${client.wscgensrc}" copyWsdl="yes" destPackageName="xmlbeangentest"/> </target> @@ -295,14 +295,14 @@ <axisbeanbuild wsdldir="${axisgen.wsdls.dir}" outputdir="${client.axisgen}"/> <javac srcdir="${client.axisgen}" destdir="${client.classes}" classpathref="client.classpath" debug="true"/> - <webservice-control-gen srcdir="${axisgen.wsdls.dir}" destdir="${client.wscgensrc}" + <webservice-control-gen wsdlsrc="${axisgen.wsdls.dir}" destdir="${client.wscgensrc}" copyWsdl="true" destPackageName="axisgentest"/> </target> <target name="gen.pojo.wscs" description="Build wsc's which use pre-existing java classes generation."> <javac srcdir="${types-source.dir}" destdir="${client.classes}" classpathref="client.classpath" debug="true"/> - <webservice-control-gen srcdir="${pojotypes.wsdls.dir}" destdir="${client.wscgensrc}" + <webservice-control-gen wsdlsrc="${pojotypes.wsdls.dir}" destdir="${client.wscgensrc}" copyWsdl="yes" destPackageName="pojotypetest"/> </target> Modified: beehive/trunk/system-controls/test/webservice/junit/build.xml URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/test/webservice/junit/build.xml?rev=412520&r1=412519&r2=412520&view=diff ============================================================================== --- beehive/trunk/system-controls/test/webservice/junit/build.xml (original) +++ beehive/trunk/system-controls/test/webservice/junit/build.xml Wed Jun 7 13:18:52 2006 @@ -101,37 +101,37 @@ classpathref="wscgen.classpath"/> <!-- general task tests --> - <webservice-control-gen srcdir="${wsdls.dir}" + <webservice-control-gen wsdlsrc="${wsdls.dir}" destdir="${wscgen.gensrc}"/> <!-- *** task parameter / settings tests *** --> <!-- wsdl runtime path not set --> - <webservice-control-gen srcfile="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" + <webservice-control-gen wsdlsrc="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" destdir="${wscgen.gensrc}" destPackageName="test1"/> <!-- wsdl runtime path set to location of generated control--> - <webservice-control-gen srcfile="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" + <webservice-control-gen wsdlsrc="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" destdir="${wscgen.gensrc}" copyWsdl="yes" destPackageName="test2"/> <!-- wsdl runtime path explicitly set --> - <webservice-control-gen srcfile="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" + <webservice-control-gen wsdlsrc="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" destdir="${wscgen.gensrc}" wsdlRuntimePath="/tmp" destPackageName="test3"/> <!-- wsdl runtime path explicitly set, so is copyWsdl --> - <webservice-control-gen srcfile="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" + <webservice-control-gen wsdlsrc="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" destdir="${wscgen.gensrc}" wsdlRuntimePath="/tmp/" copyWsdl="yes" destPackageName="test4"/> <!-- explictly set the service name and port name we are looking for --> - <webservice-control-gen srcfile="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" + <webservice-control-gen wsdlsrc="${wsdls.settings.dir}/TaskGeneratorTest.wsdl" destdir="${wscgen.gensrc}" copyWsdl="yes" serviceName="TestService1" From commitsjasmine05@example.org Wed Jun 07 20:27:50 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 31076 invoked from network); 7 Jun 2006 20:27:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jun 2006 20:27:50 -0000 Received: (qmail 68156 invoked by uid 500); 7 Jun 2006 20:27:50 -0000 Delivered-To: jasmine05@example.org Received: (qmail 68138 invoked by uid 500); 7 Jun 2006 20:27:50 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 68127 invoked by uid 99); 7 Jun 2006 20:27:50 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 13:27:50 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 13:27:49 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1606D1A983A; Wed, 7 Jun 2006 13:27:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412525 - /beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml Date: Wed, 07 Jun 2006 20:27:28 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cschoett Date: Wed Jun 7 13:27:28 2006 New Revision: 412525 URL: http://svn.apache.org/viewvc?rev=412525&view=rev Log: Updated doc for WSC generator task to include new 'wsdlSrc' parameter. Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml URL: http://svn.apache.org/viewvc/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml?rev=412525&r1=412524&r2=412525&view=diff ============================================================================== --- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml (original) +++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/wsc/guide.xml Wed Jun 7 13:27:28 2006 @@ -101,19 +101,9 @@ <td>Yes</td> </tr> <tr> - <td>srcDir</td> - <td>Directory containing the WSDL file(s) to generate WSC(s) from.</td> - <td>Yes*</td> - </tr> - <tr> - <td>srcFile</td> - <td>WSDL file to generate a WSC from.</td> - <td>Yes*</td> - </tr> - <tr> - <td>srcUrl</td> - <td>A URL to a WSDL to generate a WSC from.</td> - <td>Yes*</td> + <td>wsdlSrc</td> + <td>File, directory or URL containing the WSDL file(s) to generate WSC(s) from.</td> + <td>Yes</td> </tr> <tr> <td>copyWsdl</td> @@ -150,7 +140,6 @@ <td>No</td> </tr> </table> - <p>* One of srcDir, srcFile or srcUrl is required</p> <p><strong>Parameters specified as nested elements</strong></p> <p>None.</p> @@ -161,7 +150,7 @@ classname="org.apache.beehive.controls.system.webservice.generate.WebServiceControlGenerationTask" classpathref="wscgen.dependency.path"/&gt; &lt;wsc-gen - srcUrl="http://myservice.net/service?wsdl" + wsdlSrc="http://myservice.net/service?wsdl" destDir="src" copyWsdl="true" servicePort="RPCClient" From commitsjasmine05@example.org Thu Jun 08 00:42:57 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 65068 invoked from network); 8 Jun 2006 00:42:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 8 Jun 2006 00:42:56 -0000 Received: (qmail 29951 invoked by uid 500); 8 Jun 2006 00:42:54 -0000 Delivered-To: jasmine05@example.org Received: (qmail 29881 invoked by uid 500); 8 Jun 2006 00:42:53 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Delivered-To: moderator for jasmine05@example.org Received: (qmail 23899 invoked by uid 99); 8 Jun 2006 00:38:37 -0000 X-ASF-Spam-Status: No, hits=2.6 required=10.0 tests=DATE_IN_PAST_12_24,INVALID_DATE X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) From: "Rickey Jack" <jasmine05@example.org> To: <jasmine05@example.org> Subject: Plese visit us (more info inside). Date: Wen, 7 Jun 2006 11:18:37 +0200 MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook, Build 11.0.5510 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 Thread-Index: R0lcU94d5EGhki3anmp2AIlVbH2WZx1PKxDh Content-Type: text/plain; charset="Windows-1251" Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org Message-Id: <jasmine05@example.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Hello Announce International company "Eurobiz Tour Inc." is well known all over the world in international tours business. We are searching for people,who want to work in our company and reach success fast, using modern life type. Our company wants to become First place in touristic business, i hope you too. This letter is to inform you about our TODAY BEST WORK PROPOSITION in this field of market. You can become our manager and promote our company in your area. The salary is 1000 EUR-3000 EUR per week, your duties are to execute tasks from Sirenis Inc. head office.Poland ,Spain, Slovakia, Germany, France business map. Candidates: 21-60 years old, internet access every day, mobile phone, to be anxious for success. No matter you country and city, send us your mail and get a reply next day! Please send your CV, profiles according this e-mail: jasmine05@example.org -=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Clair Bowden Wen, 7 Jun 2006 11:18:37 +0200 From commitsjasmine05@example.org Thu Jun 08 23:48:43 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 847 invoked from network); 8 Jun 2006 23:48:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 8 Jun 2006 23:48:42 -0000 Received: (qmail 73179 invoked by uid 500); 8 Jun 2006 23:48:42 -0000 Delivered-To: jasmine05@example.org Received: (qmail 73153 invoked by uid 500); 8 Jun 2006 23:48:42 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 73136 invoked by uid 99); 8 Jun 2006 23:48:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 16:48:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 16:48:39 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6CCEA1A983A; Thu, 8 Jun 2006 16:48:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412884 - in /beehive/wsm/trunk: build.xml external/ pom.xml src/beehive-jsr181.pom src/beehive-wsdltypes.pom src/beehive-wsm-axis.pom src/beehive-wsm.pom test/build.xml test/tomcat-imports.xml test/webapp/build.xml wsm-imports.xml Date: Thu, 08 Jun 2006 23:48:17 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ekoneil Date: Thu Jun 8 16:48:16 2006 New Revision: 412884 URL: http://svn.apache.org/viewvc?rev=412884&view=rev Log: Fix the WSM build. This change starts to use Maven2 to download WSM dependencies / install into the local M2 repo and uses Ant for build / test. Yes, there needs to be a README.txt file attached here; that's coming. To build WSM, the workflow is now: mvn compile just coerce Maven to download dependencies -- surely there's a better way... ant clean build install clean / build sources and install the resulting JARs into the local Maven repository ant test runs the usual junit / server tests I've also added templated .pom files for each WSM JAR file that are completed with the WSM version number while installing the JARs into the Maven repository. Added: beehive/wsm/trunk/pom.xml beehive/wsm/trunk/src/beehive-jsr181.pom beehive/wsm/trunk/src/beehive-wsdltypes.pom beehive/wsm/trunk/src/beehive-wsm-axis.pom beehive/wsm/trunk/src/beehive-wsm.pom beehive/wsm/trunk/test/tomcat-imports.xml beehive/wsm/trunk/wsm-imports.xml Removed: beehive/wsm/trunk/external/ Modified: beehive/wsm/trunk/build.xml beehive/wsm/trunk/test/build.xml beehive/wsm/trunk/test/webapp/build.xml Modified: beehive/wsm/trunk/build.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=412884&r1=412883&r2=412884&view=diff ============================================================================== --- beehive/wsm/trunk/build.xml (original) +++ beehive/wsm/trunk/build.xml Thu Jun 8 16:48:16 2006 @@ -17,10 +17,16 @@ $Header:$ --> -<project name="Beehive/Metadata for Web Services" default="usage" basedir="."> - <import file="../beehive-imports.xml"/> - <import file="../ant/${webservice.runtime}-import.xml"/> +<project name="Beehive/WSM" default="usage" basedir="."> + + <import file="wsm-imports.xml"/> + + <property name="wsm.groupid" value="org.apache.beehive"/> + <property name="wsm.version" value="1.0-SNAPSHOT"/> + <property name="build.m2.dir" location="build/maven2/org/apache/beehive"/> + + <property name="debug" value="true"/> <property name="build.dir" location="build"/> <property name="classes.dir" location="${build.dir}/classes"/> @@ -47,77 +53,56 @@ <property name="webservice-utils-xmlbeans.classes" location="${classes.dir}/webservice-utils-xmlbeans"/> <property name="wsdl.schema.dir" location="src/schema-wsdl"/> - <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/> + <property name="wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/> <property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar"/> <property name="wsm-axis.jar" location="${jars.dir}/beehive-wsm-axis.jar"/> <property name="jsr181.jar" location="${build.dir}/jars/beehive-jsr181.jar"/> <path id="core.classpath"> - <path refid="velocity.dependency.path"/> + <fileset refid="axis-wsdl4j.fileset"/> + <fileset refid="axis-jaxrpc.fileset"/> + + <path refid="controls.dependency.path"/> <path refid="commons-logging.dependency.path"/> - <path refid="commons-codec.dependency.path"/> - <path refid="commons-discovery.dependency.path"/> <path refid="servlet.dependency.path"/> - <path refid="ant-jar.dependency.path"/> <path refid="xbean.dependency.path"/> - <path refid="tools.dependency.path"/> - <pathelement location="${api.classes}"/> <pathelement location="${jars.dir}/beehive-wsdltypes.jar"/> - <pathelement location="${jsr181.jar}"/> + <pathelement location="${api.classes}"/> <pathelement location="${core.classes}"/> <pathelement location="${webservice-utils-core.classes}"/> - <pathelement location="external/axis-1.3/jaxrpc.jar"/> - <pathelement location="external/axis-1.3/wsdl4j-1.5.1.jar"/> </path> <path id="axis.classpath"> + <path refid="core.classpath"/> <path refid="controls.dependency.path"/> + <path refid="axis.dependency.path"/> - <path refid="core.classpath"/> - <path refid="webservice.classpath"/> <pathelement location="${core.classes}"/> <pathelement location="${webservice-utils-axis.classes}"/> <pathelement location="${webservice-utils-xmlbeans.classes}"/> </path> - <!-- ==================================================================== --> - <!-- Creates the output directories of the build. --> - <!-- ==================================================================== --> - <target name="dirs"> - <mkdir dir="${api.classes}"/> - <mkdir dir="${core.classes}"/> - <mkdir dir="${axis.classes}"/> - <mkdir dir="${webservice-utils-core.classes}"/> - <mkdir dir="${webservice-utils-axis.classes}"/> - <mkdir dir="${webservice-utils-xmlbeans.classes}"/> - <mkdir dir="${jars.dir}"/> - <mkdir dir="${docs.dir}"/> - </target> - - <!-- ==================================================================== --> - <!-- clean --> - <!-- ==================================================================== --> <target name="clean" description="Clean the WSM API and runtime"> <delete dir="${build.dir}"/> - <delete dir="${temp.wsdl.classes.dir}"/> + <ant dir="test" target="clean" inheritAll="false"/> </target> - <!-- ==================================================================== --> - <!-- build_all. build this project and all inter-project dependencies --> - <!-- ==================================================================== --> <target name="build" description="Build the WSM API and runtime"> - <antcall target="dirs"/> + <mkdir dir="${classes.dir}"/> + <mkdir dir="${jars.dir}"/> <echo message="--------------------------------------------------"/> <echo message="| WSM WSDL types build starting |"/> <echo message="--------------------------------------------------"/> - <build-xbean schemaDir="${wsdl.schema.dir}" classgenDir="${temp.wsdl.classes.dir}"/> + <mkdir dir="${wsdl.classes.dir}"/> + <build-schemas srcdir="${wsdl.schema.dir}" destdir="${wsdl.classes.dir}"/> + <jar jarfile="${jars.dir}/beehive-wsdltypes.jar"> - <fileset dir="${temp.wsdl.classes.dir}"/> + <fileset dir="${wsdl.classes.dir}"/> <manifest> <attribute name="Extension-Name" value="Beehive WSM WSDL Types"/> <attribute name="Specification-Title" value="Beehive WSM WSDL Types"/> @@ -138,7 +123,8 @@ <echo message="| JSR 181 API build starting |"/> <echo message="--------------------------------------------------"/> - <javac destdir="${api.classes}" debug="on"> + <mkdir dir="${api.classes}"/> + <javac destdir="${api.classes}" debug="${debug}"> <src path="${api.dir}"/> </javac> @@ -164,11 +150,13 @@ <echo message="| WSM Core build starting |"/> <echo message="--------------------------------------------------"/> - <javac destdir="${webservice-utils-core.classes}" classpathref="core.classpath" debug="on"> + <mkdir dir="${webservice-utils-core.classes}"/> + <javac destdir="${webservice-utils-core.classes}" classpathref="core.classpath" debug="${debug}"> <src path="${webservice-utils-core.dir}"/> </javac> - <javac destdir="${core.classes}" classpathref="core.classpath" debug="on"> + <mkdir dir="${core.classes}"/> + <javac destdir="${core.classes}" classpathref="core.classpath" debug="${debug}"> <src path="${core.dir}"/> </javac> @@ -197,17 +185,20 @@ <echo message="--------------------------------------------------"/> <echo message="--------------------------------------------------"/> - <echo message="| WSM AXIS build starting |"/> + <echo message="| WSM-Axis build starting |"/> <echo message="--------------------------------------------------"/> + <mkdir dir="${webservice-utils-xmlbeans.classes}"/> <javac destdir="${webservice-utils-xmlbeans.classes}" classpathref="axis.classpath" debug="on"> <src path="${webservice-utils-xmlbeans.dir}"/> </javac> + <mkdir dir="${webservice-utils-axis.classes}"/> <javac destdir="${webservice-utils-axis.classes}" classpathref="axis.classpath" debug="on"> <src path="${webservice-utils-axis.dir}"/> </javac> + <mkdir dir="${axis.classes}"/> <javac destdir="${axis.classes}" classpathref="axis.classpath" debug="on"> <src path="${axis.dir}"/> </javac> @@ -232,12 +223,87 @@ </manifest> </jar> <echo message="--------------------------------------------------"/> - <echo message="| WSM AXIS build ending |"/> + <echo message="| WSM-Axis build ending |"/> <echo message="--------------------------------------------------"/> </target> - <target name="deploy" depends="build" description="Deploy WSM"/> - + <target name="install" description="Install the JARs in a local Maven repository"> + <antcall target="m2.stage"/> + <antcall target="m2.install"/> + </target> + + <target name="m2.stage"> + <mkdir dir="${build.m2.dir}"/> + + <!-- jsr181 --> + <copy todir="${build.m2.dir}/beehive-jsr181/${wsm.version}"> + <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/> + <fileset dir="build/jars"> + <include name="beehive-jsr181.jar"/> + </fileset> + </copy> + <filter token="wsm.version" value="${wsm.version}"/> + <copy todir="${build.m2.dir}/beehive-jsr181/${wsm.version}" filtering="true"> + <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/> + <fileset dir="src" includes="beehive-jsr181.pom"/> + </copy> + <jar destfile="${build.m2.dir}/beehive-jsr181/${wsm.version}/beehive-jsr181-${wsm.version}-sources.jar"> + <fileset dir="src/api"/> + </jar> + + <!-- wsm core --> + <copy todir="${build.m2.dir}/beehive-wsm/${wsm.version}"> + <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/> + <fileset dir="build/jars"> + <include name="beehive-wsm.jar"/> + </fileset> + </copy> + <filter token="wsm.version" value="${wsm.version}"/> + <copy todir="${build.m2.dir}/beehive-wsm/${wsm.version}" filtering="true"> + <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/> + <fileset dir="src" includes="beehive-wsm.pom"/> + </copy> + <jar destfile="${build.m2.dir}/beehive-wsm/${wsm.version}/beehive-wsm-${wsm.version}-sources.jar"> + <fileset dir="src/core"/> + </jar> + + <!-- wsm axis --> + <copy todir="${build.m2.dir}/beehive-wsm-axis/${wsm.version}"> + <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/> + <fileset dir="build/jars"> + <include name="beehive-wsm-axis.jar"/> + </fileset> + </copy> + <filter token="wsm.version" value="${wsm.version}"/> + <copy todir="${build.m2.dir}/beehive-wsm-axis/${wsm.version}" filtering="true"> + <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/> + <fileset dir="src" includes="beehive-wsm-axis.pom"/> + </copy> + <jar destfile="${build.m2.dir}/beehive-wsm-axis/${wsm.version}/beehive-wsm-axis-${wsm.version}-sources.jar"> + <fileset dir="src/axis"/> + </jar> + + <!-- wsm wsdltypes --> + <copy todir="${build.m2.dir}/beehive-wsdltypes/${wsm.version}"> + <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/> + <fileset dir="build/jars"> + <include name="beehive-wsdltypes.jar"/> + </fileset> + </copy> + <filter token="wsm.version" value="${wsm.version}"/> + <copy todir="${build.m2.dir}/beehive-wsdltypes/${wsm.version}" filtering="true"> + <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/> + <fileset dir="src" includes="beehive-wsdltypes.pom"/> + </copy> + </target> + + <target name="m2.install"> + <m2-install-jar resource="beehive-wsm"/> + <m2-install-jar resource="beehive-wsdltypes"/> + <m2-install-jar resource="beehive-jsr181"/> + <m2-install-jar resource="beehive-wsm-axis"/> + </target> + <!-- ==================================================================== --> <!-- deploy.webservice.runtime --> <!-- ==================================================================== --> @@ -270,8 +336,8 @@ <target name="docs" description="Generate the WSM API documentation"> <javadoc destdir="${docs.dir}/apidocs/classref_wsm" maxmemory="256M" - windowtitle="Apache Beehive Web Service Metadata API Documentation (Version ${beehive.version})" - doctitle="Apache Beehive Web Service Metadata API Documentation (Version ${beehive.version})" + windowtitle="Apache Beehive Web Service Metadata API Documentation (Version ${wsm.version})" + doctitle="Apache Beehive Web Service Metadata API Documentation (Version ${wsm.version})" version="true" author="false" use="true" @@ -287,12 +353,39 @@ <!-- ==================================================================== --> <!-- Run the WSM tests --> <!-- ==================================================================== --> - <target name="drt" description="Run the WSM DRTs"> - <ant dir="test" target="drt" inheritAll="false"/> + <target name="test" description="Run the WSM tests"> + <ant dir="test" target="test" inheritAll="false"/> </target> - <target name="bvt" description="Run the WSM BVTs"> - <ant dir="test" target="bvt" inheritAll="false"/> - </target> + <macrodef name="build-schemas"> + <attribute name="srcdir" description="The directory containing XML Schemas or XMLBeans xsdconfig files to build"/> + <attribute name="destdir" description="The directory to use for files generated during an XSD build"/> + <sequential> + <taskdef name="xmlbeanbuild" + classname="org.apache.xmlbeans.impl.tool.XMLBean" + classpathref="xbean.dependency.path"/> + + <xmlbeanbuild classpathref="xbean.dependency.path" + schema="@{srcdir}" + classgendir="@{destdir}" + failonerror="true"/> + </sequential> + </macrodef> + + <macrodef name="m2-install-jar" description="Install a resource in a Maven 2 repository"> + <attribute name="resource"/> + <sequential> + <condition property="_cmd" value="mvn.bat"> + <os family="windows"/> + </condition> + <condition property="_cmd" value="mvn"> + <not><os family="windows"/></not> + </condition> + + <exec executable="${_cmd}" failonerror="true"> + <arg line="install:install-file -Dfile=${build.m2.dir}/@{resource}/${wsm.version}/@{resource}-${wsm.version}.jar -DgroupId=${wsm.groupid} -DartifactId=@{resource} -Dversion=${wsm.version} -Dpackaging=jar"/> + </exec> + </sequential> + </macrodef> </project> Added: beehive/wsm/trunk/pom.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/pom.xml?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/pom.xml (added) +++ beehive/wsm/trunk/pom.xml Thu Jun 8 16:48:16 2006 @@ -0,0 +1,91 @@ +<?xml version="1.0"?> + +<!-- + Copyright 2004-2005 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + $Header:$ + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsm</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>Beehive Web Service Metadata</name> + <url>http://beehive.apache.org</url> + <dependencies> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-controls</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerId>apt</compilerId> + <source>1.5</source> + <target>1.5</target> + <fork>true</fork> + <verbose>true</verbose> + <compilerArguments> + <sourcepath>src/main/java;src/test/java</sourcepath> + <s>target/srcgen</s> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: beehive/wsm/trunk/src/beehive-jsr181.pom URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-jsr181.pom?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/src/beehive-jsr181.pom (added) +++ beehive/wsm/trunk/src/beehive-jsr181.pom Thu Jun 8 16:48:16 2006 @@ -0,0 +1,11 @@ +<?xml version="1.0"?> + +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-jsr181</artifactId> + <name>beehive-jsr181</name> + <version>@wsm.version@</version> + <dependencies> + </dependencies> +</project> \ No newline at end of file Added: beehive/wsm/trunk/src/beehive-wsdltypes.pom URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsdltypes.pom?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/src/beehive-wsdltypes.pom (added) +++ beehive/wsm/trunk/src/beehive-wsdltypes.pom Thu Jun 8 16:48:16 2006 @@ -0,0 +1,21 @@ +<?xml version="1.0"?> + +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsdltypes</artifactId> + <name>beehive-wsdltypes</name> + <version>@wsm.version@</version> + <dependencies> + <dependency> + <groupId>xmlbeans</groupId> + <artifactId>xmlpublic</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>xmlbeans</groupId> + <artifactId>xmlbeans-jsr173-api</artifactId> + <version>2.0-dev</version> + </dependency> + </dependencies> +</project> Added: beehive/wsm/trunk/src/beehive-wsm-axis.pom URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsm-axis.pom?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/src/beehive-wsm-axis.pom (added) +++ beehive/wsm/trunk/src/beehive-wsm-axis.pom Thu Jun 8 16:48:16 2006 @@ -0,0 +1,31 @@ +<?xml version="1.0"?> + +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsm-axis</artifactId> + <name>beehive-wsm-axis</name> + <version>@wsm.version@</version> + <dependencies> + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsm</artifactId> + <version>@wsm.version@</version> + </dependency> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-jsr181</artifactId> + <version>@wsm.version@</version> + </dependency> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsdltypes</artifactId> + <version>@wsm.version@</version> + </dependency> + </dependencies> +</project> Added: beehive/wsm/trunk/src/beehive-wsm.pom URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsm.pom?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/src/beehive-wsm.pom (added) +++ beehive/wsm/trunk/src/beehive-wsm.pom Thu Jun 8 16:48:16 2006 @@ -0,0 +1,26 @@ +<?xml version="1.0"?> + +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsdltypes</artifactId> + <name>beehive-wsdltypes</name> + <version>@wsm.version@</version> + <dependencies> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-jsr181</artifactId> + <version>@wsm.version@</version> + </dependency> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsdltypes</artifactId> + <version>@wsm.version@</version> + </dependency> + <dependency> + <groupId>org.apache.beehive</groupId> + <artifactId>beehive-wsdltypes</artifactId> + <version>@wsm.version@</version> + </dependency> + </dependencies> +</project> Modified: beehive/wsm/trunk/test/build.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/test/build.xml?rev=412884&r1=412883&r2=412884&view=diff ============================================================================== --- beehive/wsm/trunk/test/build.xml (original) +++ beehive/wsm/trunk/test/build.xml Thu Jun 8 16:48:16 2006 @@ -15,15 +15,14 @@ limitations under the License. --> -<project name="Beehive/WSM/DRT" default="drt" basedir="."> +<project name="Beehive/WSM/Test" default="test" basedir="."> - <import file="../../beehive-imports.xml"/> - <import file="../../ant/beehive-tools.xml"/> - <import file="../ant/beehive-wsm-tools.xml"/> + <import file="../wsm-imports.xml"/> + <import file="tomcat-imports.xml"/> - <property name="drt.root" location="${basedir}"/> + <property name="test.root" location="${basedir}"/> <property name="build.dir" location="build"/> - <property name="drt.logs" location="${build.dir}/logs"/> + <property name="test.logs" location="${build.dir}/logs"/> <property name="junit.src" location="src/junit"/> <property name="junit-services.src" location="src/junit-services"/> @@ -41,60 +40,50 @@ <property name="webapp.dir" location="webapp/build"/> <property name="axis.lib.dir" location="../external/axis-1.3"/> - <property name="drt.wsdl.file" location="${junit.src}/org/apache/beehive/wsm/test/jsr181/wsdl/web/wsdl2javatest.wsdl"/> + <property name="test.wsdl.file" location="${junit.src}/org/apache/beehive/wsm/test/jsr181/wsdl/web/wsdl2javatest.wsdl"/> <property name="server.root.url" value="http://localhost:8080"/> <property name="webapp.name" value="wsmWeb"/> <property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/> - <path id="drt.classpath"> + <path id="test.classpath"> <path refid="velocity.dependency.path"/> <path refid="xbean.dependency.path"/> <path refid="junit.dependency.path"/> - <path refid="tools.dependency.path"/> <path refid="servlet.dependency.path"/> <path refid="commons-codec.dependency.path"/> <path refid="commons-discovery.dependency.path"/> <path refid="commons-logging.dependency.path"/> <path refid="controls.dependency.path"/> <path refid="log4j.dependency.path"/> + <pathelement location="../build/jars/beehive-jsr181.jar"/> <pathelement location="../build/jars/beehive-wsdltypes.jar"/> <pathelement location="../build/jars/beehive-wsm.jar"/> <pathelement location="../build/jars/beehive-wsm-axis.jar"/> - <fileset dir="${axis.lib.dir}" includes="*.jar"/> - <pathelement location="${webapp.dir}/WEB-INF/classes"/> - </path> - <target name="usage"> - <echo message=""/> - <echo message=""/> - <echo message="================================================================"/> - <echo message="| Usage |"/> - <echo message="================================================================"/> - <echo message="----------------------------------------------------------------"/> - <echo message="| Standard Targets |"/> - <echo message="----------------------------------------------------------------"/> - <echo message="build - Build all classes needed for running the tests."/> - <echo message="clean - Delete all classes needed for running the tests."/> - <echo message="drt - Run 'build', 'run.drt'."/> - <echo message="----------------------------------------------------------------"/> - </target> + <fileset refid="axis.fileset"/> + <fileset refid="axis-wsdl4j.fileset"/> + <fileset refid="axis-jaxrpc.fileset"/> + <fileset refid="axis-saaj.fileset"/> - <target name="bvt" depends="drt"/> + <pathelement location="${webapp.dir}/WEB-INF/classes"/> + </path> - <target name="drt"> + <target name="test"> <echo message="--------------------------------------------------"/> - <echo message="| WSM DRT starting |"/> + <echo message="| WSM test starting |"/> <echo message="--------------------------------------------------"/> <antcall target="clean"/> + <antcall target="build.junit"/> - <antcall target="drt.junit"/> + <antcall target="test.junit"/> + <antcall target="build.webapp"/> <antcall target="build.webapp.client"/> - <antcall target="drt.server"/> + <antcall target="test.server"/> <echo message="--------------------------------------------------"/> - <echo message="| WSM DRT ending |"/> + <echo message="| WSM test ending |"/> <echo message="--------------------------------------------------"/> </target> @@ -112,29 +101,44 @@ <mkdir dir="${build.gen-tests}"/> <mkdir dir="${junit.classes}"/> <mkdir dir="${webapp.dir}/WEB-INF/temp"/> - <mkdir dir="${drt.logs}"/> + <mkdir dir="${test.logs}"/> </target> <target name="build.junit-services" description="Build the standalone web services"> - <build-schemas srcdir="src/schemas" destdir="${junit.classes}"/> - - <build-webservices srcdir="${junit-services.src}" - destdir="${junit.classes}" - tempdir="${build.gen-src-apt}" - classpathref="drt.classpath"/> + <taskdef name="xmlbeanbuild" + classname="org.apache.xmlbeans.impl.tool.XMLBean" + classpathref="xbean.dependency.path"/> + + <xmlbeanbuild classpathref="xbean.dependency.path" + schema="src/schemas" + classgendir="${junit.classes}" + failonerror="true"/> + + <taskdef name="apt" + classname="org.apache.beehive.controls.runtime.generator.AptTask" + classpathref="test.classpath" + onerror="fail"/> + + <apt srcdir="${junit-services.src}" + destdir="${junit.classes}" + gendir="${build.gen-src-apt}" + classpathref="test.classpath" + compileByExtension="true" + debug="true" + nocompile="false"/> </target> <target name="build.junit" description="Build the standalone tests"> <mkdir dir="${junit.classes}"/> - <property name="cp" refid="drt.classpath"/> + <property name="cp" refid="test.classpath"/> <echo>cp: ${cp}</echo> <antcall target="build.junit-services"/> <javac srcdir="${junit.src}" destdir="${junit.classes}" - classpathref="drt.classpath" + classpathref="test.classpath" debug="on" optimize="on" verbose="false" @@ -150,37 +154,45 @@ <target name="run.wsdl2java" description="Generates a Java class from a wsdl."> <taskdef name="wsdl2AJava" classname="org.apache.beehive.wsm.tools.wsdl2ajava.WSDL2AJavaTask" - classpathref="drt.classpath"/> + classpathref="test.classpath"/> - <wsdl2AJava outputdir="${build.gen-src-wsdl}" wsdlfile="${drt.wsdl.file}"> + <wsdl2AJava outputdir="${build.gen-src-wsdl}" wsdlfile="${test.wsdl.file}"> <classpath> - <path refid="drt.classpath"/> + <path refid="test.classpath"/> </classpath> </wsdl2AJava> - <build-webservices srcdir="${build.gen-src-wsdl}" - destdir="${build.gen-tests}" - tempdir="${build.gen-src-apt}" - classpathref="drt.classpath"/> + <taskdef name="apt" + classname="org.apache.beehive.controls.runtime.generator.AptTask" + classpathref="test.classpath" + onerror="fail"/> + + <apt srcdir="${build.gen-src-wsdl}" + destdir="${build.gen-tests}" + gendir="${build.gen-src-apt}" + classpathref="test.classpath" + compileByExtension="true" + debug="true" + nocompile="false"/> </target> - <target name="drt.junit" description="Run the standalone tests"> - <mkdir dir="${drt.logs}"/> + <target name="test.junit" description="Run the standalone tests"> + <mkdir dir="${test.logs}"/> <mkdir dir="${build.gen-src-wsdl}"/> <mkdir dir="${build.gen-tests}"/> <antcall target="run.wsdl2java"/> - <junit failureproperty="wsmjunitdrtfailed" printsummary="on" tempdir="${build.dir}" fork="yes"> + <junit failureproperty="wsmjunittestfailed" printsummary="on" tempdir="${build.dir}" fork="yes"> <!-- due to some configuration problems, asserts can't be enabled yet... --> <!-- <jvmarg value="-ea:org.apache.beehive.wsm..."/> --> <formatter type="plain"/> <classpath> - <path refid="drt.classpath"/> + <path refid="test.classpath"/> <pathelement location="${junit.classes}"/> <pathelement location="${build.gen-tests}"/> </classpath> - <batchtest filtertrace="off" todir="${drt.logs}"> + <batchtest filtertrace="off" todir="${test.logs}"> <fileset dir="src/junit"> <include name="**/*Test.java"/> <exclude name="**/Abstract*Test.java"/> @@ -188,41 +200,41 @@ </batchtest> </junit> - <fail if="wsmjunitdrtfailed" message="The WSM Tests failed"/> + <fail if="wsmjunittestfailed" message="The WSM Tests failed"/> </target> - <target name="drt.server" description="Run the server tests"> + <target name="test.server" description="Run the server tests"> <parallel> - <start-server shmem="false" javaOptions="-ea:org.apache.beehive.wsm..."/> + <antcall target="server-start"/> <sequential> <antcall target="ensure.deployed"/> - <echo message="JUnit logs in: ${drt.logs}"/> + <echo message="JUnit logs in: ${test.logs}"/> <!-- execute JUnit tests --> <antcall target="junit.server"/> <antcall target="undeploy"/> <echo message="stopping Web container"/> - <stop-server /> + <antcall target="server-stop"/> </sequential> </parallel> - <fail if="wsmserverdrtfailed" message="The WSM Tests failed"/> + <fail if="wsmservertestfailed" message="The WSM Tests failed"/> </target> <target name="junit.server" description="Execute the JUnit tests against a running server"> - <mkdir dir="${drt.logs}"/> + <mkdir dir="${test.logs}"/> - <junit failureproperty="wsmserverdrtfailed" printsummary="on" tempdir="${build.dir}" fork="yes"> + <junit failureproperty="wsmservertestfailed" printsummary="on" tempdir="${build.dir}" fork="yes"> <jvmarg value="-ea:org.apache.beehive.wsm..."/> <sysproperty key="wsm.test.url" value="${webapp.waitfor.url}"/> <formatter type="plain"/> <classpath> - <path refid="drt.classpath"/> + <path refid="test.classpath"/> <pathelement location="${junit-server.classes}"/> <pathelement location="${build.gen-tests}"/> <pathelement location="${webapp.dir}/WEB-INF/classes"/> </classpath> - <batchtest filtertrace="off" todir="${drt.logs}"> + <batchtest filtertrace="off" todir="${test.logs}"> <fileset dir="${junit-server.src}"> <include name="**/*Test.java"/> </fileset> @@ -235,7 +247,7 @@ <javac srcdir="${junit-server.src}" destdir="${junit-server.classes}" - classpathref="drt.classpath" + classpathref="test.classpath" debug="on" optimize="on" verbose="false" @@ -256,15 +268,22 @@ <!-- --> <!-- ================================================================ --> <target name="deploy" description="Deploy webapp"> - <deploy-webapp webappDir="${webapp.dir}" contextPath="${webapp.name}"/> + <ant antfile="tomcat-imports.xml" target="deploy" inheritAll="false"> + <property name="webapp.dir" location="${webapp.dir}"/> + <property name="context.path" value="${webapp.name}"/> + </ant> </target> <target name="undeploy" description="Undeploy webapp"> - <undeploy-webapp contextPath="${webapp.name}"/> + <ant antfile="tomcat-imports.xml" target="undeploy" inheritAll="false"> + <property name="context.path" value="${webapp.name}"/> + </ant> </target> <target name="redeploy" description="Redeploy webapp"> - <redeploy-webapp contextPath="${webapp.name}"/> + <ant antfile="tomcat-imports.xml" target="redeploy" inheritAll="false"> + <property name="context.path" value="${webapp.name}"/> + </ant> </target> <!-- ================================================================ --> @@ -272,12 +291,14 @@ <!-- Targets for starting / stopping a server --> <!-- --> <!-- ================================================================ --> - <target name="start" description="Start server with asserts enabled for org.apache.beehive"> - <start-server shmem="false" javaOptions="-ea:org.apache.beehive..."/> + <target name="server-start" description="Start server with asserts enabled for org.apache.beehive"> + <ant antfile="tomcat-imports.xml" target="start.with.shmem" inheritAll="false"> + <property name="java.options" value="-ea:org.apache.beehive..."/> + </ant> </target> - <target name="stop" description="Stop server"> - <stop-server/> + <target name="server-stop" description="Stop server"> + <ant antfile="tomcat-imports.xml" target="stop" inheritAll="false"/> </target> <target name="ensure.deployed" description="Deploy webapp for the test recorder"> @@ -316,4 +337,19 @@ </waitfor> </target> + <target name="usage"> + <echo message=""/> + <echo message=""/> + <echo message="================================================================"/> + <echo message="| Usage |"/> + <echo message="================================================================"/> + <echo message="----------------------------------------------------------------"/> + <echo message="| Standard Targets |"/> + <echo message="----------------------------------------------------------------"/> + <echo message="build - Build all classes needed for running the tests."/> + <echo message="clean - Delete all classes needed for running the tests."/> + <echo message="test - Run 'build', 'run.test'."/> + <echo message="----------------------------------------------------------------"/> + </target> + </project> Added: beehive/wsm/trunk/test/tomcat-imports.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/test/tomcat-imports.xml?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/test/tomcat-imports.xml (added) +++ beehive/wsm/trunk/test/tomcat-imports.xml Thu Jun 8 16:48:16 2006 @@ -0,0 +1,123 @@ +<?xml version="1.0"?> + +<project name="Beehive/SVN/TomcatImports" default="usage" basedir="."> + + <property environment="os"/> + <property name="tomcat.home" location="${os.CATALINA_HOME}"/> + + <!-- Properties used to run Tomcat --> + <!-- + In the long run, there probably needs to be a tomcat.properties file that is imported here + which defines the username / password / port number so that they can be overridden + in a user's environment + --> + <property name="catalina.username" value="manager"/> + <property name="catalina.password" value="manager"/> + <property name="catalina-ant.jar" location="${tomcat.home}/server/lib/catalina-ant.jar"/> + + <path id="appserver.build.classpath"> + <fileset dir="${tomcat.home}/common/lib"> + <include name="*.jar"/> + </fileset> + </path> + + <target name="deploy" description="Deploy a webapp to a running Tomcat server"> + <fail unless="context.path" message="Can't deploy webapp; the value ${context.path} was unspecified"/> + <fail unless="webapp.dir" message="Can't deploy webapp; the value ${webapp.dir} was unspecified"/> + + <available property="webapp.available" file="${webapp.dir}" type="dir"/> + <fail unless="webapp.available" message="The webapp at ${webapp.dir} does not exist."/> + + <property name="_url" value="file://${webapp.dir}"/> + <echo>deploy webapp from ${_url} with context path ${context.path}</echo> + + <taskdef name="tomcatdeploy" classname="org.apache.catalina.ant.DeployTask" classpath="${catalina-ant.jar}"/> + <tomcatdeploy path="/${context.path}" localWar="${_url}" username="${catalina.username}" password="${catalina.password}"/> + <!-- The Tomcat deploy task doesn't necessarily finish deploying the app when the task completes. Sleep for a few... --> + <sleep seconds="5"/> + </target> + + <target name="undeploy" description="Undeploy a webapp running on a Tomcat server"> + <fail unless="context.path" message="Can't undeploy webapp; the value ${context.path} was unspecified"/> + + <taskdef name="tomcatundeploy" classname="org.apache.catalina.ant.UndeployTask" classpath="${catalina-ant.jar}"/> + <tomcatundeploy path="/${context.path}" username="${catalina.username}" password="${catalina.password}"/> + </target> + + <target name="redeploy" description="Redeploy a webapp already running on a Tomcat server"> + <fail unless="context.path" message="Can't undeploy webapp; the value ${context.path} was unspecified"/> + + <taskdef name="tomcatreload" classname="org.apache.catalina.ant.ReloadTask" classpath="${catalina-ant.jar}"/> + <tomcatreload path="/${context.path}" username="${catalina.username}" password="${catalina.password}"/> + <!-- The Tomcat deploy task doesn't necessarily finish deploying the app when the task completes. Sleep for a few... --> + <sleep seconds="5"/> + </target> + + <target name="start" description="Start a Tomcat instance."> + + <condition property="cmdline.options" value=""> + <not><isset property="cmdline.options"/></not> + </condition> + + <condition property="java.options" value=""> + <not><isset property="java.options"/></not> + </condition> + + <echo>startup.dir: ${tomcat.home}/bin</echo> + <echo>cmdline.options: ${cmdline.options}</echo> + <echo>java.options: ${java.options}</echo> + + <echo>Start Tomcat</echo> + <exec os="Windows 2000,Windows 2003,Windows XP" dir="${tomcat.home}\bin" executable="cmd.exe"> + <env key="JAVA_OPTS" value="${java.options}"/> + <arg line="/c startup.bat ${cmdline.options}"/> + </exec> + <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin" executable="sh"> + <env key="JAVA_OPTS" value="${java.options}"/> + <arg line="startup.sh ${cmdline.options}"/> + </exec> + </target> + + <target name="start.with.shmem" description="Start a Tomcat instance with shared memory debugging."> + + <condition property="cmdline.options" value=""> + <not><isset property="cmdline.options"/></not> + </condition> + + <condition property="java.options" value=""> + <not><isset property="java.options"/></not> + </condition> + + <echo>startup.dir: ${tomcat.home}/bin</echo> + <echo>cmdline.options: ${cmdline.options}</echo> + <echo>java.options: ${java.options}</echo> + + <echo>Start Tomcat</echo> + <exec os="Windows 2000,Windows 2003,Windows XP" dir="${tomcat.home}\bin" executable="cmd.exe"> + <env key="JAVA_OPTS" value="${java.options}"/> + <arg line="/c catalina.bat jpda start ${cmdline.options}"/> + </exec> + <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin" executable="sh"> + <env key="JAVA_OPTS" value="${java.options}"/> + <arg line="startup.sh jpda start ${cmdline.options}"/> + </exec> + </target> + + <target name="stop" description="Stop the NetUI server"> + <echo>Stop Tomcat in: ${tomcat.home}</echo> + <exec os="Windows 2000,Windows 2003,Windows XP" dir="${tomcat.home}\bin" executable="cmd.exe"> + <arg line=" /c shutdown"/> + </exec> + + <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin" executable="sh"> + <arg line="shutdown.sh"/> + </exec> + </target> + + <target name="usage" description="Print the usage for this build.xml"> + <java fork="no" classname="org.apache.tools.ant.Main"> + <arg line="-f ${ant.file} -projecthelp"/> + </java> + </target> + +</project> Modified: beehive/wsm/trunk/test/webapp/build.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/test/webapp/build.xml?rev=412884&r1=412883&r2=412884&view=diff ============================================================================== --- beehive/wsm/trunk/test/webapp/build.xml (original) +++ beehive/wsm/trunk/test/webapp/build.xml Thu Jun 8 16:48:16 2006 @@ -1,4 +1,5 @@ <?xml version="1.0" ?> + <!-- Copyright 2004-2005 The Apache Software Foundation. @@ -17,9 +18,7 @@ <project name="Beehive/WSM/Test/Webapp" default="build" basedir="."> - <import file="../../../beehive-imports.xml"/> - <import file="../../../ant/beehive-tools.xml"/> - <import file="../../ant/beehive-wsm-tools.xml"/> + <import file="../../wsm-imports.xml"/> <property name="schemas.dir" location="schemas"/> <property name="src.dir" location="src"/> @@ -35,33 +34,56 @@ <fileset dir="${web.dir}"/> </copy> - <deploy-controls destDir="${build.dir}/WEB-INF/lib"/> - <deploy-wsm webappDir="${build.dir}"/> + <copy todir="${build.dir}/WEB-INF/lib"> + <fileset refid="controls.fileset"/> + <fileset refid="velocity.fileset"/> + <fileset refid="commons-logging.fileset"/> + <fileset refid="commons-discovery.fileset"/> + + <fileset refid="xbean.fileset"/> + <fileset refid="jsr173.fileset"/> + + <fileset refid="axis.fileset"/> + <fileset refid="axis-jaxrpc.fileset"/> + <fileset refid="axis-saaj.fileset"/> + <fileset refid="axis-wsdl4j.fileset"/> + + <fileset refid="wsm-core.fileset"/> + <fileset refid="wsm-axis.fileset"/> + <fileset refid="wsm-wsdltypes.fileset"/> + <fileset refid="wsm-jsr181.fileset"/> + </copy> - <path id="drt.classpath"> + <path id="build.classpath"> <pathelement location="${build.dir}/WEB-INF/classes"/> <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/> </path> - <build-xbean classgenDir="${classes.dir}" - schemaDir="${schemas.dir}"/> - - <echo>Build Controls</echo> - <build-controls srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="drt.classpath" - tempdir="${build.dir}/WEB-INF/.tmpbeansrc"/> - - <echo>Build Web Services</echo> - <build-webservices srcdir="${src.dir}" - destdir="${classes.dir}" - tempdir="${build.dir}/WEB-INF/.tmpbeansrc" - classpathref="drt.classpath"/> + <taskdef name="xmlbeanbuild" + classname="org.apache.xmlbeans.impl.tool.XMLBean" + classpathref="xbean.dependency.path"/> + + <xmlbeanbuild classpathref="xbean.dependency.path" + schema="${schemas.dir}" + classgendir="${classes.dir}" + failonerror="true"/> + + <taskdef name="apt" + classname="org.apache.beehive.controls.runtime.generator.AptTask" + classpathref="build.classpath" + onerror="fail"/> + + <apt srcdir="${src.dir}" + destdir="${classes.dir}" + gendir="${build.dir}/WEB-INF/.tmpbeansrc" + classpathref="build.classpath" + srcExtensions="*.java" + debug="true" + nocompile="false"/> <copy todir="${build.dir}/WEB-INF/classes"> <fileset dir="${src.dir}" includes="*.xml"/> </copy> - </target> <target name="clean"> Added: beehive/wsm/trunk/wsm-imports.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=412884&view=auto ============================================================================== --- beehive/wsm/trunk/wsm-imports.xml (added) +++ beehive/wsm/trunk/wsm-imports.xml Thu Jun 8 16:48:16 2006 @@ -0,0 +1,89 @@ +<?xml version="1.0"?> + +<!-- + Copyright 2004-2005 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + $Header:$ + --> + +<project name="wsm-imports" default="usage" basedir="."> + + <property environment="os"/> + <dirname property="wsm.home" file="${ant.file.wsm-imports}"/> + + <property file="${wsm.home}/user.properties"/> + <fail unless="m2.repo" message="Undefined property m2.repo. Add a beehive/wsm/trunk/user.properties file and initialize this property"/> + + <!-- Build paths --> + <fileset id="controls.fileset" file="${m2.repo}/org/apache/beehive/beehive-controls/1.0.1/beehive-controls-1.0.1.jar"/> + <fileset id="commons-logging.fileset" file="${m2.repo}/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar"/> + <fileset id="velocity.fileset" file="${m2.repo}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/> + <fileset id="commons-discovery.fileset" file="${m2.repo}/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/> + <fileset id="commons-codec.fileset" file="${m2.repo}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> + <fileset id="servlet.fileset" file="${m2.repo}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> + <fileset id="xbean.fileset" file="${m2.repo}/xmlbeans/xbean/2.0.0/xbean-2.0.0.jar"/> + <fileset id="jsr173.fileset" file="${m2.repo}/xmlbeans/xmlbeans-jsr173-api/2.0-dev/xmlbeans-jsr173-api-2.0-dev.jar"/> + + <fileset id="axis.fileset" file="${m2.repo}/axis/axis/1.3/axis-1.3.jar"/> + <fileset id="axis-jaxrpc.fileset" file="${m2.repo}/axis/axis-jaxrpc/1.3/axis-jaxrpc-1.3.jar"/> + <fileset id="axis-saaj.fileset" file="${m2.repo}/axis/axis-saaj/1.3/axis-saaj-1.3.jar"/> + <fileset id="axis-wsdl4j.fileset" file="${m2.repo}/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"/> + + <fileset id="junit.fileset" file="${m2.repo}/junit/junit/3.8.1/junit-3.8.1.jar"/> + <fileset id="log4j.fileset" file="${m2.repo}/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> + + <fileset id="wsm-core.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsm/1.0-SNAPSHOT/beehive-wsm-1.0-SNAPSHOT.jar"/> + <fileset id="wsm-axis.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsm-axis/1.0-SNAPSHOT/beehive-wsm-axis-1.0-SNAPSHOT.jar"/> + <fileset id="wsm-jsr181.fileset" file="${m2.repo}/org/apache/beehive/beehive-jsr181/1.0-SNAPSHOT/beehive-jsr181-1.0-SNAPSHOT.jar"/> + <fileset id="wsm-wsdltypes.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsdltypes/1.0-SNAPSHOT/beehive-wsdltypes-1.0-SNAPSHOT.jar"/> + + <path id="controls.dependency.path"> + <fileset refid="controls.fileset"/> + <fileset refid="velocity.fileset"/> + <fileset refid="commons-discovery.fileset"/> + </path> + <path id="commons-logging.dependency.path"> + <fileset refid="commons-logging.fileset"/> + </path> + <path id="commons-codec.dependency.path"> + <fileset refid="commons-codec.fileset"/> + </path> + <path id="servlet.dependency.path"> + <fileset refid="servlet.fileset"/> + </path> + <path id="xbean.dependency.path"> + <fileset refid="xbean.fileset"/> + <fileset refid="jsr173.fileset"/> + </path> + <path id="axis.dependency.path"> + <fileset refid="axis.fileset"/> + <fileset refid="axis-saaj.fileset"/> + </path> + + <!-- Test paths --> + <path id="velocity.dependency.path"> + <fileset refid="velocity.fileset"/> + </path> + <path id="junit.dependency.path"> + <fileset refid="junit.fileset"/> + </path> + <path id="commons-discovery.dependency.path"> + <fileset refid="commons-discovery.fileset"/> + </path> + <path id="log4j.dependency.path"> + <fileset refid="log4j.fileset"/> + </path> + +</project> From commitsjasmine05@example.org Sat Jun 10 17:29:52 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 57224 invoked from network); 10 Jun 2006 17:29:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jun 2006 17:29:52 -0000 Received: (qmail 4317 invoked by uid 500); 10 Jun 2006 17:29:52 -0000 Delivered-To: jasmine05@example.org Received: (qmail 4289 invoked by uid 500); 10 Jun 2006 17:29:52 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 4278 invoked by uid 99); 10 Jun 2006 17:29:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 10:29:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 10:29:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F3B801A983A; Sat, 10 Jun 2006 10:29:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413333 - in /beehive/wsm/trunk: README.txt pom.xml src/beehive-wsm.pom wsm-imports.xml Date: Sat, 10 Jun 2006 17:29:30 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ekoneil Date: Sat Jun 10 10:29:29 2006 New Revision: 413333 URL: http://svn.apache.org/viewvc?rev=413333&view=rev Log: Fixes to the WSM build so that it works in a clean environment. Also adds a README describing how to get the build working. Test: WSM pass Added: beehive/wsm/trunk/README.txt (with props) Modified: beehive/wsm/trunk/pom.xml beehive/wsm/trunk/src/beehive-wsm.pom beehive/wsm/trunk/wsm-imports.xml Added: beehive/wsm/trunk/README.txt URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/README.txt?rev=413333&view=auto ============================================================================== --- beehive/wsm/trunk/README.txt (added) +++ beehive/wsm/trunk/README.txt Sat Jun 10 10:29:29 2006 @@ -0,0 +1,46 @@ +Apache Beehive +Web Service Metadata (WSM) Project + +Welcome to the WSM project! + +WSM is an implementation of the JSR-181 specification which defines a metadata grammar +that can be applied to a Java source file to easily define a POJO as a web service. +Beehive WSM attempts to provide generalized support for processing JSR-181 annotations. +WSM also provides bindings for running a POJO as a web service on the following web +service containers: + + - Axis 1.3+ + +It is theoretically possible to add additional bindings here such as Axis2 or JAX-RPC +web service generation. It is also possible to add support for custom web service annotations +for security, asynchrony, state management, etc. Note, WSM *is not* a SOAP stack. It is simply +an infrastructure for using Java 5 metadata to describe a WSDL from a POJO. + +To build WSM, install the following software: + Ant 1.6.x + Maven 2.x + Tomcat 5.0.x + +The build uses Maven to download dependencies and to provide built WSM JARs for testing and uses +Ant for compilation and testing. + +Download the dependencies with: + mvn compile + mvn test + +In Maven 2, there is likely a better way to do this, if you know it, please drop us a line! + +Build WSM: + ant compile + +Install WSM into your local Maven2 repository: + ant install + +Test WSM: + ant test + +Clean WSM: + ant clean + +Once the dependencies have been downloaded, a typical build process looks like: + ant clean build install test \ No newline at end of file Propchange: beehive/wsm/trunk/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: beehive/wsm/trunk/pom.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/pom.xml?rev=413333&r1=413332&r2=413333&view=diff ============================================================================== --- beehive/wsm/trunk/pom.xml (original) +++ beehive/wsm/trunk/pom.xml Sat Jun 10 10:29:29 2006 @@ -35,22 +35,35 @@ <version>1.0.1</version> </dependency> <dependency> - <groupId>axis</groupId> - <artifactId>axis</artifactId> - <version>1.3</version> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + </dependency> + <dependency> + <groupId>xmlbeans</groupId> + <artifactId>xmlpublic</artifactId> + <version>2.1.0</version> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> + <groupId>xmlbeans</groupId> + <artifactId>xmlbeans-jsr173-api</artifactId> + <version>2.0-dev</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> <version>1.3</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>compile</scope> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.5.1</version> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -58,15 +71,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.8</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> </dependency> </dependencies> <build> Modified: beehive/wsm/trunk/src/beehive-wsm.pom URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsm.pom?rev=413333&r1=413332&r2=413333&view=diff ============================================================================== --- beehive/wsm/trunk/src/beehive-wsm.pom (original) +++ beehive/wsm/trunk/src/beehive-wsm.pom Sat Jun 10 10:29:29 2006 @@ -17,10 +17,5 @@ <artifactId>beehive-wsdltypes</artifactId> <version>@wsm.version@</version> </dependency> - <dependency> - <groupId>org.apache.beehive</groupId> - <artifactId>beehive-wsdltypes</artifactId> - <version>@wsm.version@</version> - </dependency> </dependencies> </project> Modified: beehive/wsm/trunk/wsm-imports.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=413333&r1=413332&r2=413333&view=diff ============================================================================== --- beehive/wsm/trunk/wsm-imports.xml (original) +++ beehive/wsm/trunk/wsm-imports.xml Sat Jun 10 10:29:29 2006 @@ -28,18 +28,18 @@ <!-- Build paths --> <fileset id="controls.fileset" file="${m2.repo}/org/apache/beehive/beehive-controls/1.0.1/beehive-controls-1.0.1.jar"/> - <fileset id="commons-logging.fileset" file="${m2.repo}/commons-logging/commons-logging/1.0.2/commons-logging-1.0.2.jar"/> + <fileset id="commons-logging.fileset" file="${m2.repo}/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/> <fileset id="velocity.fileset" file="${m2.repo}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/> <fileset id="commons-discovery.fileset" file="${m2.repo}/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/> <fileset id="commons-codec.fileset" file="${m2.repo}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> <fileset id="servlet.fileset" file="${m2.repo}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <fileset id="xbean.fileset" file="${m2.repo}/xmlbeans/xbean/2.0.0/xbean-2.0.0.jar"/> + <fileset id="xbean.fileset" file="${m2.repo}/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar"/> <fileset id="jsr173.fileset" file="${m2.repo}/xmlbeans/xmlbeans-jsr173-api/2.0-dev/xmlbeans-jsr173-api-2.0-dev.jar"/> <fileset id="axis.fileset" file="${m2.repo}/axis/axis/1.3/axis-1.3.jar"/> <fileset id="axis-jaxrpc.fileset" file="${m2.repo}/axis/axis-jaxrpc/1.3/axis-jaxrpc-1.3.jar"/> <fileset id="axis-saaj.fileset" file="${m2.repo}/axis/axis-saaj/1.3/axis-saaj-1.3.jar"/> - <fileset id="axis-wsdl4j.fileset" file="${m2.repo}/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"/> + <fileset id="axis-wsdl4j.fileset" file="${m2.repo}/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar"/> <fileset id="junit.fileset" file="${m2.repo}/junit/junit/3.8.1/junit-3.8.1.jar"/> <fileset id="log4j.fileset" file="${m2.repo}/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> From commitsjasmine05@example.org Sat Jun 10 17:34:59 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 58194 invoked from network); 10 Jun 2006 17:34:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jun 2006 17:34:58 -0000 Received: (qmail 7954 invoked by uid 500); 10 Jun 2006 17:34:57 -0000 Delivered-To: jasmine05@example.org Received: (qmail 7897 invoked by uid 500); 10 Jun 2006 17:34:57 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <commits.beehive.apache.org> Reply-To: "Beehive Dev" <jasmine05@example.org> Delivered-To: mailing list jasmine05@example.org Received: (qmail 7857 invoked by uid 99); 10 Jun 2006 17:34:57 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 10:34:57 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 10:34:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 93F461A983A; Sat, 10 Jun 2006 10:34:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413335 - /beehive/wsm/trunk/wsm-imports.xml Date: Sat, 10 Jun 2006 17:34:36 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ekoneil Date: Sat Jun 10 10:34:35 2006 New Revision: 413335 URL: http://svn.apache.org/viewvc?rev=413335&view=rev Log: Remove the need to define "m2.repo" in a properties file. This now infers the location of a Maven2 repository with user.properties only needed if the default repo location is overridden locally. Modified: beehive/wsm/trunk/wsm-imports.xml Modified: beehive/wsm/trunk/wsm-imports.xml URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=413335&r1=413334&r2=413335&view=diff ============================================================================== --- beehive/wsm/trunk/wsm-imports.xml (original) +++ beehive/wsm/trunk/wsm-imports.xml Sat Jun 10 10:34:35 2006 @@ -24,9 +24,13 @@ <dirname property="wsm.home" file="${ant.file.wsm-imports}"/> <property file="${wsm.home}/user.properties"/> - <fail unless="m2.repo" message="Undefined property m2.repo. Add a beehive/wsm/trunk/user.properties file and initialize this property"/> - <!-- Build paths --> + <property name="m2.repo" location="${user.home}/.m2/repository"/> + <available file="${m2.repo}" type="dir" property="m2.available"/> + + <fail unless="m2.available" message="Unable to find Maven2 repository directory at ${m2.repo}. Please configure one by defining a beehive/trunk/wsm/trunk/user.properties file with the 'm2.repo' property defined correctly."/> + + <!-- Paths to resource dependencies --> <fileset id="controls.fileset" file="${m2.repo}/org/apache/beehive/beehive-controls/1.0.1/beehive-controls-1.0.1.jar"/> <fileset id="commons-logging.fileset" file="${m2.repo}/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/> <fileset id="velocity.fileset" file="${m2.repo}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/> @@ -72,7 +76,6 @@ <fileset refid="axis-saaj.fileset"/> </path> - <!-- Test paths --> <path id="velocity.dependency.path"> <fileset refid="velocity.fileset"/> </path> From commitsjasmine05@example.org Sat Jun 10 21:52:58 2006 Return-Path: <commitsjasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 11462 invoked from network); 10 Jun 2006
{'source': 'Apache Software Foundation Public Mail Archives'}