Author: tom.baeyens(a)jboss.com Date: 2009-06-05 11:39:31 -0400 (Fri, 05 Jun 2009) New Revision: 5003 Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/drools/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/jbpm/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-example/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/rpc/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-core/pom.xml projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-integration/pom.xml Log: cr2 version updates and console fix... kudo's to Joram ! Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/drools/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/drools/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/drools/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-profiles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/jbpm/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/jbpm/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/jbpm/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-profiles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/profiles/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-guimodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-guimodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-06-05 15:39:31 UTC (rev 5003) @@ -1,63 +1,73 @@ -<html> -<head> - <title>GWT Console Application</title> - - <!-- BPM console configuration --> - <script type="text/javascript" src="console.config.js"/> - - <!-- --> - <!-- This script loads your compiled module. --> - <!-- If you add any GWT meta tags, they must --> - <!-- be added before this line. --> - <!-- --> - <script language='javascript' src='org.jboss.bpm.console.Application.nocache.js'/> - - <link rel="stylesheet" href="console.css" type="text/css"> - - <style type="text/css"> - html, body { height: 100%; overflow: hidden; margin: 0; padding: 0; } - #splash { - background:#ffffff; - cursor: wait; - position: - absolute; top: 0; left: 0; - z-index:1000; - } - .bpm-loader { - background-image: url('images/loading_lite.gif'); - background-repeat:no-repeat; - height: 24px; width: 130px; - padding-left:26px; - padding-top:8px; - font-family: Arial, sans-serif; - font-size: 10px; - font-weight: bold; - color: #777; - cursor: wait; - } - </style> -</head> - -<!-- --> -<!-- The body can have arbitrary html, or --> -<!-- you can leave the body empty if you want --> -<!-- to create a completely dynamic ui --> -<!-- --> -<body> - -<!-- OPTIONAL: include this if you want history support --> -<!--iframe src="javascript:''" id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe--> - -<div id="splash" style="height:100%;width:100%;"> - <table width="100%" height="100%" > - <tr> - <td width="100%" height="100%" align="center" valign="middle"> - <div id="ui_loading" class="bpm-loader" style="display:none;z-index:1001;" alttext="Error">Creating Workspace ...</div> - <div id="splash_loading" class="bpm-loader" alttext="Error">Loading ...</div> - </td> - </tr> - </table> -</div> - -</body> -</html> +<html> +<head> + <title>GWT Console Application</title> + + <!-- BPM console configuration --> + <script type="text/javascript"> + var consoleConfig = { + consoleServerUrl: "http://localhost:8080/gwt-console-server", + reportServerUrl: "http://localhost:8080/report-server", + overviewReportFile:"process_activity.rptdesign", + definitionReportFile:"definition_report.rptdesign", + instanceReportFile:"instance_report.rptdesign" + }; + </script> + + <!-- --> + <!-- This script loads your compiled module. --> + <!-- If you add any GWT meta tags, they must --> + <!-- be added before this line. --> + <!-- --> + <script language='javascript' src='org.jboss.bpm.console.Application.nocache.js'> + + </script> + + <link rel="stylesheet" href="console.css" type="text/css"> + + <style type="text/css"> + html, body { height: 100%; overflow: hidden; margin: 0; padding: 0; } + #splash { + background:#ffffff; + cursor: wait; + position: + absolute; top: 0; left: 0; + z-index:1000; + } + .bpm-loader { + background-image: url('images/loading_lite.gif'); + background-repeat:no-repeat; + height: 24px; width: 130px; + padding-left:26px; + padding-top:8px; + font-family: Arial, sans-serif; + font-size: 10px; + font-weight: bold; + color: #777; + cursor: wait; + } + </style> +</head> + +<!-- --> +<!-- The body can have arbitrary html, or --> +<!-- you can leave the body empty if you want --> +<!-- to create a completely dynamic ui --> +<!-- --> +<body> + +<!-- OPTIONAL: include this if you want history support --> +<!--iframe src="javascript:''" id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe--> + +<div id="splash" style="height:100%;width:100%;"> + <table width="100%" height="100%" > + <tr> + <td width="100%" height="100%" align="center" valign="middle"> + <div id="ui_loading" class="bpm-loader" style="display:none;z-index:1001;" alttext="Error">Creating Workspace ...</div> + <div id="splash_loading" class="bpm-loader" alttext="Error">Loading ...</div> + </td> + </tr> + </table> +</div> + +</body> +</html> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-guimodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-06-05 15:39:31 UTC (rev 5003) @@ -1,126 +1,139 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client; - -import com.google.gwt.i18n.client.Dictionary; - -/** - * Initialize console config from host page (<code>Application.html</code>) variable: - * <pre> - * var consoleConfig = { - * consoleServerUrl: "http://localhost:8080/gwt-console-server", - * reportServerUrl: "http://localhost:8080/report", - * [...] - * }; - * </pre> - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - * @see com.google.gwt.i18n.client.Dictionary - */ -public class ConsoleConfig -{ - private String serverWebContext; - - private String overallReportFile; - private String processSummaryReportFile; - private String instanceSummaryReportFile; - - private String profileName; - private String logo; - - private String consoleServerUrl; - - public ConsoleConfig() - { - Dictionary theme = Dictionary.getDictionary("consoleConfig"); - profileName = theme.get("profileName"); - logo = theme.get("logo"); - - serverWebContext = theme.get("serverWebContext"); - - overallReportFile = theme.get("overallReportFile"); - processSummaryReportFile = theme.get("processSummaryReportFile"); - instanceSummaryReportFile = theme.get("instanceSummaryReportFile"); - } - - public String getProfileName() - { - return profileName; - } - - public String getLogo() - { - return logo; - } - - public String getConsoleServerUrl() - { - if(consoleServerUrl ==null) - throw new RuntimeException("Config not properly setup: console server URL is null"); - return consoleServerUrl; - } - - public void setConsoleServerUrl(String consoleServerUrl) - { - this.consoleServerUrl = consoleServerUrl; - } - - public String getServerWebContext() - { - return serverWebContext; - } - - public void setServerWebContext(String serverWebContext) - { - this.serverWebContext = serverWebContext; - } - - public String getOverallReportFile() - { - return overallReportFile; - } - - public void setOverallReportFile(String overallReportFile) - { - this.overallReportFile = overallReportFile; - } - - public String getProcessSummaryReportFile() - { - return processSummaryReportFile; - } - - public void setProcessSummaryReportFile(String processSummaryReportFile) - { - this.processSummaryReportFile = processSummaryReportFile; - } - - public String getInstanceSummaryReportFile() - { - return instanceSummaryReportFile; - } - - public void setInstanceSummaryReportFile(String instanceSummaryReportFile) - { - this.instanceSummaryReportFile = instanceSummaryReportFile; - } -} +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.google.gwt.i18n.client.Dictionary; + +/** + * Initialize console config from host page (<code>Application.html</code>) variable: + * <pre> + * var consoleConfig = { + * consoleServerUrl: "http://localhost:8080/gwt-console-server", + * reportServerUrl: "http://localhost:8080/report", + * [...] + * }; + * </pre> + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + * @see com.google.gwt.i18n.client.Dictionary + */ +public class ConsoleConfig +{ + private String serverWebContext; + + private String overallReportFile; + private String processSummaryReportFile; + private String instanceSummaryReportFile; + + private String profileName; + private String logo; + + private String consoleServerUrl; + + public ConsoleConfig() + { + + // Hotfix by jbarrez for CR1 release + overallReportFile = "overall_activity.rptdesign"; + processSummaryReportFile = "instance_summary.rptdesign"; + instanceSummaryReportFile = "instance_report.rptdesign"; + profileName = "jBPM Console RC1"; + logo = "jbpm_logo.png"; + consoleServerUrl = "http://localhost:8080/gwt-console-server"; + serverWebContext = "/gwt-console-server"; + // end hotfix + + /* Original + Dictionary theme = Dictionary.getDictionary("consoleConfig"); + profileName = theme.get("profileName"); + logo = theme.get("logo"); + + serverWebContext = theme.get("serverWebContext"); + + overallReportFile = theme.get("overallReportFile"); + processSummaryReportFile = theme.get("processSummaryReportFile"); + instanceSummaryReportFile = theme.get("instanceSummaryReportFile"); + */ + } + + public String getProfileName() + { + return profileName; + } + + public String getLogo() + { + return logo; + } + + public String getConsoleServerUrl() + { + if(consoleServerUrl ==null) + throw new RuntimeException("Config not properly setup: console server URL is null"); + return consoleServerUrl; + } + + public void setConsoleServerUrl(String consoleServerUrl) + { + this.consoleServerUrl = consoleServerUrl; + } + + public String getServerWebContext() + { + return serverWebContext; + } + + public void setServerWebContext(String serverWebContext) + { + this.serverWebContext = serverWebContext; + } + + public String getOverallReportFile() + { + return overallReportFile; + } + + public void setOverallReportFile(String overallReportFile) + { + this.overallReportFile = overallReportFile; + } + + public String getProcessSummaryReportFile() + { + return processSummaryReportFile; + } + + public void setProcessSummaryReportFile(String processSummaryReportFile) + { + this.processSummaryReportFile = processSummaryReportFile; + } + + public String getInstanceSummaryReportFile() + { + return instanceSummaryReportFile; + } + + public void setInstanceSummaryReportFile(String instanceSummaryReportFile) + { + this.instanceSummaryReportFile = instanceSummaryReportFile; + } +} Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-example/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-example/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/gui/workspace-example/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -11,12 +11,12 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-guimodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> <properties> - <gwt-console.version>1.0.0-SNAPSHOT</gwt-console.version> + <gwt-console.version>1.0.0.CR2</gwt-console.version> <gwt-mosaic.version>0.1.9</gwt-mosaic.version> </properties> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -4,7 +4,7 @@ <name>JBoss BPM - GWT Console</name> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <packaging>pom</packaging> <!-- Parent --> @@ -34,7 +34,7 @@ <mvc4g.version>1.0.0-jboss</mvc4g.version> <resteasy.version>1.0.2.GA</resteasy.version> <stax-api.version>1.0-2</stax-api.version> - <report.server.version>1.0.0-SNAPSHOT</report.server.version> + <report.server.version>1.0.0.CR2</report.server.version> </properties> <modules> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/rpc/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/rpc/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/rpc/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-core/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-core/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-core/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -10,13 +10,13 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-servermodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent> <!-- Properties --> <properties> - <report.server.version>1.0.0-SNAPSHOT</report.server.version> + <report.server.version>1.0.0.CR1</report.server.version> <json-lib.version>2.2.3</json-lib.version> </properties> Modified: projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-integration/pom.xml =================================================================== --- projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-integration/pom.xml 2009-06-05 14:54:16 UTC (rev 5002) +++ projects/gwt-console/tags/gwt-console-1.0.0.CR2/server/server-integration/pom.xml 2009-06-05 15:39:31 UTC (rev 5003) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-servermodule</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <relativePath>../pom.xml</relativePath> </parent>