[jbpm-commits] JBoss JBPM SVN: r5384 - in projects/gwt-console/trunk: common and 48 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jul 30 05:02:25 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-07-30 05:02:19 -0400 (Thu, 30 Jul 2009)
New Revision: 5384

Added:
   projects/gwt-console/trunk/common/
   projects/gwt-console/trunk/common/common.iml
   projects/gwt-console/trunk/common/pom.xml
   projects/gwt-console/trunk/common/src/
   projects/gwt-console/trunk/common/src/main/
   projects/gwt-console/trunk/common/src/main/java/
   projects/gwt-console/trunk/common/src/main/java/org/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java
   projects/gwt-console/trunk/sam/
   projects/gwt-console/trunk/sam/gui/
   projects/gwt-console/trunk/sam/gui/pom.xml
   projects/gwt-console/trunk/sam/gui/sam-gui.iml
   projects/gwt-console/trunk/sam/gui/src/
   projects/gwt-console/trunk/sam/gui/src/main/
   projects/gwt-console/trunk/sam/gui/src/main/java/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java
   projects/gwt-console/trunk/sam/gui/src/main/resources/
   projects/gwt-console/trunk/sam/pom.xml
   projects/gwt-console/trunk/sam/profile/
   projects/gwt-console/trunk/sam/profile/pom.xml
   projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml
   projects/gwt-console/trunk/sam/profile/sam-profile.iml
   projects/gwt-console/trunk/sam/profile/src/
   projects/gwt-console/trunk/sam/profile/src/main/
   projects/gwt-console/trunk/sam/profile/src/main/java/
   projects/gwt-console/trunk/sam/profile/src/main/resources/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/images/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg
   projects/gwt-console/trunk/sam/sam-toplevel.iml
   projects/gwt-console/trunk/sam/server/
   projects/gwt-console/trunk/sam/server/pom.xml
   projects/gwt-console/trunk/sam/server/sam-server.iml
   projects/gwt-console/trunk/sam/server/src/
   projects/gwt-console/trunk/sam/server/src/main/
   projects/gwt-console/trunk/sam/server/src/main/java/
   projects/gwt-console/trunk/sam/server/src/main/java/org/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java
   projects/gwt-console/trunk/sam/server/src/main/resources/
   projects/gwt-console/trunk/sam/server/src/main/webapp/
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml
   projects/gwt-console/trunk/sam/server/src/main/webapp/index.html
Removed:
   projects/gwt-console/trunk/common/common.iml
   projects/gwt-console/trunk/common/pom.xml
   projects/gwt-console/trunk/common/src/
   projects/gwt-console/trunk/common/src/main/
   projects/gwt-console/trunk/common/src/main/java/
   projects/gwt-console/trunk/common/src/main/java/org/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java
   projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java
   projects/gwt-console/trunk/gui/workspace-example/
   projects/gwt-console/trunk/sam/gui/
   projects/gwt-console/trunk/sam/gui/pom.xml
   projects/gwt-console/trunk/sam/gui/sam-gui.iml
   projects/gwt-console/trunk/sam/gui/src/
   projects/gwt-console/trunk/sam/gui/src/main/
   projects/gwt-console/trunk/sam/gui/src/main/java/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java
   projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java
   projects/gwt-console/trunk/sam/gui/src/main/resources/
   projects/gwt-console/trunk/sam/pom.xml
   projects/gwt-console/trunk/sam/profile/
   projects/gwt-console/trunk/sam/profile/pom.xml
   projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml
   projects/gwt-console/trunk/sam/profile/sam-profile.iml
   projects/gwt-console/trunk/sam/profile/src/
   projects/gwt-console/trunk/sam/profile/src/main/
   projects/gwt-console/trunk/sam/profile/src/main/java/
   projects/gwt-console/trunk/sam/profile/src/main/resources/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/
   projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/images/
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png
   projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg
   projects/gwt-console/trunk/sam/sam-toplevel.iml
   projects/gwt-console/trunk/sam/server/
   projects/gwt-console/trunk/sam/server/pom.xml
   projects/gwt-console/trunk/sam/server/sam-server.iml
   projects/gwt-console/trunk/sam/server/src/
   projects/gwt-console/trunk/sam/server/src/main/
   projects/gwt-console/trunk/sam/server/src/main/java/
   projects/gwt-console/trunk/sam/server/src/main/java/org/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java
   projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java
   projects/gwt-console/trunk/sam/server/src/main/resources/
   projects/gwt-console/trunk/sam/server/src/main/webapp/
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml
   projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml
   projects/gwt-console/trunk/sam/server/src/main/webapp/index.html
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java
Modified:
   projects/gwt-console/trunk/gui/war/gui-war.iml
   projects/gwt-console/trunk/gui/war/pom.xml
   projects/gwt-console/trunk/gui/workspace-api/pom.xml
   projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
   projects/gwt-console/trunk/gwt-parent.iml
   projects/gwt-console/trunk/pom.xml
   projects/gwt-console/trunk/server/server-core/pom.xml
   projects/gwt-console/trunk/server/server-core/server-core.iml
Log:
svn merge -r5368:HEAD https://svn.jboss.org/repos/jbpm/projects/gwt-console/branches/sam

Copied: projects/gwt-console/trunk/common (from rev 5383, projects/gwt-console/branches/sam/common)

Deleted: projects/gwt-console/trunk/common/common.iml
===================================================================
--- projects/gwt-console/branches/sam/common/common.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/common.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,86 +0,0 @@
-<?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$/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.google.code.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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/common/common.iml (from rev 5383, projects/gwt-console/branches/sam/common/common.iml)
===================================================================
--- projects/gwt-console/trunk/common/common.iml	                        (rev 0)
+++ projects/gwt-console/trunk/common/common.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,86 @@
+<?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$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.google.code.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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Deleted: projects/gwt-console/trunk/common/pom.xml
===================================================================
--- projects/gwt-console/branches/sam/common/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,63 +0,0 @@
-<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 (Common)</name>
-  <groupId>org.jboss.bpm</groupId>
-  <artifactId>gwt-console-common</artifactId>
-  <packaging>jar</packaging>
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.bpm</groupId>
-    <artifactId>gwt-console-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-jaxrs</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>tjws</groupId>
-          <artifactId>webserver</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.stream</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-  </dependencies>
-</project>

Copied: projects/gwt-console/trunk/common/pom.xml (from rev 5383, projects/gwt-console/branches/sam/common/pom.xml)
===================================================================
--- projects/gwt-console/trunk/common/pom.xml	                        (rev 0)
+++ projects/gwt-console/trunk/common/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,63 @@
+<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 (Common)</name>
+  <groupId>org.jboss.bpm</groupId>
+  <artifactId>gwt-console-common</artifactId>
+  <packaging>jar</packaging>
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.bpm</groupId>
+    <artifactId>gwt-console-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>tjws</groupId>
+          <artifactId>webserver</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Copied: projects/gwt-console/trunk/common/src (from rev 5383, projects/gwt-console/branches/sam/common/src)

Copied: projects/gwt-console/trunk/common/src/main (from rev 5383, projects/gwt-console/branches/sam/common/src/main)

Copied: projects/gwt-console/trunk/common/src/main/java (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java)

