Release v3.0.0

.classpath

@@ -15,6 +15,8 @@
 	<classpathentry kind="lib" path="lib/woodstox-core-5.0.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/args4j-2.33.jar"/>
+	<classpathentry kind="lib" path="lib/flexjson-2.1/flexjson-2.1.jar" sourcepath="lib/flexjson-2.1/flexjson-2.1-sources.jar"/>
+	<classpathentry kind="lib" path="lib/proxy-vole/proxy-vole-1.0.5-SNAPSHOT-jar-with-dependencies.jar" sourcepath="lib/proxy-vole/proxy-vole-1.0.5-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

+*~
+/target/
+/lib/
+/projects/test/bin/
+/tmp
+**/ignore/
+/build-gradle/
+/doc/

.project

@@ -10,11 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

CHANGES

+v3.0.0
+------
+
+- New translations!
+  - Greek, by Giota Digkoglou
+  - Spanish, by Maria de Vicente y Oliva and Jaime Manera Bassa
+
+- It is possible to set, server-side, a maximum number of clients.
+
+- Possible boolean parameters' values and default values in the
+  descriptions of boolean parameters are restricted to four values,
+  namely: "0", "1", "true" and "false".
+
+- Splasher now displays the splash screen centered on the main
+  monitor.  On dual monitor configuration e.g., the splash screen
+  straddled the two monitors.
+
+- The launcher now sets the title of the application's window GUI.  On
+  some linux systems, an application bundled with one-jar showed
+  "com-simontuffs-onejar-Boot" (corresponding to the X11 property
+  WM_CLASS, observed on Ubuntu 16.04 w/ Gnome 3.24 & 3.26.1).  The new
+  configuration property application.name is used to set this X11
+  property.
+
 v2.2
 ----
 

LICENSE/LICENCE.fr

-Copyright Institut Mines Telecom - IMT Atlantique Bretagne Pays de la Loire 2002-2017
+© Institut Mines Télécom - IMT Atlantique Bretagne-Pays de la Loire 2002-2018
 
 Project leader, maintenance:
   Sébastien Bigaret <sebastien.bigaret@imt-atlantique.fr>

LICENSE/LICENSE.en

-Copyright Institut Mines Telecom - IMT Atlantique Bretagne Pays de la Loire 2002-2017
+© Institut Mines Télécom - IMT Atlantique Bretagne-Pays de la Loire 2002-2018
 
 Project leader, maintainer:
   Sébastien Bigaret <sebastien.bigaret@imt-atlantique.fr>

ant/dependencies.xml

@@ -20,7 +20,6 @@
       <filename name="jaxen.jar"/>
       <filename name="jdom.jar"/>
       <filename name="org.apache.common.lang.SystemUtils.jar"/>
-      <filename name="rmiio-2.0.2.jar"/>
       <filename name="saxpath.jar"/>
       <filename name="sqlite-jdbc-3.20.0.jar"/>
       <filename name="stax2-api-4.0.0.jar"/>

ant/javadoc.xml

@@ -21,7 +21,7 @@
              noindex="false" nonavbar="false"
              windowtitle="Praxis API">
       <doctitle><![CDATA[<h1>Praxis documentation</h1>]]></doctitle>
