[virtualcommons-svn] commit/irrigation: alllee: fixing template references in older config files

[<com...@bi...>]

1 new commit in irrigation:

https://bitbucket.org/virtualcommons/irrigation/commits/24aadba65e1d/
Changeset:   24aadba65e1d
User:        alllee
Date:        2014-05-13 00:25:34
Summary:     fixing template references in older config files
Affected #:  8 files

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 build.xml
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
              uri='antlib:org.apache.ivy.ant' 
              classpathref='ivy.lib.path'/>
     -->
-    <property name="ivy.install.version" value="2.2.0" />
+    <property name="ivy.install.version" value="2.3.0" /><condition property="ivy.home" value="${env.IVY_HOME}"><isset property="env.IVY_HOME" /></condition>
@@ -40,7 +40,7 @@
     </target><target name='resolve' depends='init-ivy' description='--> retrieve dependencies with ivy'>
-      <ivy:retrieve pattern='${lib.dir}/[artifact].[ext]'/> 
+      <ivy:retrieve pattern='${lib.dir}/[conf]/[artifact]-[type]-[revision].[ext]'/></target><!-- Load all properties from the build.properties file,
@@ -240,8 +240,8 @@
            optimize="off"
            deprecation="on"
            includeantruntime='true'
-           source="1.6"
-           target="1.6"
+           source="1.7"
+           target="1.7"
            ><compilerarg value='-Xlint:unchecked'/><classpath refid="project.classpath" />
@@ -274,7 +274,7 @@
     <javadoc sourcepath="${src.dir}"
              destdir="${javadoc.dir}"
              packagenames="*"
-             source="1.6"
+             source="1.7"
              classpathref='project.classpath'
              link='http://java.sun.com/javase/6/docs/api/
              http://commons.asu.edu/src/csidex/api'
@@ -316,8 +316,8 @@
   <target name="compile-tests" depends="compile"><javac srcdir="${test.src.dir}"
            destdir="${test.build.dir}"
-           source="1.6"
-           target="1.6"
+           source="1.7"
+           target="1.7"
            debug="on"><!-- <compilerarg value='-Xlint:unchecked'/> --><classpath refid="project.classpath" />

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 ivy.xml
--- a/ivy.xml
+++ b/ivy.xml
@@ -5,8 +5,7 @@
 <ivy-module version="2.0"><info organisation="edu.asu.commons" module="irrigation"/><dependencies>
-    <dependency org="edu.asu.commons" name="csidex" rev="0.5-SNAPSHOT"/>
-    <dependency org="org.jfree" name="jfreechart" rev="1.0.14"/>
-    <dependency org="javax.jnlp" name="javaws" rev="1.6.0_30"/>
+    <dependency org="edu.asu.commons" name="csidex" rev="0.7-SNAPSHOT"/>
+    <dependency org="org.jfree" name="jfreechart" rev="1.0.17"/></dependencies></ivy-module>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 pom.xml
--- a/pom.xml
+++ b/pom.xml
@@ -37,12 +37,12 @@
     <dependency><groupId>edu.asu.commons</groupId><artifactId>csidex</artifactId>
-      <version>0.5-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version></dependency><dependency><groupId>org.jfree</groupId><artifactId>jfreechart</artifactId>
-      <version>1.0.14</version>
+      <version>1.0.17</version></dependency><dependency><groupId>net.java.dev.jgoodies</groupId>
@@ -54,22 +54,16 @@
       <artifactId>forms</artifactId><version>1.1.0</version></dependency>
-    <dependency>
-      <groupId>javax.jnlp</groupId>
-      <artifactId>javaws</artifactId>
-      <version>1.6.0_30</version>
-      <scope>provided</scope>
-    </dependency></dependencies><build><finalName>irrigation</finalName><plugins><plugin><artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.1</version><configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target></configuration></plugin><plugin>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 src/main/resources/configuration/asu/2009/mixed-pretest/irrigation.xml
--- a/src/main/resources/configuration/asu/2009/mixed-pretest/irrigation.xml
+++ b/src/main/resources/configuration/asu/2009/mixed-pretest/irrigation.xml
@@ -102,7 +102,7 @@
 
 <p>
 We will now start a practice round to help illustrate the experiment.  Before each
-round in this experiment you will have a chat period of %d seconds where you can
+round in this experiment you will have a chat period of {self.chatDuration} seconds where you can
 send text messages to the other participants. You may discuss any aspect of the
 exercise with two important exceptions:
 </p>
