Merge branch 'master' of https://github.com/sgsinclair/VoyantServer.git

Conflicts: build.xml server-settings.txt src/org/aw20/jettydesktop/ui/Executor.java
sgsinclair · Mar 13, 2017 · 452a157 · 452a157
2 parents 3875b9a + d337911
commit 452a157
Show file tree

Hide file tree

Showing 278 changed files with 23 additions and 9,515 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,8 +17,9 @@ local.properties
 .settings/
 /target
 src/main/webapp/WEB-INF/classes
-/_app
-/dist
-/VoyantServerNoNlp.zip
-/VoyantServer.zip
-/logs
+/_app
+/dist
+/VoyantServerNoNlp.zip
+/VoyantServer.zip
+/logs
+/data
diff --git a/data/tmp.voyant.uploads/tmp.voyant.uploads3433845947664555553/Austen.zip b/data/tmp.voyant.uploads/tmp.voyant.uploads3433845947664555553/Austen.zip
diff --git a/data/tmp.voyant.uploads/tmp.voyant.uploads8963569801100392189/shakespeare-plays-text.zip b/data/tmp.voyant.uploads/tmp.voyant.uploads8963569801100392189/shakespeare-plays-text.zip
diff --git a/data/trombone4_2/corpora/austen/metadata.xml b/data/trombone4_2/corpora/austen/metadata.xml
diff --git a/data/trombone4_2/corpora/austen/parameters.xml b/data/trombone4_2/corpora/austen/parameters.xml
diff --git a/data/trombone4_2/corpora/shakespeare/metadata.xml b/data/trombone4_2/corpora/shakespeare/metadata.xml
diff --git a/data/trombone4_2/corpora/shakespeare/parameters.xml b/data/trombone4_2/corpora/shakespeare/parameters.xml
diff --git a/data/trombone4_2/lucene/_0.cfe b/data/trombone4_2/lucene/_0.cfe
diff --git a/data/trombone4_2/lucene/_0.cfs b/data/trombone4_2/lucene/_0.cfs
diff --git a/data/trombone4_2/lucene/_0.si b/data/trombone4_2/lucene/_0.si
diff --git a/data/trombone4_2/lucene/_1.cfe b/data/trombone4_2/lucene/_1.cfe
diff --git a/data/trombone4_2/lucene/_1.cfs b/data/trombone4_2/lucene/_1.cfs
diff --git a/data/trombone4_2/lucene/_1.si b/data/trombone4_2/lucene/_1.si
diff --git a/data/trombone4_2/lucene/_2.cfe b/data/trombone4_2/lucene/_2.cfe
diff --git a/data/trombone4_2/lucene/_2.cfs b/data/trombone4_2/lucene/_2.cfs
diff --git a/data/trombone4_2/lucene/_2.si b/data/trombone4_2/lucene/_2.si
diff --git a/data/trombone4_2/lucene/_3.cfe b/data/trombone4_2/lucene/_3.cfe
diff --git a/data/trombone4_2/lucene/_3.cfs b/data/trombone4_2/lucene/_3.cfs
diff --git a/data/trombone4_2/lucene/_3.si b/data/trombone4_2/lucene/_3.si
diff --git a/data/trombone4_2/lucene/_4.cfe b/data/trombone4_2/lucene/_4.cfe
diff --git a/data/trombone4_2/lucene/_4.cfs b/data/trombone4_2/lucene/_4.cfs
diff --git a/data/trombone4_2/lucene/_4.si b/data/trombone4_2/lucene/_4.si
diff --git a/data/trombone4_2/lucene/_5.cfe b/data/trombone4_2/lucene/_5.cfe
diff --git a/data/trombone4_2/lucene/_5.cfs b/data/trombone4_2/lucene/_5.cfs
diff --git a/data/trombone4_2/lucene/_5.si b/data/trombone4_2/lucene/_5.si
diff --git a/data/trombone4_2/lucene/_6.cfe b/data/trombone4_2/lucene/_6.cfe
diff --git a/data/trombone4_2/lucene/_6.cfs b/data/trombone4_2/lucene/_6.cfs
diff --git a/data/trombone4_2/lucene/_6.si b/data/trombone4_2/lucene/_6.si
diff --git a/data/trombone4_2/lucene/_7.cfe b/data/trombone4_2/lucene/_7.cfe
diff --git a/data/trombone4_2/lucene/_7.cfs b/data/trombone4_2/lucene/_7.cfs
diff --git a/data/trombone4_2/lucene/_7.si b/data/trombone4_2/lucene/_7.si
diff --git a/data/trombone4_2/lucene/_8.cfe b/data/trombone4_2/lucene/_8.cfe
diff --git a/data/trombone4_2/lucene/_8.cfs b/data/trombone4_2/lucene/_8.cfs
diff --git a/data/trombone4_2/lucene/_8.si b/data/trombone4_2/lucene/_8.si
diff --git a/data/trombone4_2/lucene/_9.cfe b/data/trombone4_2/lucene/_9.cfe
diff --git a/data/trombone4_2/lucene/_9.cfs b/data/trombone4_2/lucene/_9.cfs
diff --git a/data/trombone4_2/lucene/_9.si b/data/trombone4_2/lucene/_9.si
diff --git a/data/trombone4_2/lucene/_a.cfe b/data/trombone4_2/lucene/_a.cfe
diff --git a/data/trombone4_2/lucene/_a.cfs b/data/trombone4_2/lucene/_a.cfs
diff --git a/data/trombone4_2/lucene/_a.si b/data/trombone4_2/lucene/_a.si
diff --git a/data/trombone4_2/lucene/_b.cfe b/data/trombone4_2/lucene/_b.cfe
diff --git a/data/trombone4_2/lucene/_b.cfs b/data/trombone4_2/lucene/_b.cfs
diff --git a/data/trombone4_2/lucene/_b.si b/data/trombone4_2/lucene/_b.si
diff --git a/data/trombone4_2/lucene/_c.cfe b/data/trombone4_2/lucene/_c.cfe
diff --git a/data/trombone4_2/lucene/_c.cfs b/data/trombone4_2/lucene/_c.cfs
diff --git a/data/trombone4_2/lucene/_c.si b/data/trombone4_2/lucene/_c.si
diff --git a/data/trombone4_2/lucene/_d.cfe b/data/trombone4_2/lucene/_d.cfe
diff --git a/data/trombone4_2/lucene/_d.cfs b/data/trombone4_2/lucene/_d.cfs
diff --git a/data/trombone4_2/lucene/_d.si b/data/trombone4_2/lucene/_d.si
diff --git a/data/trombone4_2/lucene/_e.cfe b/data/trombone4_2/lucene/_e.cfe
diff --git a/data/trombone4_2/lucene/_e.cfs b/data/trombone4_2/lucene/_e.cfs
diff --git a/data/trombone4_2/lucene/_e.si b/data/trombone4_2/lucene/_e.si
diff --git a/data/trombone4_2/lucene/_f.cfe b/data/trombone4_2/lucene/_f.cfe
diff --git a/data/trombone4_2/lucene/_f.cfs b/data/trombone4_2/lucene/_f.cfs
diff --git a/data/trombone4_2/lucene/_f.si b/data/trombone4_2/lucene/_f.si
diff --git a/data/trombone4_2/lucene/_g.fdt b/data/trombone4_2/lucene/_g.fdt
diff --git a/data/trombone4_2/lucene/_g.fdx b/data/trombone4_2/lucene/_g.fdx
diff --git a/data/trombone4_2/lucene/_g.fnm b/data/trombone4_2/lucene/_g.fnm
diff --git a/data/trombone4_2/lucene/_g.nvd b/data/trombone4_2/lucene/_g.nvd
diff --git a/data/trombone4_2/lucene/_g.nvm b/data/trombone4_2/lucene/_g.nvm
diff --git a/data/trombone4_2/lucene/_g.si b/data/trombone4_2/lucene/_g.si
diff --git a/data/trombone4_2/lucene/_g.tvd b/data/trombone4_2/lucene/_g.tvd
diff --git a/data/trombone4_2/lucene/_g.tvx b/data/trombone4_2/lucene/_g.tvx
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.doc b/data/trombone4_2/lucene/_g_Lucene50_0.doc
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.dvd b/data/trombone4_2/lucene/_g_Lucene50_0.dvd
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.dvm b/data/trombone4_2/lucene/_g_Lucene50_0.dvm
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.pay b/data/trombone4_2/lucene/_g_Lucene50_0.pay
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.pos b/data/trombone4_2/lucene/_g_Lucene50_0.pos
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.tim b/data/trombone4_2/lucene/_g_Lucene50_0.tim
diff --git a/data/trombone4_2/lucene/_g_Lucene50_0.tip b/data/trombone4_2/lucene/_g_Lucene50_0.tip
diff --git a/data/trombone4_2/lucene/segments_2 b/data/trombone4_2/lucene/segments_2
diff --git a/data/trombone4_2/lucene/write.lock b/data/trombone4_2/lucene/write.lock
diff --git a/data/trombone4_2/object-storage/21ba5d02d26efdd632c2a4b4865552be b/data/trombone4_2/object-storage/21ba5d02d26efdd632c2a4b4865552be
diff --git a/data/trombone4_2/object-storage/397dfdf4228221fd89acfbc17382ded9 b/data/trombone4_2/object-storage/397dfdf4228221fd89acfbc17382ded9
diff --git a/data/trombone4_2/object-storage/9df022d9a8434f2b47ad302513e21615 b/data/trombone4_2/object-storage/9df022d9a8434f2b47ad302513e21615
diff --git a/data/trombone4_2/object-storage/austen-langs b/data/trombone4_2/object-storage/austen-langs
diff --git a/data/trombone4_2/object-storage/austen-lexicalLastTokenPositions b/data/trombone4_2/object-storage/austen-lexicalLastTokenPositions
diff --git a/data/trombone4_2/object-storage/austen-lexicalTokenCounts b/data/trombone4_2/object-storage/austen-lexicalTokenCounts
diff --git a/data/trombone4_2/object-storage/austen-lexicalTypesCountMeans-1 b/data/trombone4_2/object-storage/austen-lexicalTypesCountMeans-1
diff --git a/data/trombone4_2/object-storage/austen-lexicalTypesCountStdDevs-1 b/data/trombone4_2/object-storage/austen-lexicalTypesCountStdDevs-1
diff --git a/data/trombone4_2/object-storage/cc64cc58f9429b622edfb2bb5bfcbf5c b/data/trombone4_2/object-storage/cc64cc58f9429b622edfb2bb5bfcbf5c
diff --git a/data/trombone4_2/object-storage/mapdb-austen-corpusTermMinimals-lexical b/data/trombone4_2/object-storage/mapdb-austen-corpusTermMinimals-lexical
diff --git a/data/trombone4_2/object-storage/mapdb-austen-corpusTermMinimals-lexical.p b/data/trombone4_2/object-storage/mapdb-austen-corpusTermMinimals-lexical.p
diff --git a/data/trombone4_2/object-storage/mapdb-shakespeare-corpusTermMinimals-lexical b/data/trombone4_2/object-storage/mapdb-shakespeare-corpusTermMinimals-lexical
diff --git a/data/trombone4_2/object-storage/mapdb-shakespeare-corpusTermMinimals-lexical.p b/data/trombone4_2/object-storage/mapdb-shakespeare-corpusTermMinimals-lexical.p
diff --git a/data/trombone4_2/object-storage/shakespeare-langs b/data/trombone4_2/object-storage/shakespeare-langs
diff --git a/data/trombone4_2/object-storage/shakespeare-lexicalLastTokenPositions b/data/trombone4_2/object-storage/shakespeare-lexicalLastTokenPositions
diff --git a/data/trombone4_2/object-storage/shakespeare-lexicalTokenCounts b/data/trombone4_2/object-storage/shakespeare-lexicalTokenCounts