svn commit: r413335 - /beehive/wsm/trunk/wsm-imports.xml

[ek...@apache.org]

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>