[overlord-commits] Overlord SVN: r1038 - in bpm-console/trunk/gui/war: src/main/templates/WEB-INF and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Apr 22 05:49:29 EDT 2010
Author: heiko.braun at jboss.com
Date: 2010-04-22 05:49:28 -0400 (Thu, 22 Apr 2010)
New Revision: 1038
Added:
bpm-console/trunk/gui/war/src/main/templates/WEB-INF/web.xml
Removed:
bpm-console/trunk/gui/war/XML_HTTP_PROXY.txt
bpm-console/trunk/gui/war/war/WEB-INF/web.xml
Modified:
bpm-console/trunk/gui/war/pom.xml
Log:
exclude proxy from web.xml when packaging final webapp for deployment
Deleted: bpm-console/trunk/gui/war/XML_HTTP_PROXY.txt
===================================================================
--- bpm-console/trunk/gui/war/XML_HTTP_PROXY.txt 2010-04-22 09:01:34 UTC (rev 1037)
+++ bpm-console/trunk/gui/war/XML_HTTP_PROXY.txt 2010-04-22 09:49:28 UTC (rev 1038)
@@ -1,3 +0,0 @@
-See https://ajax.dev.java.net/xmlhttpproxy.html for further details.
-
-
Modified: bpm-console/trunk/gui/war/pom.xml
===================================================================
--- bpm-console/trunk/gui/war/pom.xml 2010-04-22 09:01:34 UTC (rev 1037)
+++ bpm-console/trunk/gui/war/pom.xml 2010-04-22 09:49:28 UTC (rev 1038)
@@ -15,7 +15,9 @@
</parent>
<properties>
- <gwt-maven.version>2.0-RC1</gwt-maven.version>
+ <gwt-maven.version>2.0-RC1</gwt-maven.version>
+ <comment.left><!--</comment.left>
+ <comment.right>--></comment.right>
</properties>
<!-- Dependencies -->
@@ -299,6 +301,7 @@
<delete dir="war/WEB-INF/classes"/>
<delete dir="war/WEB-INF/lib"/>
<delete file="war/WEB-INF/jboss-web.xml"/>
+ <delete file="war/WEB-INF/web.xml"/>
<delete dir="war/app"/>
<delete dir="target"/>
@@ -327,6 +330,46 @@
</sourceRoot>
</configuration>
</execution>
+
+ <execution>
+ <id>hosted mode web.xml</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <filter token="comment.left" value="" />
+ <filter token="comment.right" value="" />
+ <copy file="src/main/templates/WEB-INF/web.xml"
+ todir="war/WEB-INF"
+ filtering="true" overwrite="true"/>
+ </tasks>
+ <sourceRoot>
+ ${project.build.directory}/generated-sources
+ </sourceRoot>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>deployment web.xml</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <filter token="comment.left" value="${comment.left}" />
+ <filter token="comment.right" value="${comment.right}" />
+ <copy file="src/main/templates/WEB-INF/web.xml"
+ todir="war/WEB-INF"
+ filtering="true" overwrite="true"/>
+ </tasks>
+ <sourceRoot>
+ ${project.build.directory}/generated-sources
+ </sourceRoot>
+ </configuration>
+ </execution>
</executions>
</plugin>
Added: bpm-console/trunk/gui/war/src/main/templates/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/templates/WEB-INF/web.xml (rev 0)
+++ bpm-console/trunk/gui/war/src/main/templates/WEB-INF/web.xml 2010-04-22 09:49:28 UTC (rev 1038)
@@ -0,0 +1,50 @@
+<!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>BPM Console UI</display-name>
+
+ @comment.left@
+ <servlet>
+ <servlet-name>xmlProxy</servlet-name>
+ <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>org.jboss.errai.tools.proxy.XmlHttpProxyServlet</servlet-class>
+ <init-param>
+ <param-name>config.name</param-name>
+ <param-value>errai-proxy.json</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ @comment.right@
+
+ <servlet>
+ <servlet-name>ErraiServlet</servlet-name>
+ <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ErraiServlet</servlet-name>
+ <url-pattern>*.erraiBus</url-pattern>
+ </servlet-mapping>
+
+ @comment.left@
+ <servlet-mapping>
+ <servlet-name>xmlProxy</servlet-name>
+ <url-pattern>/app/xhp/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>erraiProxy</servlet-name>
+ <url-pattern>/app/proxy/*</url-pattern>
+ </servlet-mapping>
+ @comment.right@
+
+</web-app>
\ No newline at end of file
Deleted: bpm-console/trunk/gui/war/war/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-04-22 09:01:34 UTC (rev 1037)
+++ bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-04-22 09:49:28 UTC (rev 1038)
@@ -1,47 +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>BPM Console UI</display-name>
-
-
- <servlet>
- <servlet-name>xmlProxy</servlet-name>
- <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>org.jboss.errai.tools.proxy.XmlHttpProxyServlet</servlet-class>
- <init-param>
- <param-name>config.name</param-name>
- <param-value>errai-proxy.json</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>ErraiServlet</servlet-name>
- <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ErraiServlet</servlet-name>
- <url-pattern>*.erraiBus</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>xmlProxy</servlet-name>
- <url-pattern>/app/xhp/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>erraiProxy</servlet-name>
- <url-pattern>/app/proxy/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
More information about the overlord-commits
mailing list