@@ -286,7 +286,7 @@
 <entry key='chat-instructions'><![CDATA[
 <h3>Chat Instructions</h3>
-You may now chat for %d seconds with the other members of your group.  You may
+You may now chat for {self.chatDuration} seconds with the other members of your group.  You may
 discuss any aspect of the exercise with two important exceptions:
 </p><ol>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 src/main/resources/configuration/asu/2009/t1/irrigation.xml
--- a/src/main/resources/configuration/asu/2009/t1/irrigation.xml
+++ b/src/main/resources/configuration/asu/2009/t1/irrigation.xml
@@ -105,7 +105,7 @@
 
 <p>
 We will now start a practice round to help illustrate the experiment.  Before each
-round in this experiment you will have a chat period of %d seconds where you can
+round in this experiment you will have a chat period of {self.chatDuration} seconds where you can
 send text messages to the other participants. You may discuss any aspect of the
 exercise with two important exceptions:
 </p>
@@ -296,7 +296,7 @@
 <entry key='chat-instructions'><![CDATA[
 <h3>Chat Instructions</h3>
-You may now chat for %d seconds with the other members of your group.  You may
+You may now chat for {self.chatDuration} seconds with the other members of your group.  You may
 discuss any aspect of the exercise with two important exceptions:
 </p><ol>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 src/main/resources/configuration/asu/2009/t2/irrigation.xml
--- a/src/main/resources/configuration/asu/2009/t2/irrigation.xml
+++ b/src/main/resources/configuration/asu/2009/t2/irrigation.xml
@@ -105,7 +105,7 @@
 
 <p>
 We will now start a practice round to help illustrate the experiment.  Before each
-round in this experiment you will have a chat period of %d seconds where you can
+round in this experiment you will have a chat period of {self.chatDuration} seconds where you can
 send text messages to the other participants. You may discuss any aspect of the
 exercise with two important exceptions:
 </p>
@@ -296,7 +296,7 @@
 <entry key='chat-instructions'><![CDATA[
 <h3>Chat Instructions</h3>
-You may now chat for %d seconds with the other members of your group.  You may
+You may now chat for {self.chatDuration} seconds with the other members of your group.  You may
 discuss any aspect of the exercise with two important exceptions:
 </p><ol>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 src/main/resources/configuration/asu/2009/t3/irrigation.xml
--- a/src/main/resources/configuration/asu/2009/t3/irrigation.xml
+++ b/src/main/resources/configuration/asu/2009/t3/irrigation.xml
@@ -105,7 +105,7 @@
 
 <p>
 We will now start a practice round to help illustrate the experiment.  Before each
-round in this experiment you will have a chat period of %d seconds where you can
+round in this experiment you will have a chat period of {self.chatDuration} seconds where you can
 send text messages to the other participants. You may discuss any aspect of the
 exercise with two important exceptions:
 </p>
@@ -296,7 +296,7 @@
 <entry key='chat-instructions'><![CDATA[
 <h3>Chat Instructions</h3>
-You may now chat for %d seconds with the other members of your group.  You may
+You may now chat for {self.chatDuration} seconds with the other members of your group.  You may
 discuss any aspect of the exercise with two important exceptions:
 </p><ol>

diff -r 46ab6623575d00e9f80a101c6c773a535a999f0a -r 24aadba65e1d39ba5b323e0a945f2667a0dd95d6 src/main/resources/configuration/asu/2009/t4/irrigation.xml
--- a/src/main/resources/configuration/asu/2009/t4/irrigation.xml
+++ b/src/main/resources/configuration/asu/2009/t4/irrigation.xml
@@ -105,7 +105,7 @@
 
 <p>
 We will now start a practice round to help illustrate the experiment.  Before each
-round in this experiment you will have a chat period of %d seconds where you can
+round in this experiment you will have a chat period of {self.chatDuration} seconds where you can
 send text messages to the other participants. You may discuss any aspect of the
 exercise with two important exceptions:
 </p>
@@ -296,7 +296,7 @@
 <entry key='chat-instructions'><![CDATA[
 <h3>Chat Instructions</h3>
-You may now chat for %d seconds with the other members of your group.  You may
+You may now chat for {self.chatDuration} seconds with the other members of your group.  You may
 discuss any aspect of the exercise with two important exceptions:
 </p><ol>

Repository URL: https://bitbucket.org/virtualcommons/irrigation/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.