From d61cf7024f3768b78bc50f19cf635eff9fb3b2c0 Mon Sep 17 00:00:00 2001
From: Mark Drilling <mdrillin@redhat.com>
Date: Thu, 16 Apr 2015 11:10:10 -0500
Subject: [PATCH 1/3] Changes komodo dependency due to downgrade

---
 komodoweb-deps/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/komodoweb-deps/pom.xml b/komodoweb-deps/pom.xml
index 769af12..f9934a1 100644
--- a/komodoweb-deps/pom.xml
+++ b/komodoweb-deps/pom.xml
@@ -30,7 +30,7 @@
     <version.org.uberfire>0.6.0-SNAPSHOT</version.org.uberfire>
     <version.org.uberfire.ext>0.6.0-SNAPSHOT</version.org.uberfire.ext>
     <version.org.jboss.teiid>8.7.0.Final</version.org.jboss.teiid>
-    <version.org.komodo>1.0.0-SNAPSHOT</version.org.komodo>
+    <version.org.komodo>0.0.1-SNAPSHOT</version.org.komodo>
     <version.jboss>8.0.0.Final</version.jboss>
     <jbossas-version>${version.jboss}</jbossas-version>
     <version.org.mortbay.jetty>6.1.25</version.org.mortbay.jetty>

From a837dc611f97c8830b459566f00acf21405330a4 Mon Sep 17 00:00:00 2001
From: Mark Drilling <mdrillin@redhat.com>
Date: Mon, 1 Jun 2015 19:00:53 -0500
Subject: [PATCH 2/3] uf 07 updates

---
 komodoweb-deps/pom.xml                        |  50 ++----
 komodoweb-webapp/pom.xml                      | 170 +++++++++++++-----
 .../server/services/KomodoService.java        |   4 +-
 .../src/main/resources/ErraiApp.properties    |   2 +-
 .../src/main/resources/app.html.template      |  25 ---
 .../komodo/FastCompiledKomodoWebApp.gwt.xml   |   6 +-
 .../resources/org/komodo/KomodoWebApp.gwt.xml |  10 +-
 .../src/main/webapp/WEB-INF/web.xml           |  10 ++
 komodoweb-webapp/src/main/webapp/login.jsp    |   3 -
 9 files changed, 158 insertions(+), 122 deletions(-)
 delete mode 100644 komodoweb-webapp/src/main/resources/app.html.template

diff --git a/komodoweb-deps/pom.xml b/komodoweb-deps/pom.xml
index f9934a1..521db53 100644
--- a/komodoweb-deps/pom.xml
+++ b/komodoweb-deps/pom.xml
@@ -19,23 +19,21 @@
   </description>
 
   <properties>
-    <version.com.google.gwt>2.6.1</version.com.google.gwt>
+    <version.com.google.gwt>2.7.0</version.com.google.gwt>
     <!--
             gwt dnd should match the google gwt version. See matrix at
             https://code.google.com/p/gwt-dnd/wiki/GettingStarted
        -->
     <version.com.allen-sauer.gwt.dnd>3.3.3</version.com.allen-sauer.gwt.dnd>
     <version.org.jboss.integration-platform>6.0.0.CR13</version.org.jboss.integration-platform>
-    <version.org.jboss.errai>3.1.1.Final</version.org.jboss.errai>
-    <version.org.uberfire>0.6.0-SNAPSHOT</version.org.uberfire>
-    <version.org.uberfire.ext>0.6.0-SNAPSHOT</version.org.uberfire.ext>
+    <version.org.jboss.errai>3.2.0-SNAPSHOT</version.org.jboss.errai>
+    <version.org.uberfire>0.7.0-SNAPSHOT</version.org.uberfire>
+    <version.org.uberfire.ext>0.7.0-SNAPSHOT</version.org.uberfire.ext>
     <version.org.jboss.teiid>8.7.0.Final</version.org.jboss.teiid>
     <version.org.komodo>0.0.1-SNAPSHOT</version.org.komodo>
     <version.jboss>8.0.0.Final</version.jboss>
     <jbossas-version>${version.jboss}</jbossas-version>