Copied: projects/gwt-console/trunk/common/src/main/java/org (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org)

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss)

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm)

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console)

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server)

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson)

Deleted: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java
===================================================================
--- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,40 +0,0 @@
-/*
- * 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.server.gson;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class GsonFactory
-{
-   public static Gson createInstance()
-   {
-      Gson gson = new GsonBuilder()
-        .setDateFormat("yyyy-MM-dd HH:mm:ss")
-        .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) 
-        .create();
-      return gson;
-   }
-}

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java)
===================================================================
--- projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	                        (rev 0)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,40 @@
+/*
+ * 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.server.gson;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class GsonFactory
+{
+   public static Gson createInstance()
+   {
+      Gson gson = new GsonBuilder()
+        .setDateFormat("yyyy-MM-dd HH:mm:ss")
+        .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) 
+        .create();
+      return gson;
+   }
+}

Deleted: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java
===================================================================
--- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,69 +0,0 @@
-/*
- * 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.server.gson;
-
-import com.google.gson.*;
-
-import java.util.Date;
-import java.text.*;
-import java.lang.reflect.Type;
-
-
-/**
- * A default type adapter for a {@link java.util.Date} object.<br>
- * Create a GSON instance that can serialize/deserialize "java.util.Date" objects:
- * <pre>
- * Gson gson = new GsonBuilder()
- * .registerTypeAdapter(new DateTypeAdapter())
- * .create();
- * </pre>
- *
- * @author Joel Leitch
- */
-public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date>
-{
-   private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-   public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context)
-   {
-      String dateFormatAsString = format.format(src);
-      return new JsonPrimitive(dateFormatAsString);
-   }
-
-   public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-     throws JsonParseException
-   {
-      if (!(json instanceof JsonPrimitive)) {
-         throw new JsonParseException("The date should be a string value");
-      }
-
-      try
-      {
-         return format.parse(json.getAsString());
-      }
-      catch (ParseException e)
-      {
-         throw new JsonParseException(e);
-      }
-
-   }
-}

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java)
===================================================================
--- projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	                        (rev 0)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,69 @@
+/*
+ * 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.server.gson;
+
+import com.google.gson.*;
+
+import java.util.Date;
+import java.text.*;
+import java.lang.reflect.Type;
+
+
+/**
+ * A default type adapter for a {@link java.util.Date} object.<br>
+ * Create a GSON instance that can serialize/deserialize "java.util.Date" objects:
+ * <pre>
+ * Gson gson = new GsonBuilder()
+ * .registerTypeAdapter(new DateTypeAdapter())
+ * .create();
+ * </pre>
+ *
+ * @author Joel Leitch
+ */
+public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date>
+{
+   private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+   public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context)
+   {
+      String dateFormatAsString = format.format(src);
+      return new JsonPrimitive(dateFormatAsString);
+   }
+
+   public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+     throws JsonParseException
+   {
+      if (!(json instanceof JsonPrimitive)) {
+         throw new JsonParseException("The date should be a string value");
+      }
+
+      try
+      {
+         return format.parse(json.getAsString());
+      }
+      catch (ParseException e)
+      {
+         throw new JsonParseException(e);
+      }
+
+   }
+}

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util)

Deleted: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java
===================================================================
--- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,29 +0,0 @@
-/*
- * 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.server.util;
-
- at java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface RsComment {
-
-  java.lang.String title();
-  java.lang.String description();
-}
\ No newline at end of file

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java)
===================================================================
--- projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	                        (rev 0)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,29 @@
+/*
+ * 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.server.util;
+
+ at java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public @interface RsComment {
+
+  java.lang.String title();
+  java.lang.String description();
+}
\ No newline at end of file

Deleted: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java
===================================================================
--- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,166 +0,0 @@
-/*
- * 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.server.util;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Date;
-
-/**
- * Creates HTML documention for JAX-RS resource classes.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class RsDocBuilder
-{
-  private String webContext;
-  private Class[] rootResources;
-
-  public RsDocBuilder(String webContext, Class[] rootResources)
-  {
-    this.rootResources = rootResources;
-    this.webContext = webContext.startsWith("/") ? webContext : "/"+webContext;
-  }
-
-  public String getWebContext()
-  {
-    return webContext;
-  }
-
-  public Class[] getRootResources()
-  {
-    return rootResources;
-  }
-
-  private StringBuffer build(Class root)
-  {
-    Path rootPath = (Path)root.getAnnotation(Path.class);
-    RsComment rootComment = (RsComment)root.getAnnotation(RsComment.class);
-
-    List<Representation> representations = new ArrayList<Representation>();
-
-    for(Method m : root.getDeclaredMethods())
-    {
-      Path resPath = m.getAnnotation(Path.class);
-      if(resPath!=null)
-      {
-        Representation r = new Representation();
-
-        r.path = resPath.value();
-        r.httpMethod = m.getAnnotation(GET.class)!=null ? "GET" : "POST"; // currently limited to those
-        r.consume = (m.getAnnotation(Consumes.class)!=null) ?
-            arrayToString(m.getAnnotation(Consumes.class).value()) : "*/*";
-        r.produce = (m.getAnnotation(Produces.class)!=null) ?
-            arrayToString(m.getAnnotation(Produces.class).value()) : "*/*";
-        representations.add(r);
-      }
-    }
-
-    StringBuffer sb = new StringBuffer();
-
-    if(rootComment!=null)
-    {
-      sb.append("<tr>");
-      sb.append("<td colspan=5 style='border-bottom:1px solid black;'>");
-      sb.append("<b>").append(rootComment.title()).append("</b>").append("<br>");
-      sb.append("<i>").append(rootComment.description()).append("</i>");
-      sb.append("</td>");
-      sb.append("</tr>");
-    }
-
-    for(Representation r : representations)
-    {
-      sb.append("<tr>");
-      sb.append("<td>").append(r.httpMethod.toUpperCase()).append("</td>");
-      sb.append("<td>").append(buildPath(rootPath.value(),r.path)).append("</td>");
-      sb.append("<td>").append("").append("</td>"); // description
-      sb.append("<td>").append(r.consume).append("</td>");
-      sb.append("<td>").append(r.produce).append("</td>");
-      sb.append("</tr>");      
-    }
-
-    sb.append("<tr><td colspan=5>&nbsp;</td></tr>");
-    
-    return sb;
-  }
-
-  private String arrayToString(String[] arr)
-  {
-    StringBuffer sb = new StringBuffer();
-    for(int i=0; i<arr.length; i++)
-    {
-      sb.append(arr[i]);
-      if(i<arr.length-1)
-        sb.append(",");
-    }
-    return sb.toString();
-  }
-
-  private String buildPath(String root, String resourcePath)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(webContext);
-    sb.append("/").append(root).append("/");
-    sb.append(resourcePath);
-    return sb.toString();
-  }
-
-  public StringBuffer build()
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append("<html>").append("<body style='font-family: sans-serif; font-size:10pt;'>");
-    sb.append("<!--").append(" generated by RsDoc at ").append( new Date() ).append(" -->");
-    sb.append("<table style='margin-top:10px;' width='100%'>");
-
-    sb.append("<tr>");
-    sb.append("<th>").append("Method").append("</th>");
-    sb.append("<th>").append("Path").append("</th>");
-    sb.append("<th>").append("Description").append("</th>"); // description
-    sb.append("<th>").append("Consumes").append("</th>");
-    sb.append("<th>").append("Produces").append("</th>");
-    sb.append("</tr>");
-    
-    for(Class c : rootResources)
-    {
-      sb.append(
-          build(c).toString()
-      );
-    }
-    sb.append("</table>");
-    sb.append("</body>").append("<html>");
-    return sb;
-
-  }
-
-  private class Representation
-  {
-    String description,title = "";
-    String consume,produce = "";
-    String path;
-    String httpMethod;
-  }
-}

