update to version 2.1

.classpath

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="libs/oauth/scribe-1.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/oauth/commons-codec-1.5.jar"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="libs/apacheCommons/commons-io-2.1.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="lib" path="libs/jdom/jdom-1.1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/cordova-2.8.1.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="lib" path="libs/cordova-2.8.1-mod.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

@@ -1,3 +1,4 @@
 /bin
 /gen
 /build.settings
+/public_release-diff-info.txt

README.md

@@ -21,4 +21,3 @@ The StarterKit provides basic capabilities for recognizing speech input (ASR, us
 ----
 
 If not stated otherwise, the code, resource files etc. is provided under the MIT license (see the license file).
-

assets/www/javascripts/tools/calendarClient.js → assets/www/appStarterKit/calendar_client.js

@@ -99,31 +99,35 @@ function SendRequestException(responseText, responseXML, msg, fail) {
 }
 
 function sendRequest(url, credentials, body, method, headers) {
-    var response;
-    $.ajax(url, {
-	type: method,
-        contentType: 'text/calendar; charset=UTF-8',
-        dataType: 'html',
-	data: body,
-        processData: false,
-	async: false,
-        crossDomain: true,
-        headers: $.extend({'Authorization': 'BASIC ' + credentials }, headers),
-	timeout: 5000
-        // xhrFields: { withCredentials: true }
-    }).done(function (res) {
-        // alert(res);
-	response = res;
-    }).error(function (xhr, msg, fail) {
-        // window.alert();
-	if (typeof(xhr) !== 'undefined') {
-	    throw new SendRequestException(xhr.responseText, xhr.responseXML, msg, fail);
-	} else {
-	    throw "send request failed " + msg + "  " + fail;
-	}
-    });
+	var response;
+	var options = {
+		type: method,
+		contentType: 'text/calendar; charset=UTF-8',
+		dataType: 'html',
+		data: body,
+		processData: false,
+		async: false,
+		crossDomain: true,
+		headers: $.extend({'Authorization': 'BASIC ' + credentials }, headers),
+		timeout: 5000
+		// xhrFields: { withCredentials: true }
+	};
+
+	console.info('Sending AJAX request with options: '+JSON.stringify(options));
+
+	$.ajax(url, options).done(function (res) {
+		// alert(res);
+		response = res;
+	}).error(function (xhr, msg, fail) {
+		// window.alert();
+		if (typeof(xhr) !== 'undefined') {
+			throw new SendRequestException(xhr.responseText, xhr.responseXML, msg, fail);
+		} else {
+			throw "send request failed " + msg + "  " + fail;
+		}
+	});
 
-    return response;
+	return response;
 }
 
 // =========== Base64 encoder
@@ -679,7 +683,7 @@ function CalDavCalendarClient(uri, user, password) {
 	var events = [],
 	    xmlParseStart, xmlParseEnd, calendarContent, found, start, end,
 	    lines, line, level, beginRegExp, endRegExp, reminders, curDataStack, curData, i, r, splitter, parsed,
-	    calDavLine = /^[A-Za-z\-;=/]+:.*?\r\n/,
+	    calDavLine = /^[A-Za-z\-;=\/]+:.*?\r\n/,
 	    calDavNewLine = /^\s.*?\r\n/;
 
 	// parse out calendar from xml data

assets/www/config/configuration.json

@@ -7,7 +7,7 @@
     "HTML5InputSilenceBuffer": "2000000",
     "HTML5InputWebSocketAddress": "ws://127.0.0.1:9999",
     "HTML5InputSoundPackageSize": "4096",
-    "HTML5InputSilenceDetectorPath": "javascripts/mediators/silenceDetection.js",
+    "HTML5InputSilenceDetectorPath": "mmirf/env/media/silenceDetection.js",
     "HTML5OutputServerBasePath": "http://mary.dfki.de:59125/",
     "autoLogin": "true",
     "TEST_prefetchRemoteResources": "false",

assets/www/config/directories.json

@@ -0,0 +1 @@
+{"/controllers":["application.js","calendar.js"],"/views":["application","calendar","layouts"],"/views/application":["login.ehtml","registration.ehtml","welcome.ehtml","~languageMenu.ehtml"],"/views/calendar":["create_appointment.ehtml"],"/views/layouts":["application.ehtml"],"/models":["calendarModel.js","user.js"],"/config":["languages","statedef","configuration.json","directories.json"],"/config/languages":["de","en"],"/config/languages/de":["dictionary.dic","grammar.json","grammar.json.MD5","speaker.json"],"/config/languages/en":["dictionary.dic","speaker.json"],"/config/statedef":["dialogDescriptionSCXML.xml","dialogDescriptionSCXML.xml.MD5","inputDescriptionSCXML.xml","inputDescriptionSCXML.xml.MD5","readme.txt","scxml2js.bat","scxml2js.sh"],"/mmirf/plugins":["beepPlugin.js","cookiePlugin.js","directoryListing.js","multitouchPlugin.js","nativeTTS.js","nuance.js","queuePlugin.js","softkeyboard.js","video.js"],"/helpers":["applicationHelper.js"],"/gen/grammar":["de_grammar.js"]}

assets/www/config/languages/de/grammar.json.MD5

@@ -0,0 +1 @@
+b5cb6b265edec7fba9a67d7cd566f7a4

assets/www/config/languages/en/grammar.json.MD5

@@ -0,0 +1 @@
+673bae1b4633751d85d39b54cac272b5