Merge branch 'develop'

diff --git a/README.md b/README.md
index 0dfe9e9..aca79f9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,9 +18,10 @@ NeighborNoteは[http://puma.cis.ibaraki.ac.jp/products/neighbornote/](http://pum
 
 起動方法(MacOSX)
 ------------
-1. ダウンロードしたneighbornote-[version]-osx-installer.appを実行して下さい。
-2. インストーラの指示に従ってインストールを完了してください。
-3. Dockに表示されたNeighborNoteを実行してください。
+1. ダウンロードしたneighbornote-[version]-osx-installer.zipを解凍してください。
+2. 生成されたneighbornote-[version]-osx-installer.appを実行して下さい。
+3. インストーラの指示に従ってインストールを完了してください。
+4. Dockに表示されたNeighborNoteを実行してください。
 
 起動方法(Linux)
 ------------
@@ -32,7 +33,7 @@ NeighborNoteは[http://puma.cis.ibaraki.ac.jp/products/neighbornote/](http://pum
 要件
 ------------
 OpenSSLが必要です。
-Windowsを使っているのであれば、[Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html)から"(Win32/Win64) OpenSSL v0.9.8y Light"をダウンロードしてインストールする必要があるかもしれません。
+Windowsを使っているのであれば、[Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html)から"(Win32/Win64) OpenSSL v0.9.8za Light"をダウンロードしてインストールする必要があるかもしれません。
 Linuxの場合、Ubuntuであれば"sudo apt-get install libssl-dev"コマンドをターミナルで実行することでOpenSSLをインストールできます。
 
 Download
@@ -41,24 +42,25 @@ NeighborNote is available on [http://puma.cis.ibaraki.ac.jp/products/neighbornot
 
 How to Run(Windows)
 ------------
-1. Please run the neighbornote-[version]-windows-installer.exe.
-2. Please complete the installation by following the instructions of the installer.
-3. Please run the NeighborNote that is displayed on the desktop.
+1. Run the neighbornote-[version]-windows-installer.exe.
+2. Complete the installation by following the instructions of the installer.
+3. Run the NeighborNote that is displayed on the desktop.
 
 How to Run(MacOSX)
 ------------
-1. Please run the neighbornote-[version]-osx-installer.app.
-2. Please complete the installation by following the instructions of the installer.
-3. Please run the NeighborNote that is displayed on the dock.
+1. Unzip the neighbornote-[version]-osx-installer.zip.
+2. Run the neighbornote-[version]-osx-installer.app.
+3. Complete the installation by following the instructions of the installer.
+4. Run the NeighborNote that is displayed on the dock.
 
 How to Run(Linux)
 ------------
-1. Please run the neighbornote-[version]-linux-installer.run.
-2. Please complete the installation by following the instructions of the installer.
-3. Please run the NeighborNote that is displayed on the desktop.
+1. Run the neighbornote-[version]-linux-installer.run.
+2. Complete the installation by following the instructions of the installer.
+3. Run the NeighborNote that is displayed on the desktop.
 
 Requirements
 ------------
 OpenSSL is needed.
-If you are using Windows, you may need to download and install "(Win32/Win64) OpenSSL v0.9.8y Light" from [Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html).
+If you are using Windows, you may need to download and install "(Win32/Win64) OpenSSL v0.9.8za Light" from [Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html).
 On Linux, if you are using Ubuntu, you can install the OpenSSL with "sudo apt-get install libssl-dev" command at a terminal prompt.

diff --git a/installbuilder/installbuilder_mac.xml b/installbuilder/installbuilder_mac.xml
index 8b19da7..af25bed 100755 (executable)
--- a/installbuilder/installbuilder_mac.xml
+++ b/installbuilder/installbuilder_mac.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>neighbornote</shortName>
     <fullName>NeighborNote</fullName>
-    <version>0.5</version>
+    <version>0.5.1</version>
     <readmeFile>/Users/takahashi/Desktop/NeighborNote/README.md</readmeFile>
     <licenseFile>/Users/takahashi/Desktop/NeighborNote/LICENSE</licenseFile>
     <logoImage>/Users/takahashi/Desktop/NeighborNote/installbuilder/installerLogo.png</logoImage>

diff --git a/installbuilder/neighbornote-osx.app/Contents/MacOS/neighbornote-osx.sh b/installbuilder/neighbornote-osx.app/Contents/MacOS/neighbornote-osx.sh
index d581549..8351028 100755 (executable)
--- a/installbuilder/neighbornote-osx.app/Contents/MacOS/neighbornote-osx.sh
+++ b/installbuilder/neighbornote-osx.app/Contents/MacOS/neighbornote-osx.sh
@@ -102,8 +102,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNTOE/lib/lucene-analyzers-3.6.2.jar
-NN_CLASSPATH=$NN_CLASSPATH;$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-analyzers-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-ooxml-3.7.jar

diff --git a/neighbornote-osx b/neighbornote-osx
index 879aeda..d649ff7 100644 (file)
--- a/neighbornote-osx
+++ b/neighbornote-osx
@@ -102,8 +102,8 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jazzy.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/jtidy-r938.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/libthrift.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/log4j-1.2.14.jar
-NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNTOE/lib/lucene-analyzers-3.6.2.jar
-NN_CLASSPATH=$NN_CLASSPATH;$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-analyzers-3.6.2.jar
+NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/lucene-core-3.6.2.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/pdfbox-app-1.6.0.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-3.7-20101029.jar
 NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/poi-ooxml-3.7.jar

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 9d8f87a..f71934d 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -69,8 +69,8 @@ import cx.fbn.nevernote.utilities.Pair;
 
 public class Global {
        // Set current version and the known versions.
-       public static String version = "0.5";
-       public static String[] validVersions = {"0.5", "0.4.1", "0.4", "0.3", "0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"};
+       public static String version = "0.5.1";
+       public static String[] validVersions = {"0.5.1", "0.5", "0.4.1", "0.4", "0.3", "0.2", "0.1.3", "0.1.2", "0.1.1", "0.1"};
        
     public static String username = ""; 
     //public static String password = "";