Copied: projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java (from rev 5383, projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java)
===================================================================
--- projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	                        (rev 0)
+++ projects/gwt-console/trunk/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,166 @@
+/*
+ * 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.server.util;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+
+/**
+ * Creates HTML documention for JAX-RS resource classes.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class RsDocBuilder
+{
+  private String webContext;
+  private Class[] rootResources;
+
+  public RsDocBuilder(String webContext, Class[] rootResources)
+  {
+    this.rootResources = rootResources;
+    this.webContext = webContext.startsWith("/") ? webContext : "/"+webContext;
+  }
+
+  public String getWebContext()
+  {
+    return webContext;
+  }
+
+  public Class[] getRootResources()
+  {
+    return rootResources;
+  }
+
+  private StringBuffer build(Class root)
+  {
+    Path rootPath = (Path)root.getAnnotation(Path.class);
+    RsComment rootComment = (RsComment)root.getAnnotation(RsComment.class);
+
+    List<Representation> representations = new ArrayList<Representation>();
+
+    for(Method m : root.getDeclaredMethods())
+    {
+      Path resPath = m.getAnnotation(Path.class);
+      if(resPath!=null)
+      {
+        Representation r = new Representation();
+
+        r.path = resPath.value();
+        r.httpMethod = m.getAnnotation(GET.class)!=null ? "GET" : "POST"; // currently limited to those
+        r.consume = (m.getAnnotation(Consumes.class)!=null) ?
+            arrayToString(m.getAnnotation(Consumes.class).value()) : "*/*";
+        r.produce = (m.getAnnotation(Produces.class)!=null) ?
+            arrayToString(m.getAnnotation(Produces.class).value()) : "*/*";
+        representations.add(r);
+      }
+    }
+
+    StringBuffer sb = new StringBuffer();
+
+    if(rootComment!=null)
+    {
+      sb.append("<tr>");
+      sb.append("<td colspan=5 style='border-bottom:1px solid black;'>");
+      sb.append("<b>").append(rootComment.title()).append("</b>").append("<br>");
+      sb.append("<i>").append(rootComment.description()).append("</i>");
+      sb.append("</td>");
+      sb.append("</tr>");
+    }
+
+    for(Representation r : representations)
+    {
+      sb.append("<tr>");
+      sb.append("<td>").append(r.httpMethod.toUpperCase()).append("</td>");
+      sb.append("<td>").append(buildPath(rootPath.value(),r.path)).append("</td>");
+      sb.append("<td>").append("").append("</td>"); // description
+      sb.append("<td>").append(r.consume).append("</td>");
+      sb.append("<td>").append(r.produce).append("</td>");
+      sb.append("</tr>");      
+    }
+
+    sb.append("<tr><td colspan=5>&nbsp;</td></tr>");
+    
+    return sb;
+  }
+
+  private String arrayToString(String[] arr)
+  {
+    StringBuffer sb = new StringBuffer();
+    for(int i=0; i<arr.length; i++)
+    {
+      sb.append(arr[i]);
+      if(i<arr.length-1)
+        sb.append(",");
+    }
+    return sb.toString();
+  }
+
+  private String buildPath(String root, String resourcePath)
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append(webContext);
+    sb.append("/").append(root).append("/");
+    sb.append(resourcePath);
+    return sb.toString();
+  }
+
+  public StringBuffer build()
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append("<html>").append("<body style='font-family: sans-serif; font-size:10pt;'>");
+    sb.append("<!--").append(" generated by RsDoc at ").append( new Date() ).append(" -->");
+    sb.append("<table style='margin-top:10px;' width='100%'>");
+
+    sb.append("<tr>");
+    sb.append("<th>").append("Method").append("</th>");
+    sb.append("<th>").append("Path").append("</th>");
+    sb.append("<th>").append("Description").append("</th>"); // description
+    sb.append("<th>").append("Consumes").append("</th>");
+    sb.append("<th>").append("Produces").append("</th>");
+    sb.append("</tr>");
+    
+    for(Class c : rootResources)
+    {
+      sb.append(
+          build(c).toString()
+      );
+    }
+    sb.append("</table>");
+    sb.append("</body>").append("<html>");
+    return sb;
+
+  }
+
+  private class Representation
+  {
+    String description,title = "";
+    String consume,produce = "";
+    String path;
+    String httpMethod;
+  }
+}

Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -12,7 +12,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="gwt-rpc" exported="" />
-    <orderEntry type="module" module-name="workspace-api" />
     <orderEntry type="module" module-name="profiles" />
     <orderEntry type="module" module-name="gwt-parent" />
     <orderEntry type="module-library" exported="">

Modified: projects/gwt-console/trunk/gui/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/gui/war/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -350,6 +350,68 @@
     </profile>
 
     <profile>