-    <version.org.mortbay.jetty>6.1.25</version.org.mortbay.jetty>
     <version.org.infinispan>6.0.2.Final</version.org.infinispan>
-    <version.org.owasp.encoder>1.1.1</version.org.owasp.encoder>
     <version.com.github.gwtd3>1.1.1</version.com.github.gwtd3>
 
     <!-- temporary: makes the enforcerRule (illegal-transitive-dependency-check) not to break the build -->
@@ -82,21 +80,18 @@
         <!-- Errai -->
         <dependency>
             <groupId>org.jboss.errai.bom</groupId>
-            <artifactId>errai-bom</artifactId>
+            <artifactId>errai-internal-bom</artifactId>
             <version>${version.org.jboss.errai}</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.errai</groupId>
-            <artifactId>errai-security-client</artifactId>
-            <version>${version.org.jboss.errai}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.errai</groupId>
-            <artifactId>errai-security-picketlink</artifactId>
-            <version>${version.org.jboss.errai}</version>
-        </dependency>
+        
+      <!-- Errai dependency for CDI 1.0 Compat -->
+      <dependency>
+        <groupId>org.jboss.errai</groupId>
+        <artifactId>errai-weld-integration</artifactId>
+        <version>3.0.4.Final</version>
+      </dependency>
 
       <!-- GWT and GWT Extensions -->
       <dependency>
@@ -186,27 +181,6 @@
         <version>${version.org.owasp.encoder}</version>
       </dependency>
 
-      <!-- CDI Development Utils -->
-      <!-- This must be placed above com.google.gwt:gwt-dev to override the
-         Jetty that is present there -->
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>${version.org.mortbay.jetty}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-plus</artifactId>
-        <version>${version.org.mortbay.jetty}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-naming</artifactId>
-        <version>${version.org.mortbay.jetty}</version>
-      </dependency>
-
       <dependency>
         <groupId>com.github.gwtd3</groupId>
         <artifactId>gwt-d3-api</artifactId>
diff --git a/komodoweb-webapp/pom.xml b/komodoweb-webapp/pom.xml
index fd5c80d..3f7be44 100644
--- a/komodoweb-webapp/pom.xml
+++ b/komodoweb-webapp/pom.xml
@@ -59,10 +59,50 @@
       <artifactId>guice</artifactId>
     </dependency>
 
+    <!-- Upload -->
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+
     <!-- UberFire -->
     <dependency>
       <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-all</artifactId>
+      <artifactId>uberfire-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-js</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-workbench-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-client-backend</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-client-api</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -70,7 +110,7 @@
       <artifactId>uberfire-workbench-processors</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-security-client</artifactId>
@@ -122,18 +162,6 @@
     </dependency>   
 
     <!-- Third party libraries -->
-    <dependency>
-      <groupId>org.owasp.encoder</groupId>
-      <artifactId>encoder</artifactId>
-    </dependency>
-    <dependency>
-         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-ext</artifactId>
-    </dependency>
     <dependency>
 	   <groupId>com.github.gwtd3</groupId>
        <artifactId>gwt-d3-api</artifactId>
@@ -164,36 +192,78 @@
       <groupId>org.jboss.errai</groupId>
       <artifactId>errai-security-picketlink</artifactId>
     </dependency>
