[overlord-commits] Overlord SVN: r1036 - in bpm-console/trunk: gui/war and 4 other directories.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2010-04-22 04:59:34 -0400 (Thu, 22 Apr 2010)
New Revision: 1036

Added:
   bpm-console/trunk/gui/war/src/main/resources/errai-proxy.json
   bpm-console/trunk/gui/war/src/main/resources/xhp.json
Removed:
   bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/
   bpm-console/trunk/gui/war/src/main/java/org/json/
   bpm-console/trunk/gui/war/src/main/resources/jmaki/
Modified:
   bpm-console/trunk/gui/war/pom.xml
   bpm-console/trunk/gui/war/war/WEB-INF/web.xml
   bpm-console/trunk/pom.xml
Log:
move development proxy to errai-tools

Modified: bpm-console/trunk/gui/war/pom.xml
===================================================================
--- bpm-console/trunk/gui/war/pom.xml	2010-04-21 09:24:39 UTC (rev 1035)
+++ bpm-console/trunk/gui/war/pom.xml	2010-04-22 08:59:34 UTC (rev 1036)
@@ -43,6 +43,12 @@
 
         <dependency>
             <groupId>org.jboss.errai</groupId>
+            <artifactId>errai-tools</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jboss.errai</groupId>
             <artifactId>errai-widgets</artifactId>
             <version>${errai.version}</version>
             <classifier>sources</classifier>

Copied: bpm-console/trunk/gui/war/src/main/resources/errai-proxy.json (from rev 1031, bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/errai-proxy.json)
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/errai-proxy.json	                        (rev 0)
+++ bpm-console/trunk/gui/war/src/main/resources/errai-proxy.json	2010-04-22 08:59:34 UTC (rev 1036)
@@ -0,0 +1,10 @@
+{"xhp": {
+    "version": "1.1",
+    "services": [
+        {"id": "default",
+         "url":"http://127.0.0.1:8080/jbpm-console/in.erraiBus",
+         "passthrough":true
+        },
+    ]
+  }
+}
\ No newline at end of file

Copied: bpm-console/trunk/gui/war/src/main/resources/xhp.json (from rev 1031, bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json)
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/xhp.json	                        (rev 0)
+++ bpm-console/trunk/gui/war/src/main/resources/xhp.json	2010-04-22 08:59:34 UTC (rev 1036)
@@ -0,0 +1,15 @@
+{"xhp": {
+    "version": "1.1",
+    "services": [
+        {"id": "default",
+         "url":"http://127.0.0.1:8080/gwt-console-server",
+         "passthrough":true
+        },
+        {"id": "birt",
+         "url":"http://127.0.0.1:8080/gwt-console-server",
+         "passthrough":true,
+         "contentType":"text/html"         
+        }
+    ]
+  }
+}
\ No newline at end of file

Modified: bpm-console/trunk/gui/war/war/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/gui/war/war/WEB-INF/web.xml	2010-04-21 09:24:39 UTC (rev 1035)
+++ bpm-console/trunk/gui/war/war/WEB-INF/web.xml	2010-04-22 08:59:34 UTC (rev 1036)
@@ -5,16 +5,17 @@
 <web-app>
     <display-name>BPM Console UI</display-name>
 
+        
     <servlet>
         <servlet-name>xmlProxy</servlet-name>
-        <servlet-class>jmaki.xhp.XmlHttpProxyServlet</servlet-class>
+        <servlet-class>org.jboss.errai.tools.proxy.XmlHttpProxyServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
         <servlet-name>erraiProxy</servlet-name>
         <description>Errai Proxy</description>
-        <servlet-class>jmaki.xhp.XmlHttpProxyServlet</servlet-class>
+        <servlet-class>org.jboss.errai.tools.proxy.XmlHttpProxyServlet</servlet-class>
         <init-param>
             <param-name>config.name</param-name>
             <param-value>errai-proxy.json</param-value>

Modified: bpm-console/trunk/pom.xml
===================================================================
--- bpm-console/trunk/pom.xml	2010-04-21 09:24:39 UTC (rev 1035)
+++ bpm-console/trunk/pom.xml	2010-04-22 08:59:34 UTC (rev 1036)
@@ -245,8 +245,14 @@
                 <artifactId>errai-bus</artifactId>
                 <version>${errai.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>org.jboss.errai</groupId>
+                <artifactId>errai-tools</artifactId>
+                <version>${errai.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.errai</groupId>
                 <artifactId>errai-bus</artifactId>
                 <version>${errai.version}</version>
                 <classifier>sources</classifier>