1:53 p.m.
Author: rareddy
Date: 2009-07-28 14:53:00 -0400 (Tue, 28 Jul 2009)
New Revision: 1198
Added:
trunk/build/kit-adminshell/log.properties
Modified:
trunk/adminshell/src/main/resources/scripts/server.bsh
trunk/adminshell/src/main/resources/scripts/util.bsh
trunk/build/kit-adminshell/adminshell.bat
trunk/build/kit-adminshell/adminshell.sh
Log:
TEIID-224: making error reporting less verbose during the connect and shutdown.
Modified: trunk/adminshell/src/main/resources/scripts/server.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/server.bsh 2009-07-28 18:30:48 UTC (rev
1197)
+++ trunk/adminshell/src/main/resources/scripts/server.bsh 2009-07-28 18:53:00 UTC (rev
1198)
@@ -46,11 +46,13 @@
currentContext().internalAdmin =
createExceptionHandlingProxy(mmConn.getAdminAPI());
return mmConn;
} catch(e) {
- print("Failed to connect: "+e.getMessage());
+ print("Failed to connect: {"+e.getMessage()+"}");
+ return null;
}
}
else {
print("Wrong syntax for the URL.. connection failed");
+ return null;
}
}
Modified: trunk/adminshell/src/main/resources/scripts/util.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/util.bsh 2009-07-28 18:30:48 UTC (rev
1197)
+++ trunk/adminshell/src/main/resources/scripts/util.bsh 2009-07-28 18:53:00 UTC (rev
1198)
@@ -183,12 +183,11 @@
if (ex instanceof AdminException) {
print("Error:"+ex.getMessage());
}
- } catch(AdminComponentException e) {
- print(e.getClass().getName() +" Error:"+e.getMessage());
- } catch (AdminProcessingException e) {
- print(e.getClass().getName() +" Error:"+e.getMessage());
} catch(Throwable t) {
- print(t.getClass().getName() +" Error:"+e.getMessage());
+ msg = t.getMessage();
+ if (msg != null) {
+ print(msg);
+ }
}
return null;
}
Modified: trunk/build/kit-adminshell/adminshell.bat
===================================================================
--- trunk/build/kit-adminshell/adminshell.bat 2009-07-28 18:30:48 UTC (rev 1197)
+++ trunk/build/kit-adminshell/adminshell.bat 2009-07-28 18:53:00 UTC (rev 1198)
@@ -57,6 +57,7 @@
rem JVM memory allocation pool parameters. Modify as appropriate.
set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx256m -XX:MaxPermSize=256m
+set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.config.file=log.properties
echo ===============================================================================
echo.
Modified: trunk/build/kit-adminshell/adminshell.sh
===================================================================
--- trunk/build/kit-adminshell/adminshell.sh 2009-07-28 18:30:48 UTC (rev 1197)
+++ trunk/build/kit-adminshell/adminshell.sh 2009-07-28 18:53:00 UTC (rev 1198)
@@ -61,8 +61,9 @@
fi
TEIID_CLASSPATH="$TEIID_HOME/lib/patches/*:$TEIID_HOME/lib/*"
+JAVA_OPTS="$JAVA_OPTS -Xms128m -Xmx256m -XX:MaxPermSize=256m"
+JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.config.file=log.properties"
-
# Print the env settings
echo
"========================================================================="
echo ""
@@ -75,4 +76,4 @@
echo
"========================================================================="
echo ""
-$JAVA -cp $TEIID_CLASSPATH -Xmx256m org.teiid.AdminShell $*
\ No newline at end of file
+$JAVA $JAVA_OPTS -cp $TEIID_CLASSPATH -Xmx256m org.teiid.AdminShell $*
\ No newline at end of file
Added: trunk/build/kit-adminshell/log.properties
===================================================================
--- trunk/build/kit-adminshell/log.properties (rev 0)
+++ trunk/build/kit-adminshell/log.properties 2009-07-28 18:53:00 UTC (rev 1198)
@@ -0,0 +1,17 @@
+# Specify the handlers to create in the root logger
+# (all loggers are children of the root logger)
+# The following creates two handlers
+handlers = java.util.logging.ConsoleHandler
+
+# Set the default logging level for the root logger
+.level = OFF
+
+# Set the default logging level for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.level = INFO
+
+# Set the default formatter for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+# Set the default logging level for the logger named com.mycompany
+org.teiid = OFF
+
Property changes on: trunk/build/kit-adminshell/log.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain