Client-5.2.0

This is a snap shot of the MVCS repository.  The MVCS has been tagged
as Client-.5.2.0.  The Jira to capture this change is MARTUSDEV-1735

martus-build/BuildFiles/Documents/client/README.txt

@@ -1,4 +1,4 @@
-Martus(tm) Desktop Software Version 5.1.1 README.txt
+Martus(tm) Desktop Software Version 5.2.0 README.txt
 ----------------------------------------------------------------
 
 See https://www.martus.org for information about the Martus software.
@@ -57,6 +57,27 @@ Installing and Running Martus:
 
 Martus desktop release information by version and release date:
 
+
+Version 5.2.0 		2016-11
+
+This release is available in English and Spanish with partial translations in several 
+other languages. Other languages may be available in the future, as language-packs on https://www.martus.org 
+
+Changes in this release:  
+
+- Ability to import Xforms from benetech.github.io/forms for customizable data input 
+- Import multiple encrypted records at once
+- Export data as unencrypted files in two additional formats: *.csv or *.json
+
+Bug fixes and cleanup, including:
+- Fixed issue where search and reports did not include dropdown fields
+- Fixes for Java 8 updates  
+
+Known Issues:
+- Currently, Xform import only supports English and Spanish
+- Xform import may not work for certain special characters 
+
+
 Version 5.1.1 		2015-12
 
 This release is available in English, Spanish, Arabic, and French, with partial translations in several 

martus-build/BuildFiles/Documents/client/README_bur.txt

@@ -1,4 +1,4 @@
-Martus(tm) ေဆာ့ဖ္ဝဲ ဗားရွင္း ၄.၃ (Version 4.3) ဖတ္ပါ README_bur.txt
+Martus(tm) ေဆာ့ဖ္ဝဲ ဗားရွင္း ၄.၃ (Version 5.2.0) ဖတ္ပါ README_bur.txt
 ----------------------------------------------------------------------------
 
 Martus ေဆာ့ဖ္ဝဲႏွင့္ ပတ္သက္ေသာ သတင္းးအခ်က္အလက္မ်ားအတြက္ http://www.martus.org ကို ဝင္ေရာက္ၾကည့္ရွုပါ။

martus-build/BuildFiles/Documents/client/README_es.txt

@@ -1,4 +1,4 @@
-Martus(tm) Software Versión 4.1.1 README_es.txt
+Martus(tm) Software Versión 5.2.0 README_es.txt
 ---------------------------------------------
 
 

martus-build/BuildFiles/Documents/client/README_fa.txt

@@ -1,4 +1,4 @@
-Martus(tm) Software Version 3.6.1 README.txt
+Martus(tm) Software Version 5.2.0 README.txt
 ---------------------------------------------------------
 
 

martus-build/BuildFiles/Documents/client/README_ru.txt

@@ -1,4 +1,4 @@
-Martus(tm) Программное обеспечение Версия 3.3  README_ru.txt
+Martus(tm) Программное обеспечение Версия 5.2.0  README_ru.txt
 ------------------------------------------------------------
 
 Содержание: 

martus-build/BuildFiles/Windows/Win32_NSIS_Unicode/common/NSIS_Martus_Installer_Details.nsi

@@ -1,5 +1,5 @@
 ;The Martus(tm) free, social justice documentation and
-;monitoring software. Copyright (C) 2001-2015, Beneficent
+;monitoring software. Copyright (C) 2001-2016, Beneficent
 ;Technology, Inc. (Benetech).
 
 ;Martus is free software; you can redistribute it and/or
@@ -23,13 +23,13 @@ unicode "true"
 !define PRODUCT_NAME "Martus"
 
 ;NOTE: PRODUCT_VERSION and PRODUCT_EXTENDED_VERSION must be numbers only, no 'pre-' can be added.
-!define PRODUCT_VERSION "5.1.1"
-!define PRODUCT_EXTENDED_VERSION "5.1.1.0"
+!define PRODUCT_VERSION "5.2.0"
+!define PRODUCT_EXTENDED_VERSION "5.2.0.0"
 
 !define PRODUCT_OLDEST_UPGRADEABLE_EXTENDED_VERSION "4.0.0.0"
 !define PRODUCT_OLDEST_NSIS_UPGRADEABLE_EXTENDED_VERSION "4.3.0.0"
 !define PRODUCT_PUBLISHER "The Benetech Initiative"
-!define PRODUCT_COPYRIGHT_DATE "2002-2015"
+!define PRODUCT_COPYRIGHT_DATE "2002-2016"
 !define PRODUCT_WEB_SITE "http://www.martus.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

martus-build/JenkinsBuildRelease.sh

@@ -1,4 +1,4 @@
-export RELEASE_IDENTIFIER=5.1.1
+export RELEASE_IDENTIFIER=5.2.0
 export NSIS_HOME="$HOME/.wine/drive_c/Program Files/NSIS/"
 export ATTIC_DIR="/var/lib/jenkins/martus-client/builds/$INPUT_BUILD_NUMBER/"
 # INPUT_BUILD_NUMBER is set interactively (e.g. 3011)

martus-build/TechDocs/BitsOfSecurity.txt

