fixed xmlcli version

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@270 acee48c3-7b26-0410-bdac-b3d0e5314bbc

diff --git a/src/bin/stigmata.nsi b/src/bin/stigmata.nsi
index 18a74b9..497578e 100755 (executable)
--- a/src/bin/stigmata.nsi
+++ b/src/bin/stigmata.nsi
@@ -69,7 +69,7 @@ Section "running-stigmata"
   File "..\..\target\commons-logging-1.0.3.jar"\r
   File "..\..\target\BrowserLauncher2-1.3.jar"\r
   File "..\..\target\Jama-1.0.2.jar"\r
-  File "..\..\target\xmlcli-1.2.1.jar"\r
+  File "..\..\target\xmlcli-1.2.2.jar"\r
   File "..\..\target\asm-all-2.2.3.jar"\r
   File "..\..\target\stax-1.2.0.jar"\r
   File "..\..\target\stax-api-1.0.1.jar"\r
@@ -90,7 +90,7 @@ Section "running-stigmata"
   Delete "$TEMP\target\commons-logging-1.0.3.jar"\r
   Delete "$TEMP\target\BrowserLauncher2-1.3.jar"\r
   Delete "$TEMP\target\Jama-1.0.2.jar"\r
-  Delete "$TEMP\target\xmlcli-1.2.1.jar"\r
+  Delete "$TEMP\target\xmlcli-1.2.2.jar"\r
   Delete "$TEMP\target\asm-all-2.2.3.jar"\r
   Delete "$TEMP\target\stax-1.2.0.jar"\r
   Delete "$TEMP\target\stax-api-1.0.1.jar"\r

diff --git a/src/main/assembly/macosx/Info.plist b/src/main/assembly/macosx/Info.plist
index c51055a..63f9820 100755 (executable)
--- a/src/main/assembly/macosx/Info.plist
+++ b/src/main/assembly/macosx/Info.plist
@@ -40,7 +40,7 @@
         <string>$JAVAROOT/stax-1.2.0.jar</string>
         <string>$JAVAROOT/BrowserLauncher2-1.3.jar</string>
         <string>$JAVAROOT/Jama-1.0.2.jar</string>
-        <string>$JAVAROOT/xmlcli-1.2.1.jar</string>
+        <string>$JAVAROOT/xmlcli-1.2.2.jar</string>
       </array>
       <key>Properties</key>
       <dict>

diff --git a/src/main/java/jp/naist/se/stigmata/Main.java b/src/main/java/jp/naist/se/stigmata/Main.java
index daffebe..ed88557 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/Main.java
+++ b/src/main/java/jp/naist/se/stigmata/Main.java
@@ -35,6 +35,7 @@ import jp.naist.se.stigmata.utils.ConfigFileExporter;
 import jp.sourceforge.talisman.xmlcli.CommandLinePlus;\r
 import jp.sourceforge.talisman.xmlcli.OptionsBuilder;\r
 import jp.sourceforge.talisman.xmlcli.ResourceHelpFormatter;\r
+import jp.sourceforge.talisman.xmlcli.XmlCliConfigurationException;\r
 import jp.sourceforge.talisman.xmlcli.builder.OptionsBuilderFactory;\r
 \r
 import org.apache.commons.cli.CommandLineParser;\r
@@ -43,7 +44,6 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;\r
 import org.apache.commons.cli.PosixParser;\r
 import org.w3c.dom.DOMException;\r
-import org.xml.sax.SAXException;\r
 \r
 /**\r
  * Front end class.\r
@@ -278,9 +278,9 @@ public final class Main{
             Options options = builder.buildOptions();\r
 \r
             return options;\r
-        }catch(DOMException ex){\r
+        }catch(XmlCliConfigurationException ex){\r
             ex.printStackTrace();\r
-        }catch(SAXException ex){\r
+        }catch(DOMException ex){\r
             ex.printStackTrace();\r
         }catch(IOException ex){\r
             ex.printStackTrace();\r