[jbpm-commits] JBoss JBPM SVN: r4862 - in projects/gwt-console/trunk: gui and 25 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed May 20 15:56:16 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-05-20 15:56:16 -0400 (Wed, 20 May 2009)
New Revision: 4862
Added:
projects/gwt-console/trunk/gui/profiles/
projects/gwt-console/trunk/gui/profiles/drools/
projects/gwt-console/trunk/gui/profiles/drools/pom.xml
projects/gwt-console/trunk/gui/profiles/drools/src/
projects/gwt-console/trunk/gui/profiles/drools/src/main/
projects/gwt-console/trunk/gui/profiles/drools/src/main/java/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/images/
projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/images/drools_logo.png
projects/gwt-console/trunk/gui/profiles/jbpm/
projects/gwt-console/trunk/gui/profiles/jbpm/pom.xml
projects/gwt-console/trunk/gui/profiles/jbpm/src/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/java/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/images/
projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/images/jbpm_logo.png
projects/gwt-console/trunk/gui/profiles/pom.xml
projects/gwt-console/trunk/gui/profiles/profiles.iml
Modified:
projects/gwt-console/trunk/README.txt
projects/gwt-console/trunk/gui/pom.xml
projects/gwt-console/trunk/gui/war/README.txt
projects/gwt-console/trunk/gui/war/pom.xml
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
projects/gwt-console/trunk/pom.xml
Log:
Added console profiles. Updated build instructions. Add '-Dhosted' switch for quick turnaround when running in hosted mode (development)
Modified: projects/gwt-console/trunk/README.txt
===================================================================
--- projects/gwt-console/trunk/README.txt 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/README.txt 2009-05-20 19:56:16 UTC (rev 4862)
@@ -12,7 +12,7 @@
But the basics steps to get going are as follows:
-1) Build the top level module (gwt-console)
+1) Build the top level module
mvn clean install
@@ -22,11 +22,8 @@
3) Boot the AS and start the gwt console in hosted mode
- cd gui/war
- mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt
+ See gui/war/README.txt for further information
- // optionally
- mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:debug
Troubleshooting
---------------
Modified: projects/gwt-console/trunk/gui/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/pom.xml 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -17,6 +17,7 @@
</parent>
<modules>
+ <module>profiles</module>
<module>war</module>
<module>workspace-api</module>
</modules>
Added: projects/gwt-console/trunk/gui/profiles/drools/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/profiles/drools/pom.xml (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/drools/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <name>JBoss BPM - GWT Console (GUI Profile Drools)</name>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-drools</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profiles</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+</project>
Added: projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js
===================================================================
--- projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,9 @@
+var consoleConfig = {
+ profileName: "DroolsFlow Console",
+ logo: "images/drools_logo.png",
+ 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"
+};
\ No newline at end of file
Added: projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/images/drools_logo.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/images/drools_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/profiles/jbpm/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/profiles/jbpm/pom.xml (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/jbpm/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <name>JBoss BPM - GWT Console (GUI Profile jBPM)</name>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-jbpm</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profiles</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+</project>
Added: projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js
===================================================================
--- projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,9 @@
+var consoleConfig = {
+ profileName: "jBPM Console",
+ logo: "images/jbpm_logo.png",
+ 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"
+};
\ No newline at end of file
Added: projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/images/jbpm_logo.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/images/jbpm_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/profiles/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/profiles/pom.xml (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <name>JBoss BPM - GWT Console (GUI Profiles)</name>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profiles</artifactId>
+ <packaging>pom</packaging>
+
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-guimodule</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+
+ <modules>
+ <module>jbpm</module>
+ <module>drools</module>
+ </modules>
+</project>
Added: projects/gwt-console/trunk/gui/profiles/profiles.iml
===================================================================
--- projects/gwt-console/trunk/gui/profiles/profiles.iml (rev 0)
+++ projects/gwt-console/trunk/gui/profiles/profiles.iml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/jbpm/src/main/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: projects/gwt-console/trunk/gui/war/README.txt
===================================================================
--- projects/gwt-console/trunk/gui/war/README.txt 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/README.txt 2009-05-20 19:56:16 UTC (rev 4862)
@@ -1,23 +1,26 @@
Running in hosted mode:
----------------------
-IMPORTANT:
-'mvn compile gwt:gwt' doesn't work anymore, until the plugins are merged.
-use 'mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt' instead.
-(See http://code.google.com/p/gwt-maven/wiki/M2FAQ)
+Start the GWT shell with
-When the hosted browser is started, simple hit the 'refresh' button to recompile
+ mvn gwt-maven:gwt
+
+When the hosted browser is started, it's enough to hit the 'refresh' button to recompile
and verfiy changes.
-NOTE: Really quick turnaround through "mvn -o clean compile gwt:gwt"
+NOTE: Really quick turnaround through
+ mvn -Dhosted gwt-maven:gwt
+(Will run "mvn -o -Dgoogle.webtoolkit.compileSkip=true gwt-maven:gwt")
+
+
Running in web mode:
-------------------
mvn package
-Produces a war file in target/gwt-console-war-<version>.war,
+Produces a war file in target/gwt-console.war,
which can be deployed to a running jboss instance.
Please post any questions to the jbpm developer forum.
Modified: projects/gwt-console/trunk/gui/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/pom.xml 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -179,7 +179,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack</id>
+ <id>unpack-gwt</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
@@ -198,6 +198,7 @@
</artifactItems>
</configuration>
</execution>
+
</executions>
</plugin>
<!--
@@ -225,7 +226,116 @@
<!-- profiles (with activation per platform) -->
<profiles>
+
<profile>
+ <id>quick-hosted-mode</id>
+ <activation>
+ <property>
+ <name>hosted</name>
+ </property>
+ </activation>
+ <properties>
+ <google.webtoolkit.compileSkip>true</google.webtoolkit.compileSkip>
+ <o>true</o> <!-- offline -->
+ </properties>
+ </profile>
+
+ <profile>
+ <id>jbpm-console.profile</id>
+ <activation>
+ <property>
+ <name>!console.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-jbpm</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>unpack-profile-jbpm</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-jbpm</artifactId>
+ <version>${version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/classes</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>drools-console.profile</id>
+ <activation>
+ <property>
+ <name>console.profile</name>
+ <value>drools</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-drools</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>unpack-profile-drools</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-profile-drools</artifactId>
+ <version>${version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/classes</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>gwt-dev-windows</id>
<properties>
<platform>windows</platform>
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-05-20 19:56:16 UTC (rev 4862)
@@ -30,12 +30,15 @@
import java.util.List;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.AbsoluteLayout;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-public class Header extends HorizontalPanel implements ViewInterface
+public class Header extends LayoutPanel implements ViewInterface
{
public final static String ID = Header.class.getName();
@@ -52,9 +55,7 @@
public Header(ApplicationContext appContext, String username, List<String> roles)
{
- super();
- this.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
- this.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
+ super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
this.setStyleName("bpm-header");
this.appContext = appContext;
@@ -64,12 +65,21 @@
private void createInfoPanel()
{
- // user info
- HorizontalPanel p = new HorizontalPanel();
- p.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
- p.setStyleName("bpm-header-userinfo");
- // load status image
+ // ----------- logo panel
+ LayoutPanel logoPanel = new LayoutPanel(new BoxLayout());
+ logoPanel.setStyleName("bpm-header-left");
+
+ Image logo = new Image(appContext.getConfig().getLogo());
+ logo.setHeight("50");
+ logoPanel.add(logo);
+
+ // ----------- info panel
+ HorizontalPanel infoPanel = new HorizontalPanel();
+ infoPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
+ infoPanel.setSpacing(5);
+ infoPanel.setStyleName("bpm-header-right");
+
LayoutPanel loadingImageContainer = new LayoutPanel();
loadingImageContainer.setStyleName("bpm-loading-image");
@@ -92,14 +102,14 @@
}
}
);
+
+ infoPanel.add(loadingImageContainer);
+ infoPanel.add(img);
+ infoPanel.add(html);
+ infoPanel.add(btn);
- p.add(loadingImageContainer);
- p.add(img);
- p.add(html);
- p.add(btn);
-
- this.add(p);
-
+ this.add(logoPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ this.add(infoPanel, new BoxLayoutData(150, 50));
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-20 19:56:16 UTC (rev 4862)
@@ -93,7 +93,7 @@
* The 'layout' window panel.
*/
private void createLayoutWindowPanel() {
- window = new WindowPanel("jBPM Management Console");
+ window = new WindowPanel(config.getProfileName());
window.setAnimationEnabled(true);
window.setSize("320px", "180px");
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-20 19:56:16 UTC (rev 4862)
@@ -21,20 +21,19 @@
*/
package org.jboss.bpm.console.client;
+import com.google.gwt.user.client.ui.Grid;
+import com.google.gwt.user.client.ui.Image;
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.Image;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.gwt.mosaic.ui.client.Label;
+import org.jboss.bpm.console.client.model.PluginInfo;
import org.jboss.bpm.console.client.model.ServerStatus;
-import org.jboss.bpm.console.client.model.PluginInfo;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
public class ServerStatusView extends LayoutPanel
- implements ViewInterface
+ implements ViewInterface
{
public final static String ID = ServerStatusView.class.getName();
@@ -55,7 +54,9 @@
}
public void update(ServerStatus status)
- {
+ {
+ this.clear();
+
Grid g = new Grid(status.getPlugins().size(), 2);
g.setWidth("100%");
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-20 19:56:16 UTC (rev 4862)
@@ -21,13 +21,17 @@
*/
package org.jboss.bpm.console.client;
-import com.google.gwt.user.client.ui.*;
-import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.Grid;
import com.mvc4g.client.Event;
-import org.gwt.mosaic.ui.client.*;
+import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel;
import org.gwt.mosaic.ui.client.Label;
-import org.gwt.mosaic.ui.client.layout.*;
+import org.gwt.mosaic.ui.client.ScrollLayoutPanel;
+import org.gwt.mosaic.ui.client.TabLayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BorderLayout;
+import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
/**
@@ -86,7 +90,7 @@
g2.getColumnFormatter().setWidth(0, "20%");
- layoutPanel.add(g2, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(g2, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
tabPanel.add(layoutPanel, "System Overview");
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-05-20 19:56:16 UTC (rev 4862)
@@ -3,25 +3,15 @@
<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>
+ <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'>
+ <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">
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-20 19:56:16 UTC (rev 4862)
@@ -4,13 +4,24 @@
margin: 10px;
}
-.bpm-header {
+.bpm-header{
+ background-color:#ffffff;
+}
+
+.bpm-header-left {
background-color:#ffffff;
- /*background-color:#4a5d75;*/
- background-image: url( images/Jbpm_logo_small.png);
- background-repeat:no-repeat;
+ vertical-align:bottom;
+ margin-left:15px;
+ //border:1px solid green;
}
+.bpm-header-right {
+ background-color:#ffffff;
+ vertical-align:bottom;
+ margin-right:15px;
+ //border:1px dashed red;
+}
+
.bpm-label-header {
background-color:#F8F8F8;
font-weight:BOLD;
Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-05-20 19:56:16 UTC (rev 4862)
@@ -45,6 +45,8 @@
private String definitionReportFile;
private String instanceReportFile;
+ private String profileName;
+ private String logo;
public ConsoleConfig(String consoleServerUrl, String reportServerUrl)
{
@@ -55,6 +57,9 @@
public ConsoleConfig()
{
Dictionary theme = Dictionary.getDictionary("consoleConfig");
+ profileName = theme.get("profileName");
+ logo = theme.get("logo");
+
consoleServerUrl = theme.get("consoleServerUrl");
reportServerUrl = theme.get("reportServerUrl");
@@ -63,6 +68,16 @@
instanceReportFile = theme.get("instanceReportFile");
}
+ public String getProfileName()
+ {
+ return profileName;
+ }
+
+ public String getLogo()
+ {
+ return logo;
+ }
+
public String getConsoleServerUrl()
{
return consoleServerUrl;
Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml 2009-05-20 19:20:07 UTC (rev 4861)
+++ projects/gwt-console/trunk/pom.xml 2009-05-20 19:56:16 UTC (rev 4862)
@@ -14,7 +14,8 @@
<version>1.0.0.GA</version>
</parent>
- <properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commons.fileupload.version>1.2.1</commons.fileupload.version>
<commons.io.version>1.3.2</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -28,7 +29,7 @@
<jaf.version>1.1</jaf.version>
<javax.ejb.version>3.0</javax.ejb.version>
<javax.jaxb.version>2.1</javax.jaxb.version>
- <jboss.common.version>2.2.7.GA</jboss.common.version>
+ <jboss.common.version>2.2.7.GA</jboss.common.version>
<junit.version>3.8.1</junit.version>
<mvc4g.version>1.0.0-jboss</mvc4g.version>
<resteasy.version>1.0.2.GA</resteasy.version>
@@ -156,9 +157,9 @@
<version>${resteasy.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-multipart-provider</artifactId>
- <version>${resteasy.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-multipart-provider</artifactId>
+ <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -201,6 +202,7 @@
</plugins>
</build>
</profile>
+
</profiles>
More information about the jbpm-commits
mailing list