Author: heiko.braun(a)jboss.com Date: 2010-01-22 05:16:12 -0500 (Fri, 22 Jan 2010) New Revision: 926 Modified: bpm-console/trunk/gui/war/README.txt bpm-console/trunk/gui/war/pom.xml bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/WorkspaceLauncher.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Editor.java Log: Get ApplicationContext from registry Modified: bpm-console/trunk/gui/war/README.txt =================================================================== --- bpm-console/trunk/gui/war/README.txt 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/README.txt 2010-01-22 10:16:12 UTC (rev 926) @@ -3,16 +3,16 @@ Start the GWT shell with - mvn gwt-maven:gwt + mvn gwt:<run|debug> 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 -Dhosted gwt-maven:gwt + mvn -Dhosted gwt:<run|debug> -(Will run "mvn -o -Dgoogle.webtoolkit.compileSkip=true gwt-maven:gwt") +(Will run "mvn -o -Dgoogle.webtoolkit.compileSkip=true gwt:<run|debug>") Running in web mode: Modified: bpm-console/trunk/gui/war/pom.xml =================================================================== --- bpm-console/trunk/gui/war/pom.xml 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/pom.xml 2010-01-22 10:16:12 UTC (rev 926) @@ -174,7 +174,7 @@ <runTarget>app.html</runTarget> <warSourceDirectory>war</warSourceDirectory> <extraJvmArgs>-Xmx512m</extraJvmArgs> - <localWorkers>4</localWorkers> + <localWorkers>2</localWorkers> </configuration> <executions> <execution> @@ -235,21 +235,6 @@ <goal>run</goal> </goals> </execution> - <execution> - <phase>prepare-package</phase> - <configuration> - <tasks> - <!-- - https://jira.jboss.org/jira/browse/BPMC-5 - Tomcat caches console.config.js - --> - <!--touch file="war/app/console.config.js"/--> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> </executions> </plugin> </plugins> @@ -268,6 +253,18 @@ <google.webtoolkit.compileSkip>true</google.webtoolkit.compileSkip> <o>true</o> <!-- offline --> </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwt.maven}</version> + <configuration> + <draftCompile>true</draftCompile> + </configuration> + </plugin> + </plugins> + </build> </profile> <!-- @@ -408,7 +405,7 @@ </artifactItems> </configuration> </execution> - <execution> + <execution> <id>unpack-profile-drools2</id> <phase>prepare-package</phase> <goals> @@ -544,7 +541,7 @@ </reportSet> </reportSets> <configuration> - + <extra>target</extra> </configuration> </plugin> </plugins> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2010-01-22 10:16:12 UTC (rev 926) @@ -130,7 +130,22 @@ //DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible"); // launch workspace - new MainLayout(controller, auth, config); + GWT.runAsync( + new RunAsyncCallback() + { + public void onFailure(Throwable throwable) + { + GWT.log("Code splitting failed", throwable); + MessageBox.error("Code splitting failed", throwable.getMessage()); + } + + public void onSuccess() + { + new MainLayout(controller, auth, config); + } + } + ); + } }); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-22 10:16:12 UTC (rev 926) @@ -191,7 +191,7 @@ { Workspace workspace = new Workspace(menu, this); WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class); - launcher.launch(this, workspace); // calls Workspace.addEditor() + launcher.launch(workspace); // calls Workspace.addEditor() return workspace; } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -46,9 +46,9 @@ private DeckLayoutPanel deck; - public SettingsEditor(ApplicationContext appContext) + public SettingsEditor() { - super(appContext); + } public void initialize() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/WorkspaceLauncher.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/WorkspaceLauncher.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/WorkspaceLauncher.java 2010-01-22 10:16:12 UTC (rev 926) @@ -26,5 +26,5 @@ */ public interface WorkspaceLauncher { - void launch(ApplicationContext appContext, Workspace workspace); + void launch(Workspace workspace); } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -54,9 +54,9 @@ private Map<String,Integer> view2index = new HashMap<String,Integer>(); - public EngineEditor(ApplicationContext appContext) + public EngineEditor() { - super(appContext); + } public void initialize() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -48,9 +48,8 @@ private TabLayoutPanel tabPanel; - public ProcessEditor(ApplicationContext appContext) - { - super(appContext); + public ProcessEditor() + { } public void initialize() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -50,9 +50,9 @@ private DecoratedTabLayoutPanel tabPanel; - public ReportEditor(ApplicationContext appContext) + public ReportEditor() { - super(appContext); + } public void setController(Controller controller) Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -47,9 +47,8 @@ private TabLayoutPanel tabPanel; - public TaskEditor(ApplicationContext appContext) - { - super(appContext); + public TaskEditor() + { } public void initialize() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java 2010-01-22 10:16:12 UTC (rev 926) @@ -128,7 +128,7 @@ private void generateMethods(SourceWriter sourceWriter) { // start constructor source generation - sourceWriter.println("public void launch(ApplicationContext appContext, Workspace workspace) { "); + sourceWriter.println("public void launch(Workspace workspace) { "); sourceWriter.indent(); InputStream in = getClass().getClassLoader().getResourceAsStream(WORKSPACE_CONFIG); @@ -155,7 +155,7 @@ if (line.equals("") || line.startsWith("#")) continue; - sourceWriter.println("workspace.addEditor( new " + line + "(appContext), false );"); + sourceWriter.println("workspace.addEditor( new " + line + "(), false );"); } } finally Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Editor.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2010-01-22 09:35:00 UTC (rev 925) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2010-01-22 10:16:12 UTC (rev 926) @@ -53,10 +53,10 @@ protected boolean isInitialized; - public Editor(ApplicationContext appContext) + public Editor() { super(new BorderLayout()); - this.appContext = appContext; + this.appContext = Registry.get(ApplicationContext.class); // hmvc controller chain. //this.controller = new Controller();