Author: heiko.braun(a)jboss.com Date: 2009-12-10 09:36:40 -0500 (Thu, 10 Dec 2009) New Revision: 900 Modified: bpm-console/trunk/gui/war/pom.xml bpm-console/trunk/gui/war/src/main/webapp/WEB-INF/web.xml Log: Fix RIFTSAW-134 Modified: bpm-console/trunk/gui/war/pom.xml =================================================================== --- bpm-console/trunk/gui/war/pom.xml 2009-12-10 13:53:53 UTC (rev 899) +++ bpm-console/trunk/gui/war/pom.xml 2009-12-10 14:36:40 UTC (rev 900) @@ -191,7 +191,7 @@ <executions> <execution> <goals> - <goal>mergewebxml</goal> + <!--goal>mergewebxml</goal--> <goal>compile</goal> <goal>gwt</goal> @@ -251,7 +251,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <configuration> - <webXml>target/web.xml</webXml> + <!--webXml>target/web.xml</webXml--> <warSourceExcludes>.gwt-tmp/**</warSourceExcludes> <webResources> <resource> Modified: bpm-console/trunk/gui/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- bpm-console/trunk/gui/war/src/main/webapp/WEB-INF/web.xml 2009-12-10 13:53:53 UTC (rev 899) +++ bpm-console/trunk/gui/war/src/main/webapp/WEB-INF/web.xml 2009-12-10 14:36:40 UTC (rev 900) @@ -1,23 +1,18 @@ <!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > <web-app> - <display-name>Archetype Created Web Application</display-name> + <display-name>Archetype Created Web Application</display-name> - <!--servlet> - <servlet-name>com.jsos.httpproxy.HttpProxyServlet/org.jboss.bpm.console.Application/proxy</servlet-name> - <servlet-class>com.jsos.httpproxy.HttpProxyServlet</servlet-class> - <init-param> - <param-name>host</param-name> - <param-value>http://localhost:8080/</param-value> - </init-param> - </servlet> + <servlet> + <servlet-name>jmaki.xhp.XmlHttpProxyServlet/org.jboss.bpm.console.Application/xhp</servlet-name> + <servlet-class>jmaki.xhp.XmlHttpProxyServlet</servlet-class> + </servlet> - <servlet-mapping> - <servlet-name>com.jsos.httpproxy.HttpProxyServlet/org.jboss.bpm.console.Application/proxy</servlet-name> - <url-pattern>/org.jboss.bpm.console.Application/proxy</url-pattern> - </servlet-mapping--> + <servlet-mapping> + <servlet-name>jmaki.xhp.XmlHttpProxyServlet/org.jboss.bpm.console.Application/xhp</servlet-name> + <url-pattern>/org.jboss.bpm.console.Application/xhp</url-pattern> + </servlet-mapping> - </web-app> \ No newline at end of file