[jbpm-commits] JBoss JBPM SVN: r5238 - in projects/gwt-console/trunk/gui/war: src/main and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Jul 6 03:23:17 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-07-06 03:23:17 -0400 (Mon, 06 Jul 2009)
New Revision: 5238
Added:
projects/gwt-console/trunk/gui/war/src/main/templates/
projects/gwt-console/trunk/gui/war/src/main/templates/WEB-INF/
projects/gwt-console/trunk/gui/war/src/main/templates/WEB-INF/jboss-web.xml
Removed:
projects/gwt-console/trunk/gui/war/src/main/webapp/WEB-INF/jboss-web.xml
Modified:
projects/gwt-console/trunk/gui/war/pom.xml
projects/gwt-console/trunk/gui/war/src/main/resources/mvc4g-conf.xml
Log:
Fix JBPM-2195: Rename webcontext based on profile
Modified: projects/gwt-console/trunk/gui/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/pom.xml 2009-07-06 07:20:35 UTC (rev 5237)
+++ projects/gwt-console/trunk/gui/war/pom.xml 2009-07-06 07:23:17 UTC (rev 5238)
@@ -211,6 +211,13 @@
<configuration>
<webXml>target/web.xml</webXml>
<warSourceExcludes>.gwt-tmp/**</warSourceExcludes>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/main/templates</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
</configuration>
</plugin>
<plugin>
@@ -254,13 +261,15 @@
<version>${version}</version>
</dependency>
</dependencies>
+ <properties>
+ <console.app.webcontext>jbpm-console</console.app.webcontext>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
-
<execution>
<id>unpack-profile-jbpm</id>
<phase>process-resources</phase>
@@ -283,7 +292,9 @@
</executions>
</plugin>
+
</plugins>
+
</build>
</profile>
@@ -302,7 +313,10 @@
<version>${version}</version>
</dependency>
</dependencies>
- <build>
+ <properties>
+ <console.app.webcontext>gwt-console</console.app.webcontext>
+ </properties>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/mvc4g-conf.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/mvc4g-conf.xml 2009-07-06 07:20:35 UTC (rev 5237)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/mvc4g-conf.xml 2009-07-06 07:23:17 UTC (rev 5238)
@@ -16,4 +16,8 @@
<start controllerName="mainController" actionName="login" />
+ <!--
+ ${webcontext}
+ @webcontext@
+ -->
</mvc4g>
\ No newline at end of file
Added: projects/gwt-console/trunk/gui/war/src/main/templates/WEB-INF/jboss-web.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/templates/WEB-INF/jboss-web.xml (rev 0)
+++ projects/gwt-console/trunk/gui/war/src/main/templates/WEB-INF/jboss-web.xml 2009-07-06 07:23:17 UTC (rev 5238)
@@ -0,0 +1,19 @@
+<?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_0.dtd">
+
+<jboss-web>
+
+ <!--security-domain>java:/jaas/jbpm-console</security-domain-->
+
+ <context-root>${console.app.webcontext}</context-root>
+
+ <!--resource-ref>
+ <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
+ <jndi-name>java:/JbpmDS</jndi-name>
+ </resource-ref>
+ -->
+
+</jboss-web>
Deleted: projects/gwt-console/trunk/gui/war/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-07-06 07:20:35 UTC (rev 5237)
+++ projects/gwt-console/trunk/gui/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-07-06 07:23:17 UTC (rev 5238)
@@ -1,19 +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_0.dtd">
-
-<jboss-web>
-
- <!--security-domain>java:/jaas/jbpm-console</security-domain-->
-
- <context-root>gwt-console</context-root>
-
- <!--resource-ref>
- <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:/JbpmDS</jndi-name>
- </resource-ref>
- -->
-
-</jboss-web>
More information about the jbpm-commits
mailing list