[virtualcommons-svn] SF.net SVN: virtualcommons:[334] irrigation/trunk

[<al...@us...>]

Revision: 334
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=334&view=rev
Author:   alllee
Date:     2009-10-26 21:07:55 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
updated pom, ivy, and build xmls to deal with problems that came up with deployment
at IU.  
- removed JUnit from ivy dependencies (still need to figure out what the problem is
  here, raises an error message about duplicate resources)
- ivy version bump to 2.1.0
- setting Maven Jetty plugin version to 6.1.21.  The jetty-maven-plugin version 7.0
  appears to have problems with spaces in Windows and can't start properly.  This
  also means that the default web app context is set to irrigation again.

Modified Paths:
--------------
    irrigation/trunk/build.xml
    irrigation/trunk/ivy.xml
    irrigation/trunk/pom.xml

Modified: irrigation/trunk/build.xml
===================================================================
--- irrigation/trunk/build.xml	2009-10-24 21:34:10 UTC (rev 333)
+++ irrigation/trunk/build.xml	2009-10-26 21:07:55 UTC (rev 334)
@@ -13,7 +13,7 @@
              uri='antlib:org.apache.ivy.ant' 
              classpathref='ivy.lib.path'/>
     -->
-    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <property name="ivy.install.version" value="2.1.0" />
     <condition property="ivy.home" value="${env.IVY_HOME}">
       <isset property="env.IVY_HOME" />
     </condition>
@@ -22,21 +22,10 @@
     <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
 
     <target name="download-ivy" unless="offline">
-
       <mkdir dir="${ivy.jar.dir}"/>
       <!-- download Ivy from web site so that it can be used even without any special installation -->
       <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
            dest="${ivy.jar.file}" usetimestamp="true"/>
-      <!--
-        <get src="http://www.apache.org/dist/ant/ivy/${ivy.install.version}/ivy.jar"
-            dest="${ivy.jar.file}" usetimestamp="true"/>
-      <get src="http://www.apache.org/dist/ant/ivy/${ivy.install.version}/apache-ivy-${ivy.install.version}-bin.zip"
-           dest="${ivy.jar.dir}/ivy-${ivy.install.version}-bin.zip" usetimestamp="true"/>
-           -->
-      <!-- FIXME: this should be dependent on the download in the first place 
-      <unzip src='${ivy.jar.dir}/ivy-${ivy.install.version}-bin.zip' dest='${ivy.jar.dir}' overwrite='false' />
-      <move file='${ivy.jar.dir}/apache-ivy-${ivy.install.version}/ivy-${ivy.install.version}.jar' tofile='${ivy.jar.file}' overwrite='false' />
-      -->
     </target>
 
     <target name="init-ivy" depends="download-ivy">

Modified: irrigation/trunk/ivy.xml
===================================================================
--- irrigation/trunk/ivy.xml	2009-10-24 21:34:10 UTC (rev 333)
+++ irrigation/trunk/ivy.xml	2009-10-26 21:07:55 UTC (rev 334)
@@ -5,7 +5,6 @@
 <ivy-module version="2.0">
   <info organisation="edu.asu.commons" module="irrigation"/>
   <dependencies>
-    <dependency org="junit" name="junit" rev="latest.integration"/>
     <dependency org="edu.asu.commons" name="csidex" rev="0.2-SNAPSHOT"/>
     <dependency org="jfree" name="jfreechart" rev="1.0.13"/>
     <dependency org="jfree" name="jcommon" rev="1.0.16"/>

Modified: irrigation/trunk/pom.xml
===================================================================
--- irrigation/trunk/pom.xml	2009-10-24 21:34:10 UTC (rev 333)
+++ irrigation/trunk/pom.xml	2009-10-26 21:07:55 UTC (rev 334)
@@ -84,7 +84,8 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.21</version>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.