Author: heiko.braun(a)jboss.com Date: 2009-03-30 13:11:22 -0400 (Mon, 30 Mar 2009) New Revision: 4360 Modified: projects/gwt-console/branches/hbraun/gwt-parent.iml projects/gwt-console/branches/hbraun/plugin-api/plugin.iml projects/gwt-console/branches/hbraun/plugin-api/pom.xml projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml projects/gwt-console/branches/hbraun/pom.xml projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml projects/gwt-console/branches/hbraun/server/gwt-server.iml projects/gwt-console/branches/hbraun/war/gwt-war.iml projects/gwt-console/branches/hbraun/war/pom.xml projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml Log: Moving to mosaic, jihaa Modified: projects/gwt-console/branches/hbraun/gwt-parent.iml =================================================================== --- projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/gwt-parent.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -20,9 +20,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" /> - <orderEntry type="module" module-name="gwt-server-integration" /> - <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -51,15 +48,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -134,15 +122,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <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!/" /> @@ -237,15 +216,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> @@ -292,6 +262,60 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/plugin-api/plugin.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -9,7 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> @@ -20,15 +20,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <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!/" /> @@ -75,6 +66,42 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/plugin-api/pom.xml =================================================================== --- projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/plugin-api/pom.xml 2009-03-30 17:11:22 UTC (rev 4360) @@ -49,6 +49,24 @@ <artifactId>gwt-log</artifactId> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + </dependency> + + </dependencies> <build> Modified: projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml =================================================================== --- projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/plugin-example/plugin-example.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -9,8 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" /> - <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> @@ -68,14 +67,41 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/pom.xml =================================================================== --- projects/gwt-console/branches/hbraun/pom.xml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/pom.xml 2009-03-30 17:11:22 UTC (rev 4360) @@ -20,8 +20,9 @@ <commons.io.version>1.3.2</commons.io.version> <commons.logging.version>1.1.1</commons.logging.version> <gson.version>1.2.2</gson.version> - <gwt.version>1.5.2</gwt.version> + <gwt.version>1.5.3</gwt.version> <gwtext.version>2.0.5</gwtext.version> + <gwt-mosaic.version>0.1.9</gwt-mosaic.version> <gwt-log.version>2.5.2</gwt-log.version> <jaf.version>1.1</jaf.version> <javax.ejb.version>3.0</javax.ejb.version> @@ -45,7 +46,7 @@ <dependencyManagement> <dependencies> - <!-- GET related --> + <!-- GWT related --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> @@ -78,6 +79,28 @@ <version>${gwt-log.version}</version> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + + <!-- Other --> <dependency> <groupId>commons-logging</groupId> Modified: projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml =================================================================== --- projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/rpc/gwt-rpc.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -27,15 +27,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -55,6 +46,15 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/server/gwt-server.iml =================================================================== --- projects/gwt-console/branches/hbraun/server/gwt-server.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/server/gwt-server.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -10,8 +10,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -22,15 +21,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> @@ -49,15 +39,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -243,6 +224,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml =================================================================== --- projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/server-integration/gwt-server-integration.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: projects/gwt-console/branches/hbraun/war/gwt-war.iml =================================================================== --- projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/war/gwt-war.iml 2009-03-30 17:11:22 UTC (rev 4360) @@ -11,8 +11,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" exported="" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> @@ -41,70 +40,97 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <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> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> + <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/hbraun/war/pom.xml =================================================================== --- projects/gwt-console/branches/hbraun/war/pom.xml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/war/pom.xml 2009-03-30 17:11:22 UTC (rev 4360) @@ -80,6 +80,25 @@ <artifactId>gwt-log</artifactId> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + </dependency> + + + <!-- 3rd party --> <dependency> Modified: projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-03-30 17:11:22 UTC (rev 4360) @@ -2,22 +2,21 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.Response; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.Response; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Window; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.layout.VerticalLayout; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.layout.BorderLayoutData; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.RegionPosition; +import com.google.gwt.user.client.WindowCloseListener; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.Widget; +import org.gwt.mosaic.forms.client.builder.DefaultFormBuilder; +import org.gwt.mosaic.forms.client.layout.FormLayout; +import org.gwt.mosaic.ui.client.WindowPanel; +import org.gwt.mosaic.ui.client.layout.BorderLayout; +import org.gwt.mosaic.ui.client.layout.BorderLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.jboss.bpm.console.client.util.ConsoleLog; /** @@ -32,6 +31,10 @@ private ConsoleConfig config; private URLBuilder urlBuilder; + WindowPanel window = null; + TextBox usernameInput; + TextBox passwordInput; + public final static String[] KNOWN_ROLES = {"admin", "manager", "user"}; /** @@ -91,78 +94,101 @@ } private void forceLogin() + { + createLayoutWindowPanel(); + window.pack(); + window.center(); + window.show(); + } + + private Widget createForm() { - Panel panel = new Panel(); - panel.setPaddings(20); - panel.setStyleName("login-panel-content"); - panel.setLayout(new VerticalLayout(10)); - panel.add(new HTML("Welcome, please login.")); + FormLayout layout = new FormLayout( + "right:[40dlu,pref], 3dlu, 70dlu, 7dlu, " + + "right:[40dlu,pref], 3dlu, 70dlu"); + DefaultFormBuilder builder = new DefaultFormBuilder(layout); + builder.appendSeparator("Login"); - final Window window = new Window(); - window.setTitle("GWT-Console"); - window.setClosable(false); - window.setResizable(false); - window.setWidth(300); - window.setHeight(180); - window.setLayout(new BorderLayout()); - window.setCloseAction(Window.CLOSE); + usernameInput = new TextBox(); + builder.append("Username:", usernameInput); + builder.nextLine(); - final FormPanel loginForm = new FormPanel(); - loginForm.setBorder(false); - loginForm.add(new TextField("Username", "user")); - TextField passwordField = new TextField("Password", "pass"); - passwordField.setPassword(true); - loginForm.add(passwordField); + passwordInput = new TextBox(); + builder.append("Password:", passwordInput); + builder.nextLine(); - final Button submitBtn = new Button("Login", - new ButtonListenerAdapter() - { - public void onClick(Button button, EventObject e) - { - String user = loginForm.getForm().findField("user").getValueAsString(); - String pass = loginForm.getForm().findField("pass").getValueAsString(); + return builder.getPanel(); + } - String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES); - auth = new Authentication(url); - auth.setCallback( - new Authentication.AuthCallback() - { + /** + * The 'layout' window panel. + */ + private void createLayoutWindowPanel() { + window = new WindowPanel("jBPM Management Console"); + window.setAnimationEnabled(true); + LayoutPanel panel = new LayoutPanel(); + window.setWidget(panel); + createLayoutContent(panel); - public void onLoginSuccess(Request request, Response response) - { - // clear the form - loginForm.getForm().reset(); + window.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + window = null; + } - // display main console - window.close(); + public String onWindowClosing() { + return null; + } + }); + } - // assemble main view - mainView = new MainView(auth, urlBuilder, config); - } + /** + * Create content for layout. + */ + private void createLayoutContent(LayoutPanel layoutPanel) { + layoutPanel.setLayout(new BorderLayout()); + layoutPanel.setPadding(5); - public void onLoginFailed(Request request, Throwable t) - { - // auth failed - ConsoleLog.error("Authentication failed.", t); - } - } - ); + final Button submit = new Button("Subkit"); + submit.addClickListener(new ClickListener() + { - auth.doLogin(user, pass); + public void onClick(Widget widget) + { + String user = usernameInput.getText(); + String pass = passwordInput.getText(); - } - }); + String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES); + auth = new Authentication(url); + auth.setCallback( + new Authentication.AuthCallback() + { - loginForm.addButton(submitBtn); - panel.add(loginForm); + public void onLoginSuccess(Request request, Response response) + { + // clear the form + usernameInput.setText(""); + passwordInput.setText(""); - BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER); - centerData.setMargins(3, 0, 3, 3); + // display main console + window.hide(); - window.add(panel, centerData); - // ------------------------------------------ + // assemble main view + mainView = new MainView(auth, urlBuilder, config); + } - window.show(); + public void onLoginFailed(Request request, Throwable t) + { + // auth failed + ConsoleLog.error("Authentication failed.", t); + } + } + ); + + auth.doLogin(user, pass); + } + }); + + layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200)); + layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200)); } - } Modified: projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-03-30 17:03:18 UTC (rev 4359) +++ projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-03-30 17:11:22 UTC (rev 4360) @@ -9,6 +9,24 @@ <!-- Add gwt-log support, default level `DEBUG` --> <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> + <!-- Includes the public resources used by the GWT themes. Those files --> + <!-- do not inject a style sheet into the application. --> + <inherits name='com.google.gwt.user.theme.standard.StandardResources' /> + <inherits name="com.google.gwt.user.theme.chrome.ChromeResources" /> + <inherits name="com.google.gwt.user.theme.dark.DarkResources" /> + + <!-- Other module inherits --> + <inherits name='org.gwt.mosaic.core.Core' /> + <inherits name='org.gwt.mosaic.ui.UI'/> + <inherits name="org.gwt.mosaic.forms.Forms"/> + + <!-- Inherit the default GWT style sheet. You can change --> + <!-- the theme of your GWT application by uncommenting --> + <!-- any one of the following lines. --> + <inherits name='com.google.gwt.user.theme.standard.Standard' /> + <!-- <inherits name="com.google.gwt.user.theme.chrome.Chrome"/> --> + <!-- <inherits name="com.google.gwt.user.theme.dark.Dark"/> --> + <generate-with class="org.jboss.bpm.console.rebind.WorkspaceGenerator" > <when-type-assignable class="org.jboss.bpm.console.client.WorkspaceLauncher"/> </generate-with> @@ -32,6 +50,14 @@ <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/> + <!-- Inherit the default GWT-Mosaic style sheet. You can --> + <!-- change the theme of your GWT application by uncommenting --> + <!-- any one of the following lines. --> + <stylesheet src="gwt/standard/Mosaic.css" /> + <!-- <stylesheet src="gwt/chrome/Mosaic.css" /> --> + <!-- <stylesheet src="gwt/dark/Mosaic.css" /> --> + + <!-- Specify a css to load into your gwt application --> <stylesheet src='console.css' /> <stylesheet src="js/ext/resources/css/ext-all.css" />