[jbpm-commits] JBoss JBPM SVN: r2836 - in projects/gwt-console/trunk: war and 6 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-11-10 03:21:20 -0500 (Mon, 10 Nov 2008) New Revision: 2836 Modified: projects/gwt-console/trunk/gwt-console.iml projects/gwt-console/trunk/pom.xml projects/gwt-console/trunk/war/pom.xml projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml Log: Switch to gwt-log Modified: projects/gwt-console/trunk/gwt-console.iml =================================================================== --- projects/gwt-console/trunk/gwt-console.iml 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/gwt-console.iml 2008-11-10 08:21:20 UTC (rev 2836) @@ -549,6 +549,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/pom.xml =================================================================== --- projects/gwt-console/trunk/pom.xml 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/pom.xml 2008-11-10 08:21:20 UTC (rev 2836) @@ -19,6 +19,7 @@ <gwt.version>1.5.2</gwt.version> <gchart.version>2.2</gchart.version> <gwtext.version>2.0.5</gwtext.version> + <gwt-log.version>2.5.2</gwt-log.version> <stax-api.version>1.0-2</stax-api.version> <jaf.version>1.1</jaf.version> <resteasy.version>1.0-beta-8</resteasy.version> @@ -82,6 +83,11 @@ <artifactId>gson</artifactId> <version>${gson.version}</version> </dependency> + <dependency> + <groupId>com.google.code.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + <version>${gwt-log.version}</version> + </dependency> <!-- Other --> <dependency> Modified: projects/gwt-console/trunk/war/pom.xml =================================================================== --- projects/gwt-console/trunk/war/pom.xml 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/pom.xml 2008-11-10 08:21:20 UTC (rev 2836) @@ -58,6 +58,10 @@ <groupId>com.google.gwt</groupId> <artifactId>gchart</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + </dependency> <dependency> <groupId>javax.xml.stream</groupId> Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -1,6 +1,9 @@ package org.jboss.bpm.console.client; import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DeferredCommand; +import com.allen_sauer.gwt.log.client.Log; /** * Entry point classes define <code>onModuleLoad()</code>. @@ -10,9 +13,30 @@ private MainView mainView; /** + * Note, we defer all application initialization code to + * {@link #onModuleLoad2()} so that the UncaughtExceptionHandler + * can catch any unexpected exceptions. + */ + public void onModuleLoad() { + /* Install an UncaughtExceptionHandler which will + * produce <code>FATAL</code> log messages + */ + Log.setUncaughtExceptionHandler(); + + /* Use a deferred command so that the UncaughtExceptionHandler + * catches any exceptions in onModuleLoad2() + */ + DeferredCommand.addCommand(new Command() { + public void execute() { + onModuleLoad2(); + } + }); + } + + /** * This is the entry point method. */ - public void onModuleLoad() + public void onModuleLoad2() { mainView = new MainView(); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -23,6 +23,7 @@ import com.google.gwt.http.client.*; import com.google.gwt.core.client.GWT; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.model.DTOParser; import java.util.List; @@ -73,7 +74,7 @@ this.username = user; // discard password - System.out.println("Authentication against: " + rb.getUrl()); + Log.debug("Authentication against: " + rb.getUrl()); if(user!=null&&pass!=null) { Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -37,6 +37,7 @@ import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; import com.gwtext.client.widgets.layout.VerticalLayout; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.metric.MetricOverviewEditor; import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; import org.jboss.bpm.console.client.task.TaskListEditor; @@ -181,8 +182,7 @@ public void onLoginFailed(Request request, Throwable t) { // auth failed - setError("Authentication failed." +t.getMessage()); - t.printStackTrace(System.out); + Log.error("Authentication failed.", t); } } ); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -25,6 +25,8 @@ import java.util.List; +import com.allen_sauer.gwt.log.client.Log; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -37,6 +39,8 @@ { this.consoleServerUrl = consoleServerUrl; this.webContext = webContext; + + Log.debug("Using gwt-console-server: " + consoleServerUrl + "/" +webContext); } public String getConsoleServerUrl() Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -22,6 +22,7 @@ package org.jboss.bpm.console.client.model; import com.google.gwt.json.client.*; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.model.forms.FieldDef; import org.jboss.bpm.console.client.model.forms.FormDef; import org.jboss.bpm.console.client.util.JSONWalk; @@ -86,7 +87,7 @@ public static TaskReference parseTaskReference(JSONObject item) { - System.out.println("Parsing " + item.toString()); + Log.debug("Parsing " + item.toString()); long id = JSONWalk.on(item).next("id").asLong(); long tokenId = JSONWalk.on(item).next("tokenId").asLong(); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -29,6 +29,7 @@ import com.gwtext.client.widgets.event.PanelListenerAdapter; import com.gwtext.client.widgets.grid.ColumnConfig; import com.gwtext.client.widgets.grid.ColumnModel; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.model.ProcessDefinition; import org.jboss.bpm.console.client.widgets.RemoteListView; @@ -124,8 +125,7 @@ public void onError(Request request, Throwable t) { // auth failed - view.setError("Failed to remove process definition: "+t.getMessage()); - t.printStackTrace(System.out); + Log.error("Failed to remove process definition", t); } }); } @@ -163,7 +163,7 @@ i++; } - System.out.println("Loaded " + row2ProcessMap.size() + " process definitions"); + Log.debug("Loaded " + row2ProcessMap.size() + " process definitions"); } public List<ProcessDefinition> getAvailableProcessDefinitions() Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -27,6 +27,7 @@ import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.PanelListenerAdapter; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.model.ProcessInstance; import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo; @@ -69,7 +70,6 @@ { public boolean doBeforeRender(Component component) { - System.out.println("doBeforeRender"); loadActiveNodeInfo(); return true; } @@ -77,12 +77,10 @@ public void onRender(Component component) { - System.out.println("onRender"); /*final Image image = new Image("images/processSample.jpg"); image.setStyleName("bpm-ProcessImage"); add(image);*/ - } } ); @@ -92,7 +90,7 @@ private void loadActiveNodeInfo() { String url = view.getUrlBuilder().getActiveNodeInfoURL(this.instance.getInstanceId()); - System.out.println("Loading activeNodeInfo: " + url); + Log.debug("Loading activeNodeInfo: " + url); JSONRequest.get(url, new JSONRequestHandler() { @@ -129,7 +127,7 @@ public void onActiveNodeInfoLoaded(ActiveNodeInfo activeNodeInfo) { - System.out.println("Successfully loaded activeNodeInfo:" + activeNodeInfo.getActiveNode().getName()); + Log.debug("Successfully loaded activeNodeInfo:" + activeNodeInfo.getActiveNode().getName()); this.activeNodeInfo = activeNodeInfo; DiagramNodeInfo activeNode = activeNodeInfo.getActiveNode(); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -27,6 +27,7 @@ import com.gwtext.client.widgets.MessageBoxConfig; import com.gwtext.client.widgets.grid.ColumnConfig; import com.gwtext.client.widgets.grid.ColumnModel; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.util.DateRenderer; import org.jboss.bpm.console.client.model.ProcessDefinition; @@ -97,8 +98,7 @@ public void onError(Request request, Throwable t) { // auth failed - view.setError("Failed to remove process instance: "+t.getMessage()); - t.printStackTrace(System.out); + Log.error("Failed to remove process instance: "+t.getMessage()); } }); } @@ -144,8 +144,7 @@ public void onError(Request request, Throwable t) { // auth failed - view.setError("Failed to start new instance: "+t.getMessage()); - t.printStackTrace(System.out); + Log.error("Failed to start new instance", t); } }); } @@ -171,7 +170,7 @@ i++; } - System.out.println("Loaded " + row2InstanceMap.size() + " records"); + Log.debug("Loaded " + row2InstanceMap.size() + " records"); } public static ProcessInstance transform(Record r) Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -38,6 +38,7 @@ import com.gwtext.client.widgets.form.TextField; import com.gwtext.client.widgets.grid.RowSelectionModel; import com.gwtext.client.widgets.grid.event.RowSelectionListenerAdapter; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.Editor; import org.jboss.bpm.console.client.UIConstants; @@ -225,8 +226,7 @@ public void onError(Request request, Throwable t) { // Unknown error - view.setError(t.getMessage()); - t.printStackTrace(System.out); + Log.error("Unknown error", t); } }); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -28,6 +28,7 @@ import com.gwtext.client.widgets.form.*; import com.gwtext.client.widgets.grid.ColumnConfig; import com.gwtext.client.widgets.grid.ColumnModel; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.TaskReference; @@ -100,8 +101,7 @@ } catch (Throwable e) { - System.out.println("FormDef parsing failed" + e.getMessage()); - e.printStackTrace(); + Log.error("FormDef parsing failed", e); } MessageBox.hide(); @@ -132,7 +132,7 @@ fieldSet.add( new Radio(fieldDef.getLabel(), fieldDef.getVarname())); break; default: - System.out.println("Unknown input type:" + fieldDef.getInputType()); + Log.debug("Unknown input type:" + fieldDef.getInputType()); } } @@ -169,7 +169,7 @@ i++; } - System.out.println("Loaded " + row2taskref.size() + " tasks"); + Log.debug("Loaded " + row2taskref.size() + " tasks"); } protected ColumnModel createColumnModel() Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2008-11-10 08:21:20 UTC (rev 2836) @@ -30,6 +30,7 @@ import com.gwtext.client.widgets.grid.ColumnModel; import com.gwtext.client.widgets.grid.GridPanel; import com.gwtext.client.widgets.grid.event.GridCellListener; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.UIConstants; @@ -107,7 +108,7 @@ { public boolean doBeforeRender(Component component) { - System.out.println("Reload store trigger"); + Log.debug("Reload store trigger"); reloadStore(); return true; } @@ -247,8 +248,7 @@ public void onLoadException(Throwable throwable) { - throwable.printStackTrace(System.out); - view.setError("Failed to load remote data: " + throwable.getMessage()); + Log.error("Failed to load remote data", throwable); } }; Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-11-09 16:04:28 UTC (rev 2835) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-11-10 08:21:20 UTC (rev 2836) @@ -1,21 +1,38 @@ <module> - <!-- Inherit the core Web Toolkit stuff. --> - <inherits name='com.google.gwt.user.User' /> - <inherits name='com.google.gwt.json.JSON'/> - <inherits name='com.gwtext.GwtExt' /> - <inherits name='com.googlecode.gchart.GChart'/> - - <!-- Specify the app entry point class. --> - <entry-point class='org.jboss.bpm.console.client.Application' /> + <!-- Inherit the core Web Toolkit stuff. --> + <inherits name='com.google.gwt.user.User' /> + <inherits name='com.google.gwt.json.JSON'/> + <inherits name='com.gwtext.GwtExt' /> + <inherits name='com.googlecode.gchart.GChart'/> - <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/> - - <!-- Specify a css to load into your gwt application --> - <stylesheet src='console.css' /> - <stylesheet src="js/ext/resources/css/ext-all.css" /> - - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> - + <!-- Add gwt-log support, default level `DEBUG` --> + <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> + + <!-- Add the `WARN` and `DEBUG` compile time log level --> + <!--extend-property name="log_level" values="DEBUG,WARN"/--> + + <!-- Loggers Enabled by default --> + <set-property name="log_ConsoleLogger" value="ENABLED" /> + <set-property name="log_DivLogger" value="DISABLED" /> + <set-property name="log_FirebugLogger" value="DISABLED" /> + <set-property name="log_GWTLogger" value="ENABLED" /> + <set-property name="log_SystemLogger" value="ENABLED" /> + + <!-- Loggers Disabled by default --> + <set-property name="log_RemoteLogger" value="DISABLED" /> + <set-property name="log_WindowLogger" value="DISABLED" /> + + <!-- Specify the app entry point class. --> + <entry-point class='org.jboss.bpm.console.client.Application' /> + + <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/> + + <!-- Specify a css to load into your gwt application --> + <stylesheet src='console.css' /> + <stylesheet src="js/ext/resources/css/ext-all.css" /> + + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> + </module> \ No newline at end of file