-
-    <!-- All of these libraries are supplied by the app server and must not be deployed with the WAR file! -->
-    <dependency><groupId>javax.enterprise</groupId><artifactId>cdi-api</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>javax.inject</groupId><artifactId>javax.inject</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>javax.validation</groupId><artifactId>validation-api</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.hibernate.common</groupId><artifactId>hibernate-commons-annotations</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.hibernate.javax.persistence</groupId><artifactId>hibernate-jpa-2.0-api</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.hibernate</groupId><artifactId>hibernate-core</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.hibernate</groupId><artifactId>hibernate-entitymanager</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.hibernate</groupId><artifactId>hibernate-validator</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-cdi-jboss</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-cdi-jetty</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-codegen-gwt</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-ioc-bus-support</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-javax-enterprise</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-jaxrs-client</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-jpa-client</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-navigation</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.errai</groupId><artifactId>errai-tools</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.resteasy</groupId><artifactId>jaxrs-api</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.resteasy</groupId><artifactId>resteasy-cdi</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.spec.javax.interceptor</groupId><artifactId>jboss-interceptors-api_1.1_spec</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.spec.javax.transaction</groupId><artifactId>jboss-transaction-api_1.1_spec</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.weld.servlet</groupId><artifactId>weld-servlet-core</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.weld</groupId><artifactId>weld-api</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>org.jboss.weld</groupId><artifactId>weld-spi</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>xml-apis</groupId><artifactId>xml-apis</artifactId><scope>provided</scope></dependency>
-    <dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-impl</artifactId><scope>provided</scope></dependency>
     
+    <!-- Weld Modules -->
+    <dependency>
+      <groupId>org.jboss.weld.se</groupId>
+      <artifactId>weld-se-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+
+    <!-- Log -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-ext</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
+    <!-- Cleanup WAR -->
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>de.benediktmeurer.gwt-slf4j</groupId>
+      <artifactId>gwt-slf4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- GWT -->
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -321,6 +391,20 @@
             <compileSourcesArtifact>org.modeshape:modeshape-sequencer-teiid</compileSourcesArtifact>
             <compileSourcesArtifact>org.modeshape:modeshape-sequencer-ddl</compileSourcesArtifact>
             <compileSourcesArtifact>org.jboss.tools.komodo.plugins:org.komodo.modeshape.teiid.sql.sequencer</compileSourcesArtifact>
+            <!-- UberFire -->
+            <compileSourcesArtifact>org.uberfire:uberfire-commons</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-nio2-model</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-io</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-api</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-js</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-security-api</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-security-client</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-client-api</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-workbench-client</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-workbench-client-backend</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-workbench-client-views-patternfly</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-backend-api</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-server</compileSourcesArtifact>
           </compileSourcesArtifacts>
 
           <!-- do not insert line breaks in this string; it breaks Windows compatibility -->
diff --git a/komodoweb-webapp/src/main/java/org/komodo/web/backend/server/services/KomodoService.java b/komodoweb-webapp/src/main/java/org/komodo/web/backend/server/services/KomodoService.java
index e003a64..db9ac37 100644
--- a/komodoweb-webapp/src/main/java/org/komodo/web/backend/server/services/KomodoService.java
+++ b/komodoweb-webapp/src/main/java/org/komodo/web/backend/server/services/KomodoService.java
@@ -17,9 +17,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+
 import org.jboss.errai.bus.server.annotations.Service;
 import org.komodo.core.KEngine;
 import org.komodo.relational.vdb.Vdb;
