updated scripts and added examples compile script

Updated scripts to new versions of APGAS, Akka.
Also removed unusual system-specific config for Java8.
Added a section on Terminology to README file as well as
how to run example programs.

Author: Josh Milthorpe

README.md

@@ -15,6 +15,15 @@ in the same way when using sbt or starting from a shell.
 - The [Scala IDE](http://scala-ide.org/download/current.html) Eclipse plugins.
 - (Optional for Akka examples) [Akka](http://akka.io/) 2.4.1
 
+Terminology
+---
+
+A *Place* is a mutable, shared-memory region combined with a set of worker threads operating on this memory. A single application typically runs over a collection of places, where each place is implemented as a separate JVM.
+
+A *task* is a sequence of computations, specified as a block. Each task is bound to a particular place. A task can spawn local and remote tasks, i.e. tasks to be executed in the same place or elsewhere.
+
+A local task shares the heap of the parent task. A remote task executes on a snapshot of the parent task’s heap captured when the task is spawned. Global references are copied as part of the snapshot but the target objects are not copied. A global reference can only be dereferenced at the place of the target object where it resolves to the original object.
+
 Constructs
 ---
 
@@ -41,9 +50,11 @@ For a type `T` that cannot extend `PlaceLocal`, the library defines `GlobalRef[T
 
 For full details of the APGAS programming model, see the reference paper below.
 
-Notes
+Running APGAS Scala Programs
 ---
 
+The `scripts` directory contains shell scripts to compile the library and example programs, and to run the examples.
+
 Projects that only use `async` and `finish` (i.e. no distribution) will work just fine. Projects running distributed computations must ensure that the `java` command starting the other processes includes `scala-library.jar` in the classpath.
 
 Licensing Terms

apgas.scala.examples/src/apgas/scala/examples/HelloPatterns.scala

@@ -22,9 +22,6 @@ object HelloPatterns {
   }
 
   def main(args : Array[String]) : Unit = {
-    // PS: I need this because java is not the default on my system..
-    System.setProperty(Configuration.APGAS_JAVA, "java8")
-
     if (System.getProperty(Configuration.APGAS_PLACES) == null) {
       System.setProperty(Configuration.APGAS_PLACES, "4")
     }
@@ -61,4 +58,4 @@ object HelloPatterns {
 
     println(fib(10))
   }
-}
+}

apgas.scala.examples/src/apgas/scala/examples/HelloPlaceLocal.scala

@@ -21,9 +21,6 @@ object HelloPlaceLocal {
   def main(args : Array[String]) : Unit = {
     case class Box(i : Int) extends PlaceLocal
 
-    // PS: I need this because java is not the default on my system..
-    System.setProperty(Configuration.APGAS_JAVA, "java8")
-
     if (System.getProperty(Configuration.APGAS_PLACES) == null) {
       System.setProperty(Configuration.APGAS_PLACES, "4")
     }
@@ -40,4 +37,4 @@ object HelloPlaceLocal {
       }
     }
   }
-}
+}

apgas.scala.examples/src/apgas/scala/examples/HelloWorld.scala

@@ -20,9 +20,6 @@ object HelloWorld {
       System.setProperty(Configuration.APGAS_PLACES, "4")
     }
 
-    // PS: I need this because java is not the default on my system..
-    System.setProperty(Configuration.APGAS_JAVA, "java8")
-      
     apgas {
       finish {
         for(place <- places) {
@@ -35,4 +32,4 @@ object HelloWorld {
 
     println(s"Running main at ${here} of ${places.size} places")
   }   
-}
+}

apgas.scala.examples/src/apgas/scala/examples/ResilientHelloWorld.scala

@@ -27,9 +27,6 @@ object ResilientHelloWorld {
       System.setProperty(Configuration.APGAS_PLACES, "4")
     }
 
-    // PS: I need this because java is not the default on my system..
-    System.setProperty(Configuration.APGAS_JAVA, "java8")
-
     apgas {
       var i: Int = 0
       while (true) {
@@ -62,4 +59,4 @@ object ResilientHelloWorld {
 
     println(s"Running main at ${here} of ${places.size} places")
   }
-}
+}

apgas.scala.examples/src/apgas/scala/examples/uts/Common.scala

@@ -14,9 +14,6 @@ package apgas.scala.examples.uts
 object Common {
   def setup(numPlaces : Int = 1) : Unit = {
     import apgas.Configuration
-    // PS: I put my machine-specific config here...
-    // I need this because java is not the default on my system..
-    System.setProperty(Configuration.APGAS_JAVA, "java8")
     if (System.getProperty(Configuration.APGAS_PLACES) == null) {
       System.setProperty(Configuration.APGAS_PLACES, "" + numPlaces)
     }
@@ -52,4 +49,4 @@ object Common {
       }
     }
   }
-}
+}

scripts/clean.sh

@@ -1,25 +1,22 @@
 # Make sure this is Java 8
-JAVA=java8
-JAVAC=javac8
+JAVA=java
+JAVAC=javac
 SCALAC=scalac
 
-# Where you keep you apgas SVN checkout.
-APGAS_COMMON_HOME=${HOME}/apgas
+# Where you keep you apgas Git checkout (see 
+APGAS_COMMON_HOME=${X10_HOME}
 
 # Where you keep you apgas-scala Git checkout.
-APGAS_SCALA_COMMON_HOME=${HOME}/workspace
+APGAS_SCALA_COMMON_HOME=${HOME}/apgas-scala
 
 # Where you keep Scala. Should have a lib, bin, etc. subdir.
-SCALA_HOME=${HOME}/software/scala/current
+SCALA_HOME=${HOME}/scala
 # Where you keep Akka, should have a lib/akka subdir.
-AKKA_HOME=${HOME}/software/akka/akka-2.3.9
-
-
+AKKA_HOME=${HOME}/opt/akka-2.4.1
 
 # The rest depends only on the above.
 APGAS_HOME=${APGAS_COMMON_HOME}/apgas
 APGAS_EXAMPLES_HOME=${APGAS_COMMON_HOME}/apgas.examples
-APGAS_IMPL_HOME=${APGAS_COMMON_HOME}/apgas.impl
 
 APGAS_SCALA_HOME=${APGAS_SCALA_COMMON_HOME}/apgas.scala
 APGAS_SCALA_EXAMPLES_HOME=${APGAS_SCALA_COMMON_HOME}/apgas.scala.examples

scripts/common.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+source common.sh
+
+mkdir -p ${APGAS_SCALA_EXAMPLES_HOME}/bin
+
+cd ${APGAS_SCALA_EXAMPLES_HOME} && ${SCALAC} -d bin -classpath "bin:${AKKA_HOME}/lib/akka/*:${APGAS_HOME}/lib/apgas.jar:${APGAS_SCALA_HOME}/bin" `find src -name "*.scala" -type f`  

scripts/compile-apgas-scala-examples.sh

@@ -2,6 +2,6 @@
 
 source common.sh
 
-mkdir -p bin
+mkdir -p ${APGAS_SCALA_HOME}/bin
 
-${SCALAC} -d bin -classpath "bin:${AKKA_HOME}/lib/akka/*" `find ${APGAS_SCALA_COMMON_HOME} -name "*.scala" -type f`  
+cd ${APGAS_SCALA_HOME} && ${SCALAC} -d bin -classpath "bin:${AKKA_HOME}/lib/akka/*:${APGAS_HOME}/lib/apgas.jar" `find src -name "*.scala" -type f`