[utilities COMMIT] in /xmlsectool/trunk: doc/RELEASE-NOTES.txt src/main/bash/xmlsectool.sh src/main/java/edu/internet...

[noreply at shibboleth.net]

Author: iay
Date: Tue Mar  5 06:20:04 2013
New Revision: 333

URL: http://svn.shibboleth.net/view/utilities?rev=333&view=rev
Log:
XSTJ-22 Non-zero exit codes from shell script
Added codes for the two conditions in question, documented in the main class by defining additional exit code values there.

Modified:
    xmlsectool/trunk/doc/RELEASE-NOTES.txt
    xmlsectool/trunk/src/main/bash/xmlsectool.sh
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java

Modified: xmlsectool/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/doc/RELEASE-NOTES.txt?rev=333&r1=332&r2=333&view=diff
==============================================================================
--- xmlsectool/trunk/doc/RELEASE-NOTES.txt (original)
+++ xmlsectool/trunk/doc/RELEASE-NOTES.txt Tue Mar  5 06:20:04 2013
@@ -1,5 +1,6 @@
 Changes in Release 1.2.0
 =============================================
+[XSTJ-22] - non-zero exit codes from shell script
 [XSTJ-17] - multiple errors in --help documentation
 
 Changes in Release 1.1.4

Modified: xmlsectool/trunk/src/main/bash/xmlsectool.sh
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/bash/xmlsectool.sh?rev=333&r1=332&r2=333&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/bash/xmlsectool.sh (original)
+++ xmlsectool/trunk/src/main/bash/xmlsectool.sh Tue Mar  5 06:20:04 2013
@@ -1,4 +1,9 @@
 #! /bin/bash
+
+#
+# See the Javadoc for the XmlSecTool main class for documentation
+# of non-zero exit codes.
+#
 
 declare LOCATION
 declare COMMAND
@@ -11,7 +16,7 @@
 
 if [ -z "$JAVA_HOME" ] ; then
   echo "ERROR: JAVA_HOME environment variable is not set."
-  exit
+  exit 8
 else
   if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
     # IBM's JDK on AIX uses strange locations for the executables
@@ -24,7 +29,7 @@
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
   echo "  We cannot execute $JAVACMD"
-  exit
+  exit 9
 fi
 
 LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip

Modified: xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java?rev=333&r1=332&r2=333&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java (original)
+++ xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java Tue Mar  5 06:20:04 2013
@@ -113,6 +113,12 @@
 
     /** Return code indicating indicating that signing or signature verification failed, {@value} . */
     public static final int RC_SIG = 7;
+    
+    /** Return code indicating that the JAVA_HOME variable is not set within the shell script, {@value} . */
+    public static final int RC_NOHOME = 8;
+    
+    /** Return code indicating that the "java" command is not executable within the shell script, {@value} . */
+    public static final int RC_NOJAVA = 9;
 
     /** Return code indicating an unknown error occurred, {@value} . */
     public static final int RC_UNKNOWN = -1;