From 99291d67baebc17d3cd813a62272f1de169ecd7e Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 12 Feb 2015 10:20:16 +0100
Subject: [PATCH 1/4] fix ant version

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 0df5473..fd7fbb6 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="xar" name="proofMEIdata">
   
-  <property name="project.version" value="0.5.0-alpha"/>
+  <property name="project.version" value="0.7.0-beta"/>
   <property name="project.app" value="FreiDi-topicMapViz"/>
   <property name="build.dir" value="build"/>
   

From 07982bdf7e00ef927106cee1ded06fe4574130ab Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 12 Feb 2015 10:26:48 +0100
Subject: [PATCH 2/4] update version and remove tm--converter from bower

---
 bower.json     | 5 ++---
 build.xml      | 2 +-
 expath-pkg.xml | 2 +-
 package.json   | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 65c20b5..3adbd5c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "FreiDi:topicMapViz",
-  "version": "0.7.0-beta",
+  "version": "0.7.1-beta",
   "authors": [
     "Benjamin W. Bohl <bohl@edirom.de>"
   ],
@@ -24,7 +24,6 @@
     "jquery": "~2.1.1",
     "bootstrap": "~3.2.0",
     "d3": "~3.4.13",
-    "bootstrap-list-filter": "https://github.com/stefanocudini/bootstrap-list-filter/releases/tag/v0.1.7",
-    "tm-converter": "svn+http://topic-maps.googlecode.com/svn/tm-converter/"
+    "bootstrap-list-filter": "https://github.com/stefanocudini/bootstrap-list-filter/releases/tag/v0.1.7"
   }
 }
diff --git a/build.xml b/build.xml
index fd7fbb6..7e7b8c4 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="xar" name="proofMEIdata">
   
-  <property name="project.version" value="0.7.0-beta"/>
+  <property name="project.version" value="0.7.1-beta"/>
   <property name="project.app" value="FreiDi-topicMapViz"/>
   <property name="build.dir" value="build"/>
   
diff --git a/expath-pkg.xml b/expath-pkg.xml
index f09cac3..f8092b1 100644
--- a/expath-pkg.xml
+++ b/expath-pkg.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://freischuetz-digital.de/topicMapViz" abbrev="topicMapViz" version="0.7.0-beta" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://freischuetz-digital.de/topicMapViz" abbrev="topicMapViz" version="0.7.1-beta" spec="1.0">
     <title>FreiDi:topicMapViz</title>
 </package>
\ No newline at end of file
diff --git a/package.json b/package.json
index 09da85c..6f412e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FreiDi-topicMapViz",
-  "version": "0.7.0-beta",
+  "version": "0.7.1-beta",
   "repository": {
     "type": "git",
     "url": "git://github.com/Freischuetz-Digital/topicMapViz.git"

From f9527b1ccdfa75075dc4834438c51cd5ce4e2593 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 12 Feb 2015 10:33:44 +0100
Subject: [PATCH 3/4] fix wrong version number for jtm transform

---
 data/xql/getJSONtopicMap.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/xql/getJSONtopicMap.xql b/data/xql/getJSONtopicMap.xql
index 64e3b8b..f4a1c88 100644
--- a/data/xql/getJSONtopicMap.xql
+++ b/data/xql/getJSONtopicMap.xql
@@ -7,7 +7,7 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
  let $doc := xmldb:document($config:app-root||'/topicMaps/FreiDi_TopicMap_2.xml')
  let $xslt := xmldb:document($config:app-root||'/data/tm-converter/xtm2tojtm1.xsl')
  
- let $jtm := transform:transform($doc, $xslt, ())
+ let $jtm := transform:transform($doc, $xslt, <parameters><param name="jtm_version" value="1.1"/></parameters>)
  
  return
   $jtm
\ No newline at end of file

From 0557ec21229deb843e28ee23d015cc14f6cf7085 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 12 Feb 2015 10:33:55 +0100
Subject: [PATCH 4/4] fix missing ant incudes

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 7e7b8c4..d4cb7b3 100644
--- a/build.xml
+++ b/build.xml
@@ -9,6 +9,6 @@
     <mkdir dir="${build.dir}"/>
     <zip basedir="." destfile="${build.dir}/${project.app}-${project.version}.xar"
       excludes="**/bower_components/*"
-      includes="templates/*, about.html, controller.xql, modules/*, error-page.html, repo.xml, expath-pkg.xml, index.html, data/**, src/**,bower_components/bootstrap/dist/css/bootstrap.min.css,bower_components/bootstrap/dist/css/bootstrap-theme.min.css,dist/bower.js, bower_components/bootstrap/dist/js/bootstrap.min.js, topicMaps/FreiDi_TopicMap_2.xml"/>
+      includes="templates/*, about.html, controller.xql, modules/*, error-page.html, repo.xml, expath-pkg.xml, index.html, data/**, src/**,bower_components/bootstrap/dist/css/bootstrap.min.css,bower_components/bootstrap/dist/css/bootstrap-theme.min.css,dist/**, bower_components/bootstrap/dist/js/bootstrap.min.js, topicMaps/FreiDi_TopicMap_2.xml"/>
   </target>
 </project>
\ No newline at end of file