+      <id>sam-console.profile</id>
+      <activation>
+        <property>
+          <name>console.profile</name>
+          <value>sam</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss.sam</groupId>
+          <artifactId>gwt-console-profile-sam</artifactId>
+          <version>${version}</version>
+        </dependency>        
+         <dependency>
+          <groupId>org.jboss.sam</groupId>
+          <artifactId>sam-gui</artifactId>
+           <version>${version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.sam</groupId>
+          <artifactId>sam-gui</artifactId>
+          <classifier>sources</classifier>
+          <version>${version}</version>
+        </dependency>
+      </dependencies>
+      <properties>
+        <console.app.webcontext>sam-console</console.app.webcontext>
+      </properties>
+      <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.sam</groupId>
+                      <artifactId>gwt-console-profile-sam</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>
@@ -385,26 +447,5 @@
         </os>
       </activation>
     </profile>
-
-    <profile>
-      <id>plugin-example</id>
-      <dependencies>
-        <!-- example plugin, GWT requires the soures as well -->
-
-        <dependency>
-          <groupId>org.jboss.bpm.console</groupId>
-          <artifactId>mapsplugin</artifactId>
-          <version>${version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.jboss.bpm.console</groupId>
-          <artifactId>mapsplugin</artifactId>
-          <classifier>sources</classifier>
-          <version>${version}</version>
-        </dependency>
-      </dependencies>
-
-    </profile>
   </profiles>
 </project>

Modified: projects/gwt-console/trunk/gui/workspace-api/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/gui/workspace-api/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -35,8 +35,7 @@
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <scope>provided</scope>
+      <version>${gwt.version}</version>      
     </dependency>
 
     <dependency>

Modified: projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -9,7 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" exported="" />
+    <orderEntry type="module" module-name="gwt-parent" />
     <orderEntry type="module-library" exported="">
       <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
         <CLASSES>

Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/gwt-parent.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -4,6 +4,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/common/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/java" isTestSource="false" />
@@ -14,14 +15,20 @@
       <sourceFolder url="file://$MODULE_DIR$/gui/war/src/test/resources" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/gui/workspace-api/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gui/workspace-api/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/gui/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/gui/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/profile/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/profile/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/server/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/sam/server/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/server/server-integration/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="workspace-api" exported="" />
     <orderEntry type="module" module-name="profiles" exported="" />
     <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:test">
@@ -236,6 +243,325 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -41,6 +41,8 @@
     <module>rpc</module>
     <module>server</module>
     <module>gui</module>
+    <module>sam</module>
+    <module>common</module>
   </modules>
 
   <dependencyManagement>

Copied: projects/gwt-console/trunk/sam (from rev 5383, projects/gwt-console/branches/sam/sam)

Copied: projects/gwt-console/trunk/sam/gui (from rev 5383, projects/gwt-console/branches/sam/sam/gui)

Deleted: projects/gwt-console/trunk/sam/gui/pom.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/gui/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/gui/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,27 +0,0 @@
-<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 - SAM Console (GUI SAM)</name>
-  <groupId>org.jboss.sam</groupId>
-  <artifactId>sam-gui</artifactId>
-  <packaging>jar</packaging>
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.sam</groupId>
-    <artifactId>sam-console-extension</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-workspace-api</artifactId>
-      <version>${version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

Copied: projects/gwt-console/trunk/sam/gui/pom.xml (from rev 5383, projects/gwt-console/branches/sam/sam/gui/pom.xml)
===================================================================
--- projects/gwt-console/trunk/sam/gui/pom.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/gui/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,27 @@
+<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 - SAM Console (GUI SAM)</name>
+  <groupId>org.jboss.sam</groupId>
+  <artifactId>sam-gui</artifactId>
+  <packaging>jar</packaging>
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.sam</groupId>
+    <artifactId>sam-console-extension</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>gwt-console-workspace-api</artifactId>
+      <version>${version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

Deleted: projects/gwt-console/trunk/sam/gui/sam-gui.iml
===================================================================
--- projects/gwt-console/branches/sam/sam/gui/sam-gui.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/gui/sam-gui.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,173 +0,0 @@
-<?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$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/sam/gui/sam-gui.iml (from rev 5383, projects/gwt-console/branches/sam/sam/gui/sam-gui.iml)
===================================================================
--- projects/gwt-console/trunk/sam/gui/sam-gui.iml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/gui/sam-gui.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,173 @@
+<?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$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gwt-parent" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Copied: projects/gwt-console/trunk/sam/gui/src (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src)

Copied: projects/gwt-console/trunk/sam/gui/src/main (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console)

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console/client)

Deleted: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java
===================================================================
--- projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,74 +0,0 @@
-/*
- * 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 org.gwt.mosaic.ui.client.Label;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class SAMEditor extends Editor
-{
-  public final static String ID = SAMEditor.class.getName();
-
-  private boolean initialized;
-
-  public SAMEditor(ApplicationContext appContext)
-  {
-    super(appContext);
-  }
-
-  public void initialize()
-  {
-    if(!initialized)
-    {
-      LayoutPanel layout = new LayoutPanel();
-      layout.add(new Label("Hello form SAM"));
-
-      this.add(layout);
-      
-      initialized = true;
-    }
-  }
-
-  public String getEditorId()
-  {
-    return ID;
-  }
-
-  public String getTitle()
-  {
-    return "Overview";
-  }
-
-  public MenuSection provideMenuSection()
-  {
-    //ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
-
-    return new MenuSection(
-        "Activity Monitor",
-        null,
-        new SAMEditorNavigation(appContext)
-    );
-  }
-}

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java)
===================================================================
--- projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java	                        (rev 0)
+++ projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditor.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,74 @@
+/*
+ * 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 org.gwt.mosaic.ui.client.Label;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class SAMEditor extends Editor
+{
+  public final static String ID = SAMEditor.class.getName();
+
+  private boolean initialized;
+
+  public SAMEditor(ApplicationContext appContext)
+  {
+    super(appContext);
+  }
+
+  public void initialize()
+  {
+    if(!initialized)
+    {
+      LayoutPanel layout = new LayoutPanel();
+      layout.add(new Label("Hello form SAM"));
+
+      this.add(layout);
+      
+      initialized = true;
+    }
+  }
+
+  public String getEditorId()
+  {
+    return ID;
+  }
+
+  public String getTitle()
+  {
+    return "Overview";
+  }
+
+  public MenuSection provideMenuSection()
+  {
+    //ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
+    return new MenuSection(
+        "Activity Monitor",
+        null,
+        new SAMEditorNavigation(appContext)
+    );
+  }
+}

Deleted: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java
===================================================================
--- projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,61 +0,0 @@
-/*
- * 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.user.client.ui.Tree;
-import com.google.gwt.user.client.ui.TreeItem;
-import com.google.gwt.user.client.ui.TreeListener;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-class SAMEditorNavigation extends Tree
-{
-
-  public SAMEditorNavigation(final ApplicationContext appContext)
-  {
-    super.setTitle("Activity Monitor");
-
-    TreeItem root = addItem("Base Setup");
-    TreeItem epn= root.addItem("List EPN");
-
-    addTreeListener(
-        new TreeListener()
-        {
-          public void onTreeItemSelected(TreeItem treeItem)
-          {
-            if("List EPN".equals(treeItem.getText()))
-            {
-              //Workspace workspace = appContext.getWorkpace();
-              //workspace.showEditor(ProcessEditor.ID);
-            }
-          }
-
-          public void onTreeItemStateChanged(TreeItem treeItem)
-          {
-
-          }
-        }
-    );
-  }
-}
-

Copied: projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java)
===================================================================
--- projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java	                        (rev 0)
+++ projects/gwt-console/trunk/sam/gui/src/main/java/org/jboss/bpm/console/client/SAMEditorNavigation.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,61 @@
+/*
+ * 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.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
+import com.google.gwt.user.client.ui.TreeListener;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+class SAMEditorNavigation extends Tree
+{
+
+  public SAMEditorNavigation(final ApplicationContext appContext)
+  {
+    super.setTitle("Activity Monitor");
+
+    TreeItem root = addItem("Base Setup");
+    TreeItem epn= root.addItem("List EPN");
+
+    addTreeListener(
+        new TreeListener()
+        {
+          public void onTreeItemSelected(TreeItem treeItem)
+          {
+            if("List EPN".equals(treeItem.getText()))
+            {
+              //Workspace workspace = appContext.getWorkpace();
+              //workspace.showEditor(ProcessEditor.ID);
+            }
+          }
+
+          public void onTreeItemStateChanged(TreeItem treeItem)
+          {
+
+          }
+        }
+    );
+  }
+}
+

Copied: projects/gwt-console/trunk/sam/gui/src/main/resources (from rev 5383, projects/gwt-console/branches/sam/sam/gui/src/main/resources)

Deleted: projects/gwt-console/trunk/sam/pom.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,24 +0,0 @@
-<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 - SAM Console (SAM)</name>
-  <groupId>org.jboss.sam</groupId>
-  <artifactId>sam-console-extension</artifactId>
-  <packaging>pom</packaging>
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.bpm</groupId>
-    <artifactId>gwt-console-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <modules>
-    <module>server</module>
-    <module>profile</module>
-    <module>gui</module>
-  </modules>
-</project>

Copied: projects/gwt-console/trunk/sam/pom.xml (from rev 5383, projects/gwt-console/branches/sam/sam/pom.xml)
===================================================================
--- projects/gwt-console/trunk/sam/pom.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,24 @@
+<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 - SAM Console (SAM)</name>
+  <groupId>org.jboss.sam</groupId>
+  <artifactId>sam-console-extension</artifactId>
+  <packaging>pom</packaging>
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.bpm</groupId>
+    <artifactId>gwt-console-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <modules>
+    <module>server</module>
+    <module>profile</module>
+    <module>gui</module>
+  </modules>
+</project>

Copied: projects/gwt-console/trunk/sam/profile (from rev 5383, projects/gwt-console/branches/sam/sam/profile)

Deleted: projects/gwt-console/trunk/sam/profile/pom.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,19 +0,0 @@
-<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 - SAM Console (GUI Profile SAM)</name>
-  <groupId>org.jboss.sam</groupId>
-  <artifactId>gwt-console-profile-sam</artifactId>
-  <packaging>jar</packaging>
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.sam</groupId>
-    <artifactId>sam-console-extension</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  
-</project>

Copied: projects/gwt-console/trunk/sam/profile/pom.xml (from rev 5383, projects/gwt-console/branches/sam/sam/profile/pom.xml)
===================================================================
--- projects/gwt-console/trunk/sam/profile/pom.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -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 - SAM Console (GUI Profile SAM)</name>
+  <groupId>org.jboss.sam</groupId>
+  <artifactId>gwt-console-profile-sam</artifactId>
+  <packaging>jar</packaging>
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.sam</groupId>
+    <artifactId>sam-console-extension</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  
+</project>

Deleted: projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/sam-gui-profile.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,173 +0,0 @@
-<?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$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml (from rev 5383, projects/gwt-console/branches/sam/sam/profile/sam-gui-profile.iml)
===================================================================
--- projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/sam-gui-profile.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,173 @@
+<?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$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gwt-parent" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Deleted: projects/gwt-console/trunk/sam/profile/sam-profile.iml
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/sam-profile.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/sam-profile.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,183 +0,0 @@
-<?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$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" />
-    <orderEntry type="module" module-name="workspace-api" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:compile">
-        <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: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/sam/profile/sam-profile.iml (from rev 5383, projects/gwt-console/branches/sam/sam/profile/sam-profile.iml)
===================================================================
--- projects/gwt-console/trunk/sam/profile/sam-profile.iml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/sam-profile.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,183 @@
+<?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$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gwt-parent" />
+    <orderEntry type="module" module-name="workspace-api" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:compile">
+        <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: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Copied: projects/gwt-console/trunk/sam/profile/src (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src)

Copied: projects/gwt-console/trunk/sam/profile/src/main (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main)

Copied: projects/gwt-console/trunk/sam/profile/src/main/java (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/java)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp)

Deleted: projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,12 +0,0 @@
-{"xhp": {
-    "version": "1.1",
-    "services": [
-        {"id": "default",
-         "url":"http://localhost:8080/activity-monitor",
-         "passthrough":true,
-         "username":"sam",
-         "password":"password"
-        },
-    ]
-  }
-}
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json)
===================================================================
--- projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/jmaki/xhp/xhp.json	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,12 @@
+{"xhp": {
+    "version": "1.1",
+    "services": [
+        {"id": "default",
+         "url":"http://localhost:8080/activity-monitor",
+         "passthrough":true,
+         "username":"sam",
+         "password":"password"
+        },
+    ]
+  }
+}
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public)

Deleted: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,8 +0,0 @@
-var consoleConfig = {
-  profileName:          "SAM Console",
-  logo:                 "sam-logo.png",
-  serverWebContext:     "/activity-monitor",  
-  overallReportFile:   "",
-  processSummaryReportFile: "",
-  instanceSummaryReportFile:   ""
-};
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js)
===================================================================
--- projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,8 @@
+var consoleConfig = {
+  profileName:          "SAM Console",
+  logo:                 "sam-logo.png",
+  serverWebContext:     "/activity-monitor",  
+  overallReportFile:   "",
+  processSummaryReportFile: "",
+  instanceSummaryReportFile:   ""
+};
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/images (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/images)

Deleted: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png
===================================================================
(Binary files differ)

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png)
===================================================================
(Binary files differ)

Deleted: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg
===================================================================
--- projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1 +0,0 @@
-org.jboss.bpm.console.client.SAMEditor
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg (from rev 5383, projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg)
===================================================================
--- projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg	                        (rev 0)
+++ projects/gwt-console/trunk/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1 @@
+org.jboss.bpm.console.client.SAMEditor
\ No newline at end of file

Deleted: projects/gwt-console/trunk/sam/sam-toplevel.iml
===================================================================
--- projects/gwt-console/branches/sam/sam/sam-toplevel.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/sam-toplevel.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,332 +0,0 @@
-<?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$/gui/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gui/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/profile/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/profile/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
-        <CLASSES>
-          <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">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
-        <CLASSES>
-          <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">
-      <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">
-      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.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>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: 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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: junit:junit:jar:3.8.1:test">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.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>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/sam/sam-toplevel.iml (from rev 5383, projects/gwt-console/branches/sam/sam/sam-toplevel.iml)
===================================================================
--- projects/gwt-console/trunk/sam/sam-toplevel.iml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/sam-toplevel.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,332 @@
+<?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$/gui/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gui/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/profile/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/profile/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gwt-parent" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+        <CLASSES>
+          <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">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+        <CLASSES>
+          <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">
+      <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">
+      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.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>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: 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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: junit:junit:jar:3.8.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.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>
+    <orderEntryProperties />
+  </component>
+</module>
+

Copied: projects/gwt-console/trunk/sam/server (from rev 5383, projects/gwt-console/branches/sam/sam/server)

Deleted: projects/gwt-console/trunk/sam/server/pom.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/server/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,195 +0,0 @@
-<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 - SAM Console (SAM Server)</name>
-  <groupId>org.jboss.sam</groupId>
-  <artifactId>sam-server</artifactId>
-  <packaging>war</packaging>
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.sam</groupId>
-    <artifactId>sam-console-extension</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <!-- Properties -->
-  <properties>
-    <report.server.version>1.0.0-SNAPSHOT</report.server.version>   
-  </properties>
-
-  <dependencies>
-    <!-- Module -->
-    <dependency>
-      <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-common</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-rpc</artifactId>
-      <version>${version}</version>      
-    </dependency>
-
-    <!-- GWT related -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-servlet</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Other -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-jaxrs</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>tjws</groupId>
-          <artifactId>webserver</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.stream</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-multipart-provider</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>tjws</groupId>
-          <artifactId>webserver</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml.stream</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>     
-  </dependencies>
-
-  <build>
-    <!--  Include SOURCE in output artifact for GWT (GWT libraries must include source) -->
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-
-    </plugins>
-    <finalName>sam-server</finalName>
-  </build>
-</project>

Copied: projects/gwt-console/trunk/sam/server/pom.xml (from rev 5383, projects/gwt-console/branches/sam/sam/server/pom.xml)
===================================================================
--- projects/gwt-console/trunk/sam/server/pom.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,195 @@
+<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 - SAM Console (SAM Server)</name>
+  <groupId>org.jboss.sam</groupId>
+  <artifactId>sam-server</artifactId>
+  <packaging>war</packaging>
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.sam</groupId>
+    <artifactId>sam-console-extension</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <!-- Properties -->
+  <properties>
+    <report.server.version>1.0.0-SNAPSHOT</report.server.version>   
+  </properties>
+
+  <dependencies>
+    <!-- Module -->
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>gwt-console-common</artifactId>
+      <version>${version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>gwt-console-rpc</artifactId>
+      <version>${version}</version>      
+    </dependency>
+
+    <!-- GWT related -->
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-servlet</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Other -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.ejb</groupId>
+      <artifactId>ejb-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>tjws</groupId>
+          <artifactId>webserver</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-multipart-provider</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>tjws</groupId>
+          <artifactId>webserver</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>provided</scope>
+    </dependency>     
+  </dependencies>
+
+  <build>
+    <!--  Include SOURCE in output artifact for GWT (GWT libraries must include source) -->
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    <finalName>sam-server</finalName>
+  </build>
+</project>

Deleted: projects/gwt-console/trunk/sam/server/sam-server.iml
===================================================================
--- projects/gwt-console/branches/sam/sam/server/sam-server.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/sam-server.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,218 +0,0 @@
-<?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$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="gwt-parent" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: junit:junit:jar:3.8.1:test">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <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!/" />
-        </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: javax.xml:jaxb-impl:jar:2.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
-        <CLASSES>
-          <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">
-      <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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.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>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: 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!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: projects/gwt-console/trunk/sam/server/sam-server.iml (from rev 5383, projects/gwt-console/branches/sam/sam/server/sam-server.iml)
===================================================================
--- projects/gwt-console/trunk/sam/server/sam-server.iml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/sam-server.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,218 @@
+<?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$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gwt-parent" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: junit:junit:jar:3.8.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </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: javax.xml:jaxb-impl:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+        <CLASSES>
+          <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">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.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>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: 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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Copied: projects/gwt-console/trunk/sam/server/src (from rev 5383, projects/gwt-console/branches/sam/sam/server/src)

Copied: projects/gwt-console/trunk/sam/server/src/main (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main)

Copied: projects/gwt-console/trunk/sam/server/src/main/java (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java)

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org)

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss)

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam)

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console)

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server)

Deleted: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,57 +0,0 @@
-/*
- * 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.sam.console.server;
-
-import javax.ws.rs.core.Application;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * JAX-RS core component.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class ConsoleServerApplication extends Application
-{
-  HashSet<Object> singletons = new HashSet<Object>();
-
-  public ConsoleServerApplication()
-  {
-    singletons.add(new InfoFacade());
-    singletons.add(new UserMgmtFacade());
-
-  }
-
-  @Override
-  public Set<Class<?>> getClasses()
-  {
-    HashSet<Class<?>> set = new HashSet<Class<?>>();
-    return set;
-  }
-
-  @Override
-  public Set<Object> getSingletons()
-  {
-    return singletons;
-  }
-}
-

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,57 @@
+/*
+ * 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.sam.console.server;
+
+import javax.ws.rs.core.Application;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * JAX-RS core component.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class ConsoleServerApplication extends Application
+{
+  HashSet<Object> singletons = new HashSet<Object>();
+
+  public ConsoleServerApplication()
+  {
+    singletons.add(new InfoFacade());
+    singletons.add(new UserMgmtFacade());
+
+  }
+
+  @Override
+  public Set<Class<?>> getClasses()
+  {
+    HashSet<Class<?>> set = new HashSet<Class<?>>();
+    return set;
+  }
+
+  @Override
+  public Set<Object> getSingletons()
+  {
+    return singletons;
+  }
+}
+

Deleted: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,72 +0,0 @@
-/*
- * 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.sam.console.server;
-
-import com.google.gson.Gson;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.Path;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.servlet.http.HttpServletRequest;
-import org.jboss.bpm.console.server.util.*;
-import org.jboss.bpm.console.server.gson.GsonFactory;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at Path("server")
- at RsComment(
-    title = "Server Info",
-    description = "General REST server information"
-)
-public class InfoFacade
-{
-  
-  @GET
-  @Path("resources")
-  @Produces("text/html")
-  public Response getPublishedUrls(
-      @Context
-      HttpServletRequest request
-  )
-  {
-    final Class[] rootResources = new Class[]
-        {
-            InfoFacade.class,
-            UserMgmtFacade.class            
-        };
-
-    RsDocBuilder rsDocBuilder = new RsDocBuilder(request.getContextPath(),rootResources);
-    StringBuffer sb = rsDocBuilder.build();
-    return Response.ok(sb.toString()).build();
-  }
-
-  private Response createJsonResponse(Object wrapper)
-  {
-    Gson gson = GsonFactory.createInstance();
-    String json = gson.toJson(wrapper);
-    return Response.ok(json).type("application/json").build();
-  }
-}
-

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,72 @@
+/*
+ * 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.sam.console.server;
+
+import com.google.gson.Gson;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.Path;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.servlet.http.HttpServletRequest;
+import org.jboss.bpm.console.server.util.*;
+import org.jboss.bpm.console.server.gson.GsonFactory;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at Path("server")
+ at RsComment(
+    title = "Server Info",
+    description = "General REST server information"
+)
+public class InfoFacade
+{
+  
+  @GET
+  @Path("resources")
+  @Produces("text/html")
+  public Response getPublishedUrls(
+      @Context
+      HttpServletRequest request
+  )
+  {
+    final Class[] rootResources = new Class[]
+        {
+            InfoFacade.class,
+            UserMgmtFacade.class            
+        };
+
+    RsDocBuilder rsDocBuilder = new RsDocBuilder(request.getContextPath(),rootResources);
+    StringBuffer sb = rsDocBuilder.build();
+    return Response.ok(sb.toString()).build();
+  }
+
+  private Response createJsonResponse(Object wrapper)
+  {
+    Gson gson = GsonFactory.createInstance();
+    String json = gson.toJson(wrapper);
+    return Response.ok(json).type("application/json").build();
+  }
+}
+

Deleted: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,84 +0,0 @@
-/*
- * 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.sam.console.server;
-
-import com.google.gson.Gson;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.console.client.model.RoleAssignmentRef;
-import org.jboss.bpm.console.client.model.RoleAssignmentRefWrapper;
-import org.jboss.bpm.console.server.gson.GsonFactory;
-import org.jboss.bpm.console.server.util.RsComment;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * REST server module for accessing user related data.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at Path("identity")
- at RsComment(
-    title = "User management",
-    description = "Manage user and groups"
-)
-public class UserMgmtFacade
-{
-  private static final Log log = LogFactory.getLog(UserMgmtFacade.class);
-
-  @GET
-  @Path("user/roles")
-  @Produces("application/json")
-  public Response getRolesForJAASPrincipal(
-      @Context
-      HttpServletRequest request,
-      @QueryParam("roleCheck")
-      String roleCheck
-  )
-  {
-    List<RoleAssignmentRef> actualRoles = new ArrayList<RoleAssignmentRef>();
-
-    StringTokenizer tok = new StringTokenizer(roleCheck, ",");
-    while(tok.hasMoreTokens())
-    {
-      String possibleRole = tok.nextToken();
-      actualRoles.add( new RoleAssignmentRef(possibleRole, true));
-    }
-    return createJsonResponse( new RoleAssignmentRefWrapper(actualRoles));
-  }
-
-  private Response createJsonResponse(Object wrapper)
-  {
-    Gson gson = GsonFactory.createInstance();
-    String json = gson.toJson(wrapper);
-    return Response.ok(json).type("application/json").build();
-  }
-}

Copied: projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,84 @@
+/*
+ * 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.sam.console.server;
+
+import com.google.gson.Gson;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.console.client.model.RoleAssignmentRef;
+import org.jboss.bpm.console.client.model.RoleAssignmentRefWrapper;
+import org.jboss.bpm.console.server.gson.GsonFactory;
+import org.jboss.bpm.console.server.util.RsComment;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+ * REST server module for accessing user related data.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at Path("identity")
+ at RsComment(
+    title = "User management",
+    description = "Manage user and groups"
+)
+public class UserMgmtFacade
+{
+  private static final Log log = LogFactory.getLog(UserMgmtFacade.class);
+
+  @GET
+  @Path("user/roles")
+  @Produces("application/json")
+  public Response getRolesForJAASPrincipal(
+      @Context
+      HttpServletRequest request,
+      @QueryParam("roleCheck")
+      String roleCheck
+  )
+  {
+    List<RoleAssignmentRef> actualRoles = new ArrayList<RoleAssignmentRef>();
+
+    StringTokenizer tok = new StringTokenizer(roleCheck, ",");
+    while(tok.hasMoreTokens())
+    {
+      String possibleRole = tok.nextToken();
+      actualRoles.add( new RoleAssignmentRef(possibleRole, true));
+    }
+    return createJsonResponse( new RoleAssignmentRefWrapper(actualRoles));
+  }
+
+  private Response createJsonResponse(Object wrapper)
+  {
+    Gson gson = GsonFactory.createInstance();
+    String json = gson.toJson(wrapper);
+    return Response.ok(json).type("application/json").build();
+  }
+}

Copied: projects/gwt-console/trunk/sam/server/src/main/resources (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/resources)

Copied: projects/gwt-console/trunk/sam/server/src/main/webapp (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/webapp)

Copied: projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF)

Deleted: projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC
-      "-//JBoss//DTD Web Application 2.4//EN"
-      "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
-
-<jboss-web>
-
-   <!--security-domain>java:/jaas/jbpm-console</security-domain-->
-
-   <context-root>activity-monitor</context-root>
-
-</jboss-web>

Copied: projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/jboss-web.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC
+      "-//JBoss//DTD Web Application 2.4//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
+<jboss-web>
+
+   <!--security-domain>java:/jaas/jbpm-console</security-domain-->
+
+   <context-root>activity-monitor</context-root>
+
+</jboss-web>

Deleted: projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,66 +0,0 @@
-<!DOCTYPE web-app PUBLIC
-    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
-  <display-name>GWT Console Server</display-name>
-
-  <context-param>
-    <param-name>javax.ws.rs.core.Application</param-name>
-    <param-value>org.jboss.sam.console.server.ConsoleServerApplication</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>resteasy.servlet.mapping.prefix</param-name>
-    <param-value>/rs</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>
-      org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap
-    </listener-class>
-  </listener>
-
-  <servlet>
-    <servlet-name>Resteasy</servlet-name>
-    <servlet-class>
-      org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
-    </servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Resteasy</servlet-name>
-    <url-pattern>/rs/*</url-pattern>
-  </servlet-mapping>
-
-  <!--security-constraint>
-    <web-resource-collection>
-      <web-resource-name>Resteasy</web-resource-name>
-      <url-pattern>/rs/process/*</url-pattern>
-      <url-pattern>/rs/task/*</url-pattern>
-      <url-pattern>/rs/tasks/*</url-pattern>
-      <url-pattern>/rs/identity/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>administrator</role-name>
-      <role-name>manager</role-name>
-      <role-name>user</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>GWT Console Server</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>administrator</role-name>
-  </security-role>
-  <security-role>
-    <role-name>manager</role-name>
-  </security-role>
-  <security-role>
-    <role-name>user</role-name>
-  </security-role-->
-
-</web-app>

Copied: projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/WEB-INF/web.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,66 @@
+<!DOCTYPE web-app PUBLIC
+    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+  <display-name>GWT Console Server</display-name>
+
+  <context-param>
+    <param-name>javax.ws.rs.core.Application</param-name>
+    <param-value>org.jboss.sam.console.server.ConsoleServerApplication</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>resteasy.servlet.mapping.prefix</param-name>
+    <param-value>/rs</param-value>
+  </context-param>
+
+  <listener>
+    <listener-class>
+      org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap
+    </listener-class>
+  </listener>
+
+  <servlet>
+    <servlet-name>Resteasy</servlet-name>
+    <servlet-class>
+      org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>Resteasy</servlet-name>
+    <url-pattern>/rs/*</url-pattern>
+  </servlet-mapping>
+
+  <!--security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Resteasy</web-resource-name>
+      <url-pattern>/rs/process/*</url-pattern>
+      <url-pattern>/rs/task/*</url-pattern>
+      <url-pattern>/rs/tasks/*</url-pattern>
+      <url-pattern>/rs/identity/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>administrator</role-name>
+      <role-name>manager</role-name>
+      <role-name>user</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>GWT Console Server</realm-name>
+  </login-config>
+
+  <security-role>
+    <role-name>administrator</role-name>
+  </security-role>
+  <security-role>
+    <role-name>manager</role-name>
+  </security-role>
+  <security-role>
+    <role-name>user</role-name>
+  </security-role-->
+
+</web-app>

Deleted: projects/gwt-console/trunk/sam/server/src/main/webapp/index.html
===================================================================
--- projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/index.html	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,13 +0,0 @@
-<html>
-<body style='font-family: sans-serif; font-size:10pt;'>
-
-<h1>SAM Console Server</h1>
-
-<h2>Published URL's</h2>
-You can find a list of resources <a href="/activity-monitor/rs/server/resources">here</a>.
-
-<h2>Problems?</h2>
-Please post any questions to the <a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=295">gwt-console developer forum</a>.
-
-</body>
-</html>
\ No newline at end of file

Copied: projects/gwt-console/trunk/sam/server/src/main/webapp/index.html (from rev 5383, projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html)
===================================================================
--- projects/gwt-console/trunk/sam/server/src/main/webapp/index.html	                        (rev 0)
+++ projects/gwt-console/trunk/sam/server/src/main/webapp/index.html	2009-07-30 09:02:19 UTC (rev 5384)
@@ -0,0 +1,13 @@
+<html>
+<body style='font-family: sans-serif; font-size:10pt;'>
+
+<h1>SAM Console Server</h1>
+
+<h2>Published URL's</h2>
+You can find a list of resources <a href="/activity-monitor/rs/server/resources">here</a>.
+
+<h2>Problems?</h2>
+Please post any questions to the <a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=295">gwt-console developer forum</a>.
+
+</body>
+</html>
\ No newline at end of file

Modified: projects/gwt-console/trunk/server/server-core/pom.xml
===================================================================
--- projects/gwt-console/trunk/server/server-core/pom.xml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/pom.xml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -29,6 +29,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>gwt-console-common</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- GWT related -->
     <dependency>
       <groupId>com.google.gwt</groupId>

Modified: projects/gwt-console/trunk/server/server-core/server-core.iml
===================================================================
--- projects/gwt-console/trunk/server/server-core/server-core.iml	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/server-core.iml	2009-07-30 09:02:19 UTC (rev 5384)
@@ -13,9 +13,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="gwt-rpc" exported="" />
-    <orderEntry type="module" module-name="gwt-parent" exported="" />
     <orderEntry type="module" module-name="server-integration" exported="" />
     <orderEntry type="module" module-name="report-server" exported="" />
+    <orderEntry type="module" module-name="gwt-parent" />
     <orderEntry type="library" name="jaxb-impl-2.1" level="application" />
     <orderEntry type="module-library">
       <library>
@@ -26,6 +26,428 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: junit:junit:jar:3.8.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </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: javax.xml:jaxb-impl:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+        <CLASSES>
+          <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">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.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>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <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!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Deleted: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,40 +0,0 @@
-/*
- * 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.server.gson;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class GsonFactory
-{
-   public static Gson createInstance()
-   {
-      Gson gson = new GsonBuilder()
-        .setDateFormat("yyyy-MM-dd HH:mm:ss")
-        .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) 
-        .create();
-      return gson;
-   }
-}

Deleted: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,69 +0,0 @@
-/*
- * 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.server.gson;
-
-import com.google.gson.*;
-
-import java.util.Date;
-import java.text.*;
-import java.lang.reflect.Type;
-
-
-/**
- * A default type adapter for a {@link java.util.Date} object.<br>
- * Create a GSON instance that can serialize/deserialize "java.util.Date" objects:
- * <pre>
- * Gson gson = new GsonBuilder()
- * .registerTypeAdapter(new DateTypeAdapter())
- * .create();
- * </pre>
- *
- * @author Joel Leitch
- */
-public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date>
-{
-   private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-   public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context)
-   {
-      String dateFormatAsString = format.format(src);
-      return new JsonPrimitive(dateFormatAsString);
-   }
-
-   public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-     throws JsonParseException
-   {
-      if (!(json instanceof JsonPrimitive)) {
-         throw new JsonParseException("The date should be a string value");
-      }
-
-      try
-      {
-         return format.parse(json.getAsString());
-      }
-      catch (ParseException e)
-      {
-         throw new JsonParseException(e);
-      }
-
-   }
-}

Deleted: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,29 +0,0 @@
-/*
- * 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.server.util;
-
- at java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface RsComment {
-
-  java.lang.String title();
-  java.lang.String description();
-}
\ No newline at end of file

Deleted: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	2009-07-30 06:52:50 UTC (rev 5383)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java	2009-07-30 09:02:19 UTC (rev 5384)
@@ -1,180 +0,0 @@
-/*
- * 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.server.util;
-
-import org.jboss.bpm.console.server.ProcessMgmtFacade;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Date;
-
-/**
- * Creates HTML documention for JAX-RS resource classes.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class RsDocBuilder
-{
-  private String webContext;
-  private Class[] rootResources;
-
-  public RsDocBuilder(String webContext, Class[] rootResources)
-  {
-    this.rootResources = rootResources;
-    this.webContext = webContext.startsWith("/") ? webContext : "/"+webContext;
-  }
-
-  public static void main(String[] args)
-  {
-    RsDocBuilder rsDocBuilder = new RsDocBuilder(
-        "gwt-console-server",
-        new Class[] {ProcessMgmtFacade.class}
-    );
-
-    StringBuffer sb = rsDocBuilder.build(rsDocBuilder.getRootResources()[0]);
-    System.out.println(sb.toString());
-  }
-
-
-  public String getWebContext()
-  {
-    return webContext;
-  }
-
-  public Class[] getRootResources()
-  {
-    return rootResources;
-  }
-
-  private StringBuffer build(Class root)
-  {
-    Path rootPath = (Path)root.getAnnotation(Path.class);
-    RsComment rootComment = (RsComment)root.getAnnotation(RsComment.class);
-
-    List<Representation> representations = new ArrayList<Representation>();
-
-    for(Method m : root.getDeclaredMethods())
-    {
-      Path resPath = m.getAnnotation(Path.class);
-      if(resPath!=null)
-      {
-        Representation r = new Representation();
-
-        r.path = resPath.value();
-        r.httpMethod = m.getAnnotation(GET.class)!=null ? "GET" : "POST"; // currently limited to those
-        r.consume = (m.getAnnotation(Consumes.class)!=null) ?
-            arrayToString(m.getAnnotation(Consumes.class).value()) : "*/*";
-        r.produce = (m.getAnnotation(Produces.class)!=null) ?
-            arrayToString(m.getAnnotation(Produces.class).value()) : "*/*";
-        representations.add(r);
-      }
-    }
-
-    StringBuffer sb = new StringBuffer();
-
-    if(rootComment!=null)
-    {
-      sb.append("<tr>");
-      sb.append("<td colspan=5 style='border-bottom:1px solid black;'>");
-      sb.append("<b>").append(rootComment.title()).append("</b>").append("<br>");
-      sb.append("<i>").append(rootComment.description()).append("</i>");
-      sb.append("</td>");
-      sb.append("</tr>");
-    }
-
-    for(Representation r : representations)
-    {
-      sb.append("<tr>");
-      sb.append("<td>").append(r.httpMethod.toUpperCase()).append("</td>");
-      sb.append("<td>").append(buildPath(rootPath.value(),r.path)).append("</td>");
-      sb.append("<td>").append("").append("</td>"); // description
-      sb.append("<td>").append(r.consume).append("</td>");
-      sb.append("<td>").append(r.produce).append("</td>");
-      sb.append("</tr>");      
-    }
-
-    sb.append("<tr><td colspan=5>&nbsp;</td></tr>");
-    
-    return sb;
-  }
-
-  private String arrayToString(String[] arr)
-  {
-    StringBuffer sb = new StringBuffer();
-    for(int i=0; i<arr.length; i++)
-    {
-      sb.append(arr[i]);
-      if(i<arr.length-1)
-        sb.append(",");
-    }
-    return sb.toString();
-  }
-
-  private String buildPath(String root, String resourcePath)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(webContext);
-    sb.append("/").append(root).append("/");
-    sb.append(resourcePath);
-    return sb.toString();
-  }
-
-  public StringBuffer build()
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append("<html>").append("<body style='font-family: sans-serif; font-size:10pt;'>");
-    sb.append("<!--").append(" generated by RsDoc at ").append( new Date() ).append(" -->");
-    sb.append("<table style='margin-top:10px;' width='100%'>");
-
-    sb.append("<tr>");
-    sb.append("<th>").append("Method").append("</th>");
-    sb.append("<th>").append("Path").append("</th>");
-    sb.append("<th>").append("Description").append("</th>"); // description
-    sb.append("<th>").append("Consumes").append("</th>");
-    sb.append("<th>").append("Produces").append("</th>");
-    sb.append("</tr>");
-    
-    for(Class c : rootResources)
-    {
-      sb.append(
-          build(c).toString()
-      );
-    }
-    sb.append("</table>");
-    sb.append("</body>").append("<html>");
-    return sb;
-
-  }
-
-  private class Representation
-  {
-    String description,title = "";
-    String consume,produce = "";
-    String path;
-    String httpMethod;
-  }
-}



More information about the jbpm-commits mailing list