Author: rmannibucau
Date: Sun Jun 10 16:33:24 2012
New Revision: 1348622
URL: http://svn.apache.org/viewvc?rev=1348622&view=rev
Log:
using web.xml of tomee-webapp for plus and jaxrs webapps
Removed:
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/
Modified:
openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/assembly/war.xml
Modified:
openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml?rev=1348622&r1=1348621&r2=1348622&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
(original)
+++ openejb/trunk/openejb/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
Sun Jun 10 16:33:24 2012
@@ -61,9 +61,9 @@
<directory>${project.build.directory}/${project.artifactId}-${project.version}/</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>WEB-INF/web.xml</include>
<include>**/*.jsp</include>
<include>**/*.css</include>
- <include>**/*.css</include>
<include>**/*.png</include>
<include>**/*.js</include>
<include>**/*.html</include>
Modified:
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/assembly/war.xml?rev=1348622&r1=1348621&r2=1348622&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/assembly/war.xml
(original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/assembly/war.xml Sun
Jun 10 16:33:24 2012
@@ -61,9 +61,9 @@
<directory>${project.build.directory}/${project.artifactId}-${project.version}/</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>WEB-INF/web.xml</include>
<include>**/*.jsp</include>
<include>**/*.css</include>
- <include>**/*.css</include>
<include>**/*.png</include>
<include>**/*.js</include>
<include>**/*.html</include>