@@ -264,7 +266,7 @@ public String getVdbDDL(final String vdbPath) throws KomodoUiException {
 			for(Vdb vdb : vdbs) {
 				String thePath = vdb.getAbsolutePath();
 				if(thePath.equals(vdbPath)) {
-					vdbDdl = ((VdbImpl)vdb).export(null);
+					vdbDdl = ((VdbImpl)vdb).export(null, new Properties());
 				}
 			}
 		} catch (KException e) {
diff --git a/komodoweb-webapp/src/main/resources/ErraiApp.properties b/komodoweb-webapp/src/main/resources/ErraiApp.properties
index bcf99b5..c23422c 100644
--- a/komodoweb-webapp/src/main/resources/ErraiApp.properties
+++ b/komodoweb-webapp/src/main/resources/ErraiApp.properties
@@ -14,4 +14,4 @@
 # https://github.com/errai/errai/blob/master/errai-docs/src/main/asciidoc/reference.asciidoc#erraiappproperties
 # for details.
 
-errai.security.user_cookie_enabled=true
\ No newline at end of file
+errai.security.user_on_hostpage_enabled=true
\ No newline at end of file
diff --git a/komodoweb-webapp/src/main/resources/app.html.template b/komodoweb-webapp/src/main/resources/app.html.template
deleted file mode 100644
index fdbe9e8..0000000
--- a/komodoweb-webapp/src/main/resources/app.html.template
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-    <title>Data Service Manager</title>
-</head>
-<body>
-<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe>
-<script type="text/javascript">
-  var current_user = { name:"@{name}", roles:[@{roles}] }
-</script>
-<!--add loading indicator while the app is being loaded-->
-<div id="loading">
-    <div class="loading-indicator">
-        <img src="org.komodo.KomodoWebApp/images/loading-icon.gif" width="32" height="32" style="margin-right: 8px; float: left; vertical-align: top;"/>
-        Please wait<br/><span id="loading-msg">Loading application...</span>
-    </div>
-</div>
-
-<!-- The GWT js file generated at run time -->
-<script type="text/javascript" src='org.komodo.KomodoWebApp.nocache.js'></script>
-
-</body>
-</html>
diff --git a/komodoweb-webapp/src/main/resources/org/komodo/FastCompiledKomodoWebApp.gwt.xml b/komodoweb-webapp/src/main/resources/org/komodo/FastCompiledKomodoWebApp.gwt.xml
index 988f80a..5662c06 100644
--- a/komodoweb-webapp/src/main/resources/org/komodo/FastCompiledKomodoWebApp.gwt.xml
+++ b/komodoweb-webapp/src/main/resources/org/komodo/FastCompiledKomodoWebApp.gwt.xml
@@ -16,15 +16,13 @@
   <inherits name="org.jboss.errai.ui.nav.Navigation"/>
 
   <inherits name="com.google.gwt.logging.Logging"/>
-  <set-property name="gwt.logging.firebugHandler" value="ENABLED" />
   <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" />
   <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
   <set-property name="gwt.logging.enabled" value="TRUE"/>
   <set-property name="gwt.logging.logLevel" value="FINEST" />
   <set-property name="gwt.logging.consoleHandler" value="ENABLED" />
-  <set-property name="gwt.logging.popupHandler" value="DISABLED" />
   <set-property name="gwt.logging.systemHandler" value="ENABLED" />
-
+  
   <inherits name='com.github.gwtd3.D3' />
 
   <inherits name="org.komodo.KomodoSpi"/>
@@ -32,8 +30,6 @@
   <inherits name="org.modeshape.sequencer.DdlSequencer"/>
   <inherits name="org.modeshape.sequencer.teiid.TeiidSqlSequencer"/>
 
-  <set-property name="gwt.logging.popupHandler" value="DISABLED"/>  
-  
   <set-property name="user.agent" value="gecko1_8,safari"/>
   <set-property name="locale" value="default"/>
 
diff --git a/komodoweb-webapp/src/main/resources/org/komodo/KomodoWebApp.gwt.xml b/komodoweb-webapp/src/main/resources/org/komodo/KomodoWebApp.gwt.xml
index acfcfda..678d211 100644
--- a/komodoweb-webapp/src/main/resources/org/komodo/KomodoWebApp.gwt.xml
+++ b/komodoweb-webapp/src/main/resources/org/komodo/KomodoWebApp.gwt.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5//EN"
         "http://google-web-toolkit.googlecode.com/svn/releases/2.5/distro-source/core/src/gwt-module.dtd">
 <module>
-  <inherits name="org.uberfire.UberfireClientAll"/>
+  <inherits name="org.uberfire.UberfireClient"/>
+  <inherits name="org.uberfire.UberfireClientBackend"/>
+
   <inherits name="org.jboss.errai.ui.UI"/>  
   <inherits name="org.jboss.errai.bus.ErraiBus"/>  
   <inherits name="org.jboss.errai.ioc.Container"/>  
@@ -18,15 +20,13 @@
   <inherits name="org.uberfire.client.views.PatternFly"/>
 
   <inherits name="com.google.gwt.logging.Logging"/>
-  <set-property name="gwt.logging.firebugHandler" value="ENABLED" />
   <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" />
   <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
   <set-property name="gwt.logging.enabled" value="TRUE"/>
   <set-property name="gwt.logging.logLevel" value="FINEST" />
   <set-property name="gwt.logging.consoleHandler" value="ENABLED" />
-  <set-property name="gwt.logging.popupHandler" value="DISABLED" />
   <set-property name="gwt.logging.systemHandler" value="ENABLED" />
-
+  
   <inherits name='com.github.gwtd3.D3' />
 
   <inherits name="org.komodo.KomodoSpi"/>
@@ -40,8 +40,6 @@
   <set-property name="compiler.useSourceMaps" value="true"/>
   <set-configuration-property name='xsiframe.failIfScriptTag' value='false'/>
   
-  <set-property name="gwt.logging.popupHandler" value="DISABLED"/>  
-  
   <source path='web/client' />
   <source path='web/share' />
 </module>
diff --git a/komodoweb-webapp/src/main/webapp/WEB-INF/web.xml b/komodoweb-webapp/src/main/webapp/WEB-INF/web.xml
index dd3ac58..7fd3aa7 100644
--- a/komodoweb-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/komodoweb-webapp/src/main/webapp/WEB-INF/web.xml
@@ -34,6 +34,16 @@
     <url-pattern>/uf_security_check</url-pattern>
   </filter-mapping>
 
+  <filter>
+    <filter-name>Host Page Patch</filter-name>
+    <filter-class>org.jboss.errai.security.server.servlet.UserHostPageFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>Host Page Patch</filter-name>
+    <url-pattern>/komodoweb.html</url-pattern>
+  </filter-mapping>
+
   <servlet>
     <servlet-name>ErraiServlet</servlet-name>
     <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
diff --git a/komodoweb-webapp/src/main/webapp/login.jsp b/komodoweb-webapp/src/main/webapp/login.jsp
index 2760fca..5303c07 100644
--- a/komodoweb-webapp/src/main/webapp/login.jsp
+++ b/komodoweb-webapp/src/main/webapp/login.jsp
@@ -160,9 +160,6 @@
       <br style="clear: both;"/>
 
       <p>
-        <% if (request.getParameter("gwt.codesvr") != null) { %>
-          <input type="hidden" name="gwt.codesvr" value="<%= org.owasp.encoder.Encode.forHtmlAttribute(request.getParameter("gwt.codesvr")) %>"/>
-        <% } %>
         <input class="button" type="submit" value="Sign In"/>
       </p>
     </form>

From fb5c3453939b02f72f256f250c557a22f0ad9df5 Mon Sep 17 00:00:00 2001
From: Mark Drilling <mdrillin@redhat.com>
Date: Wed, 3 Jun 2015 12:50:08 -0500
Subject: [PATCH 3/3] updates dependencies for uf07

---
 komodoweb-webapp/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/komodoweb-webapp/pom.xml b/komodoweb-webapp/pom.xml
index 3f7be44..fd82a56 100644
--- a/komodoweb-webapp/pom.xml
+++ b/komodoweb-webapp/pom.xml
@@ -80,6 +80,21 @@
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-server</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-backend-server</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-backend-cdi</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-nio2-fs</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.uberfire</groupId>
@@ -405,6 +420,9 @@
             <compileSourcesArtifact>org.uberfire:uberfire-workbench-client-views-patternfly</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-backend-api</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-server</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-backend-server</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-backend-cdi</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-nio2-fs</compileSourcesArtifact>
           </compileSourcesArtifacts>
 
           <!-- do not insert line breaks in this string; it breaks Windows compatibility -->