[virtualcommons-svn] commit/irrigation: alllee: fixing ant classpaths to deal with system JNLP / javaws jar

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

1 new commit in irrigation:

https://bitbucket.org/virtualcommons/irrigation/commits/449d95d0bcd4/
Changeset:   449d95d0bcd4
User:        alllee
Date:        2014-05-14 08:02:16
Summary:     fixing ant classpaths to deal with system JNLP / javaws jar
Affected #:  3 files

diff -r 6980e9b67d64badd72d0c4a1dcad43313514a975 -r 449d95d0bcd4b3d31237f6c076878cd0db92458c build.xml
--- a/build.xml
+++ b/build.xml
@@ -89,6 +89,11 @@
     <pathelement location='${resources.dir}' /></path>
 
+  <path id='runtime.classpath'>
+    <path refid='project.classpath' />
+    <pathelement location='${java.home}/lib/javaws.jar' />
+  </path>
+
   <target name="help"><echo>
     NOTE: At minimum you will need to modify the default web.dir and
@@ -284,13 +289,13 @@
   <!-- RUN TARGETS --><target name='client' depends='compile'><java classname='${client.class}'
-          classpathref='project.classpath'
+          classpathref='runtime.classpath'
           fork='yes'/></target><target name='fac' depends='compile'><java classname='${facilitator.class}'
-          classpathref='project.classpath'
+          classpathref='runtime.classpath'
           fork='yes'/></target>
 
@@ -306,7 +311,7 @@
         <filter token='CODEBASE_URL' value='${codebase.url}'/></filterset></copy>
-    <java classname='${server.class}' classpathref='project.classpath' fork='yes'>
+    <java classname='${server.class}' classpathref='runtime.classpath' fork='yes'><jvmarg value="-server"/></java></target>

diff -r 6980e9b67d64badd72d0c4a1dcad43313514a975 -r 449d95d0bcd4b3d31237f6c076878cd0db92458c pom.xml
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,16 @@
   </repositories><dependencies><dependency>
+      <groupId>javax.jnlp</groupId>
+      <artifactId>jnlp-api</artifactId>
+      <version>7.0</version>
+      <scope>system</scope>
+      <systemPath>${java.home}/lib/javaws.jar</systemPath>
+    </dependency>
+    <dependency><groupId>junit</groupId><artifactId>junit</artifactId>
-      <version>4.10</version>
+      <version>4.11</version><scope>test</scope></dependency><dependency>

diff -r 6980e9b67d64badd72d0c4a1dcad43313514a975 -r 449d95d0bcd4b3d31237f6c076878cd0db92458c src/main/resources/configuration/asu/2014/stiglitz/irrigation.xml
--- a/src/main/resources/configuration/asu/2014/stiglitz/irrigation.xml
+++ b/src/main/resources/configuration/asu/2014/stiglitz/irrigation.xml
@@ -31,6 +31,7 @@
 <entry key="wait-for-participants">true</entry><entry key='chat-duration'>20</entry><entry key='round-duration'>50</entry>
+<entry key='field-of-vision'>0</entry><entry key="q1">49</entry><entry key="a1">49%</entry>

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.