-      <bottom><![CDATA[<i>Copyright &#169; 2002-2017, Institut Mines Telecom - IMT Atlantique Bretagne Pays de la Loire. All Rights Reserved.</i>]]></bottom>
+      <bottom><![CDATA[<i>Copyright &#169; 2002-2018, Institut Mines T&eacute;l&eacute;com - IMT Atlantique Bretagne-Pays de la Loire. All Rights Reserved.</i>]]></bottom>
       <tag name="implementation" scope="all" description="Implementation note: "/>
       <tag name="category" scope="all" description="Category:"/>
       <link href="https://docs.oracle.com/javase/8/docs/api/" />

ant/praxis.core.xml

-<project name="praxis-core-common">
+<project name="praxis-core-common"
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
 
   <import file="macros.xml" />
 
@@ -6,17 +8,18 @@
 
   <!-- -->
   <property name="praxis.core.src"   location="${praxis.core.home}/src"/>
-  <property name="praxis.core.bin"   location="${praxis.core.home}/bin"/>
-  <property name="praxis.core.build" location="${praxis.core.home}/build"/>
+  <property name="praxis.core.bin"   location="${praxis.core.home}/target/classes"/>
+  <property name="praxis.core.build" location="${praxis.core.home}/target/jars"/>
 
-  <!-- get git revision. Written by "jmuc" on stackoverflow
+  <!-- get git revision. Based on code by "jmuc" on stackoverflow
        http://stackoverflow.com/questions/2974106/how-to-lookup-the-latest-git-commit-hash-from-an-ant-build-script/4059546#4059546
   -->
   <available file="${praxis.core.home}/.git" type="dir" property="praxis.core.git.present"/>
-  <target name="praxis.core.git.revision" description="Store git revision in ${repository.version}" if="praxis.core.git.present">
+  <target name="praxis.core.git.revision" description="Store git revision in ${repository.version}">
     <exec executable="git" outputproperty="praxis.core.git.revision"
           failifexecutionfails="false" errorproperty=""
-          dir="${praxis.core.home}">
+          dir="${praxis.core.home}"
+          if:set="praxis.core.git.present">
       <arg value="describe"/>
       <arg value="--tags"/>
       <arg value="--always"/>
@@ -28,7 +31,10 @@
         <length string="${praxis.core.git.revision}" trim="yes" length="0" when="greater"/>
       </and>
     </condition>
-    <echo message="praxis.core.git.revision: ${praxis.core.git.revision}"/>
+    <echo message="praxis.core.git.revision: ${praxis.core.git.revision}"
+          if:set="praxis.core.git.revision"/>
+    <echo message="praxis.core.git.revision: UNSET"
+          unless:set="praxis.core.git.revision"/>
     <echo message="praxis.core.repository.version: ${praxis.core.repository.version}"/>
 
   </target>

ant/praxis.swing_gui.xml

-<project name="praxis-swing-gui" basedir="..">
+<project name="praxis-swing-gui" basedir=".."
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
 
   <!-- we expect praxis.home to be set -->
   <fail unless="praxis.home"
@@ -24,7 +26,7 @@
 
   <!-- -->
   <property name="praxis.swing_gui.src"   location="${praxis.swing_gui.home}/src"/>
-  <property name="praxis.swing_gui.bin"   location="${praxis.swing_gui.home}/bin"/>
+  <property name="praxis.swing_gui.bin"   location="${praxis.swing_gui.home}/target/classes"/>
 
   <!--  Libraries  -->
   <property name="praxis.swing_gui.lib" location="${praxis.swing_gui.home}/lib"/>
@@ -39,6 +41,34 @@
   </path>
 
 
+  <!-- get git revision. Based on code by "jmuc" on stackoverflow
+       http://stackoverflow.com/questions/2974106/how-to-lookup-the-latest-git-commit-hash-from-an-ant-build-script/4059546#4059546
+  -->
+  <available file="${praxis.swing_gui.home}/.git" type="dir" property="praxis.swing_gui.git.present"/>
+  <target name="praxis.swing_gui.git.revision" description="Store git revision in ${repository.version}">
+    <exec executable="git" outputproperty="praxis.swing_gui.git.revision"
+          failifexecutionfails="false" errorproperty=""
+          dir="${praxis.swing_gui.home}"
+          if:set="praxis.swing_gui.git.present">
+      <arg value="describe"/>
+      <arg value="--tags"/>
+      <arg value="--always"/>
+      <arg value="HEAD"/>
+    </exec>
+    <condition property="praxis.swing_gui.repository.version" value="${praxis.swing_gui.git.revision}" else="${build.time}">
+      <and>
+        <isset property="praxis.swing_gui.git.revision"/>
+        <length string="${praxis.swing_gui.git.revision}" trim="yes" length="0" when="greater"/>
+      </and>
+    </condition>
+    <echo message="praxis.swing_gui.git.revision: ${praxis.swing_gui.git.revision}"
+          if:set="praxis.swing_gui.git.revision"/>
+    <echo message="praxis.swing_gui.git.revision: UNSET"
+          unless:set="praxis.swing_gui.git.revision"/>
+    <echo message="praxis.swing_gui.repository.version: ${praxis.swing_gui.repository.version}"/>
+
+  </target>
+
 
   <!-- Dependencies -->
   <fileset dir="${praxis.core.lib}" id="praxis.swing_gui.dependencies">

build.xml

@@ -7,7 +7,7 @@
     <format property="build.time" pattern="yyyy-MM-dd'T'hh:mm:ss.SSSZ"/>
   </tstamp>
 
-  <property name="praxis.version" value="1.11"/>
+  <property name="praxis.version" value="3.0.0"/>
   <!-- If not called from an other project setting praxis.home, define it.
        In details:
        - it is unset when directly building the jars of Praxis,
@@ -67,14 +67,15 @@
   </target>
 
   <target name="praxis.build.standalone.jar"
-          depends="praxis.compile, praxis.core.git.revision"
+          depends="praxis.compile,
+                   praxis.core.git.revision, praxis.swing_gui.git.revision"
           description="Builds the jar for the standalone version of praxis">
     <jar jarfile="${praxis.jar}" manifest="MANIFEST.MF" index="false">
       <manifest>
         <attribute name="Main-Class" value="eu.telecom_bretagne.praxis.common.Launcher"/>
         <attribute name="Implementation-Title" value="Praxis / Standalone"/>
         <attribute name="Class-Path" value=". ${praxis.all.manifest.classpath}"/>
-        <attribute name="Implementation-Version" value="${praxis.version} ${praxis.core.git.revision} ${build.time}"/>
+        <attribute name="Implementation-Version" value="${praxis.version} core:${praxis.core.repository.revision} swing_gui:${praxis.swing_gui.repository.revision}"/>
          <!-- TODO: own dependencies -->
       </manifest>
       <fileset dir="${praxis.core.bin}">

configurations/configuration.defaults

@@ -191,6 +191,8 @@ socket-ssl.port=8012
 server.resources_clientTree_FILE-CHECK
 
 server.allowed_resources_FILE-CHECK_
+server.maximum_number_of_clients_INT-CHECK_
+server.maximum_number_of_clients=-1
 server.users=
 server.reject_already_connected_client_BOOLEAN-CHECK_
 server.reject_already_connected_client=true

configurations/configuration.template

 # Configuration file for praxis
 application.id=
+application.name=
 # Name of a class subclassing eu.telecom_bretagne.praxis.common.Launcher.InitialisationDelegate
 application.init=
 descriptions.package=
@@ -90,6 +91,7 @@ socket-ssl.port=8012
 #
 
 server.allowed_resources=configuration/server/hierarchy.brs
+server.maximum_number_of_clients=0
 server.resources_clientTree=configuration/server/resources.clientTree.xml
 server.users=
 # indicates whether the server should reject the client if it is already connected

data/i18n/.gitignore

+praxis_en.keys
+praxis_fr.keys

data/i18n/check_keys.sh

+#! /bin/bash
+# Check that keys in praxis_*.keys (built with extract_keys) are used in
+# the sources folders
+
+dirs="../../src ../../../praxis-swing-gui/src"
+
+check()
+{
+  echo -e "#\n# keys in $1 which are not used in the source folders:\n#"
+  cat "$1" | while read key; do
+    if ! grep -qr "$key" $dirs ; then
+        echo $key
+    fi
+  done
+}
+check praxis_en.keys
+check praxis_fr.keys

data/i18n/extract_keys.sh

+#! /bin/bash
+# Extracts the keys from the properties files,
+# and check that both files define the same subset
+
+sed -E '/^[^=]*$/ d;s/^([^ =]+).*$/\1/' praxis_en.properties \
+    | sort -o praxis_en.keys
+
+sed -E '/^[^=]*$/ d;s/^([^ =]+).*$/\1/' praxis_fr.properties \
+    | sort -o > praxis_fr.keys
+
+diff -s praxis_en.keys praxis_fr.keys

data/i18n/native_to_ascii.sh

+#! /bin/bash
+shopt -s nullglob
+
+cd ${0%/*}/original
+for lang in el en es fr; do
+    t9n="praxis_${lang}"
+    encoding=("praxis_${lang}.encoding".*)
+    encoding="${encoding##*.}"
+    if [ -z "${encoding}" ]; then
+        echo "Warning: could not find encoding for ${t9n}, skipping" >&2
+        continue
+    fi
+    echo "${t9n}: ${encoding} to ascii..." >&2
+
+    native2ascii -encoding "${encoding}" "${t9n}" "../${t9n}.properties"
+    # remove the emacs' coding system
+    sed -i -e '/^# *-\*- coding:/ d' "../${t9n}.properties"
+done
+cd -
+
+# This file was initially encoded with upper-cased hexadecimal
+# sed -i -E 's/\\u([a-zA-Z0-9]{4})/\\u\U\1/g'  "praxis_fr.properties"

data/i18n/original/README

+This directory contains the translation files.
+
+Files are named after the two-letter code XX for the language, as defined
+in ISO 639-1:
+
+- praxis_XX.properties is the translation file
+- praxis_XX.encoding.<encoding> gives the file's <encoding>
+- praxis_XX.author contains the author(s)' name(s) and e-mail
+
+NB: They must be converted to ascii to be used within java.
+    The conversion consists in calling:
+
+      lang=XX
+      native2ascii -encoding <encoding> \
+                   praxis_XX.properties ../praxis_XX.properties
+
+    See ../native_to_ascii.sh
+
+
+Références for ISO 639-1 codes:
+- https://www.loc.gov/standards/iso639-2/php/English_list.php
+- https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes

data/i18n/original/praxis_el.author

+Panagiota Digkoglou <giotadigkoglou@outlook.com>