@@ -0,0 +1,10 @@
+Formual to calculate bits of security
+
+Log2(6) * 40 = 90
+
+- Instead of hashing the original value as intended, we convert it
+to base64, and hash that. If true (please double check source),  that would
+mean that every 8 bits only contain 6 bits of actual data, so 120 * 6 /
+8 = 90 bits.
+
+- 90 bits isn't terrible.

martus-build/TechDocs/Copyright Updates.txt

@@ -4,7 +4,7 @@ martus-client
 	org.martus.client.swingui.UIConstants.java
 
 martus-build
-	BuildFiles/License.txt
+	BuildFiles/License.txt (2016... don't see this file anymore)
 	BuildFiles/Windows/Win32_NSIS_Unicode/Common/NSIS_Martus_Installer_Details.nsi
 
 Eclipse

martus-build/VersionNumbers.txt

@@ -14,10 +14,10 @@ Martus client version numbers are set in the following places:
 
 3. Build process (used to name the jars):
    Configure the MartusClient-Release-Mercurial project:
-    		http://mart-jenkins.benetech.org:8011/job/MartusClient-Release-Mercurial/configure
+    		(OLD) http://mart-jenkins.benetech.org:8011/job/MartusClient-Release-Mercurial/configure
    		In the Build/Execute Shell/Command field, there is a line like this:
    NOTE: This is now inside martus-build/BuildFiles/JenkinsBuildRelease.sh
-     export RELEASE_IDENTIFIER=pre-5.1.1
+     export RELEASE_IDENTIFIER=pre-5.3.0
 
 4. In the app (used in splash screen and Help/About):
    martus-client/source/org/martus/client/swingui/UiConstants.java

martus-build/buildfile-martus-client.rb

@@ -58,7 +58,8 @@ def bcprov_sig_file
 		JCOMMON_SPEC,
 		ORCHID_SPEC,
 		JAVAROSA_SPEC,
-		KXML_SPEC
+		KXML_SPEC,
+		JSON_SPEC
 	)
 
 	build do

martus-build/buildfile-martus-common.rb

@@ -25,6 +25,7 @@ def main_target_dir
 		ORCHID_SPEC,
 		JAVAROSA_SPEC,
 		KXML_SPEC,
+		JSON_SPEC,
 		project('martus-logi').package(:jar),
 		project('martus-utils').package(:jar),
 		project('martus-swing').package(:jar)

martus-build/buildfile-martus-thirdparty.rb

@@ -62,6 +62,10 @@ def dictionary_file(project_name, directory, dictionary_name)
 	install artifact(JAVAROSA_SOURCE_SPEC).from(source_file(name, 'common/JavaRosa', "javarosa-7-30-1015-src.zip"))
 	install artifact(JAVAROSA_LICENSE_SPEC).from(license_file(name, 'common/JavaRosa', 'LICENSE'))
 	install artifact(KXML_SPEC).from(jar_file(name, 'common/JavaRosa', 'kxml2-2.3.0.jar'))
+
+	install artifact(JSON_SPEC).from(jar_file(name, 'common/Json', "json-20160212.jar"))
+	install artifact(JSON_SOURCE_SPEC).from(source_file(name, 'common/Json', "json-20160212-sources.jar"))
+	install artifact(JSON_LICENSE_SPEC).from(license_file(name, 'common/Json', 'LICENSE'))
 
 	#client
 	install artifact(LAYOUTS_SPEC).from(jar_file(name, 'client/jhlabs', 'layouts.jar'))
@@ -132,5 +136,6 @@ def dictionary_file(project_name, directory, dictionary_name)
     p.include(artifact(ORCHID_SPEC), :path=>'ThirdParty')
     p.include(artifact(JAVAROSA_SPEC), :path=>'ThirdParty')
     p.include(artifact(KXML_SPEC), :path=>'ThirdParty')
+    p.include(artifact(JSON_SPEC), :path=>'ThirdParty')
   end
 end

martus-build/buildfile-martus.rb

@@ -88,6 +88,10 @@ def build_kxml_spec(type)
 	return build_spec('kxml', 'kxml', type, '2.3')
 end
 
+def build_json_spec(type)
+	return build_spec('json', 'json', type, '2-12-2016')
+end
+
 def build_layouts_spec(type)
 	return build_spec('com.jhlabs', 'layouts', type, '2006-08-10')
 end
@@ -191,6 +195,10 @@ def build_orchid_spec(type)
 JAVAROSA_LICENSE_SPEC = build_javarosa_spec('license')
 KXML_SPEC = build_kxml_spec('jar')
 
+JSON_SPEC = build_json_spec('jar')
+JSON_SOURCE_SPEC = build_json_spec('sources')
+JSON_LICENSE_SPEC = build_json_spec('license')
+
 # Client, from public repository
 JORTHO_SPEC = build_jortho_spec('jar')
 JORTHO_SOURCE_SPEC = build_jortho_spec('sources')
@@ -370,6 +378,7 @@ def third_party_client_jars
 	jars << artifact(ORCHID_SPEC)
 	jars << artifact(JAVAROSA_SPEC)
 	jars << artifact(KXML_SPEC)
+	jars << artifact(JSON_SPEC)
 	return jars
 end