Revision: 15482
Author: [email protected]
Date: Thu Nov 25 02:30:44 2010
Log: Fixing application building to remove the web.xml when not needed
http://code.google.com/p/mobicents/source/detail?r=15482
Deleted:
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding-distributable/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/chatserver/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/custom-call-forwarding-distributable/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-event-charging/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-openims/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-ro-rf/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service-distributable/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-jsr309-servlet/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-playback-servlet/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet-distributable/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet-distributable/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/speed-dial/src/main/sipapp/WEB-INF/web.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/uac-register/src/main/sipapp/WEB-INF/web.xml
Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding-distributable/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/chatserver/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/custom-call-forwarding-distributable/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-event-charging/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-openims/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-ro-rf/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service-distributable/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-jsr309-servlet/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-playback-servlet/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet-distributable/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet-distributable/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/speed-dial/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-examples/uac-register/pom.xml
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Call Forwarding B2BUA Sip Servlet</display-name>
- <description>Call Forwarding B2BUA Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding-distributable/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Distributable Call Forwarding B2BUA Sip
Servlet</display-name>
- <description>Distributable Call Forwarding B2BUA Sip
Servlet</description>
- <distributable/>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/chatserver/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Chatroom Sip Servlet</display-name>
- <description>Chatroom Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/custom-call-forwarding-distributable/src/main/sipapp/WEB-INF/web.xml
Tue Mar 2 19:28:47 2010
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Distributable Call Forwarding B2BUA Sip
Servlet</display-name>
- <description>Distributable Call Forwarding B2BUA Sip
Servlet</description>
- <distributable/>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-event-charging/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Diameter Event Charging Sip Servlet</display-name>
- <description>Diameter Event Charging Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-openims/src/main/sipapp/WEB-INF/web.xml
Tue Feb 3 03:24:26 2009
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Diameter OpenIMS SIP Servlet</display-name>
- <description>Diameter OpenIMS SIP Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-ro-rf/src/main/sipapp/WEB-INF/web.xml
Tue May 4 04:38:23 2010
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Diameter Ro/Rf Sip Servlet</display-name>
- <description>Diameter Ro/Rf Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Location Service Sip Servlet</display-name>
- <description>Location Service Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service-distributable/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Distributable Location Service Sip Servlet</display-name>
- <description>Distributable Location Service Sip Servlet</description>
- <distributable/>
-
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-jsr309-servlet/src/main/sipapp/WEB-INF/web.xml
Wed Apr 29 05:09:51 2009
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>MediaJSR309Servlet</display-name>
- <description>Simple Media Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-playback-servlet/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>MediaPlaybackServlet</display-name>
- <description>Simple Media Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Shootist Sip Servlet</display-name>
- <description>Shootist Sip Servlet</description>
-
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet-distributable/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Distributable Shootist Sip Servlet</display-name>
- <description>Distributable Shootist Sip Servlet</description>
- <distributable/>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Simple Sip Servlet</display-name>
- <description>Simple Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet-distributable/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Distributable Simple Sip Servlet</display-name>
- <description>Distributable Simple Sip Servlet</description>
- <distributable/>
-
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/speed-dial/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>Speed Dial Sip Servlet</display-name>
- <description>Speed Dial Sip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/uac-register/src/main/sipapp/WEB-INF/web.xml
Tue Dec 23 13:33:41 2008
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app>
- <display-name>UAC RegisterSip Servlet</display-name>
- <description>UAC RegisterSip Servlet</description>
-</web-app>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding/pom.xml
Thu Nov 25 02:30:44 2010
@@ -25,6 +25,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding-distributable/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/call-forwarding-distributable/pom.xml
Thu Nov 25 02:30:44 2010
@@ -24,6 +24,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
<configuration>
<warSourceDirectory>
${basedir}/src/main/sipapp
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/chatserver/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/chatserver/pom.xml
Thu Nov 25 02:30:44 2010
@@ -25,6 +25,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/custom-call-forwarding-distributable/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/custom-call-forwarding-distributable/pom.xml
Thu Nov 25 02:30:44 2010
@@ -25,6 +25,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-event-charging/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-event-charging/pom.xml
Thu Nov 25 02:30:44 2010
@@ -50,6 +50,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-openims/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-openims/pom.xml
Thu Nov 25 02:30:44 2010
@@ -53,6 +53,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-ro-rf/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/diameter-ro-rf/pom.xml
Thu Nov 25 02:30:44 2010
@@ -52,6 +52,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service/pom.xml
Thu Nov 25 02:30:44 2010
@@ -24,6 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service-distributable/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/location-service-distributable/pom.xml
Thu Nov 25 02:30:44 2010
@@ -24,6 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-jsr309-servlet/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-jsr309-servlet/pom.xml
Thu Nov 25 02:30:44 2010
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-spec</artifactId>
- <version>1.1.12</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -75,6 +75,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-playback-servlet/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/media-playback-servlet/pom.xml
Thu Nov 25 02:30:44 2010
@@ -122,6 +122,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet/pom.xml
Thu Nov 25 02:30:44 2010
@@ -14,9 +14,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <webXml>
-
${basedir}/src/main/sipapp/WEB-INF/sip.xml
- </webXml>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet-distributable/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/shootist-sip-servlet-distributable/pom.xml
Thu Nov 25 02:30:44 2010
@@ -10,23 +10,14 @@
<packaging>war</packaging>
<name>Shootist Sip Servlet Distributable Example</name>
<build>
-
<outputDirectory>${basedir}/src/main/sipapp/WEB-INF/classes</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/sipapp/</directory>
- <filtering>true</filtering>
- <targetPath>../../../../../target/filtered-sources/</targetPath>
- </resource>
- </resources>
+
<outputDirectory>${basedir}/src/main/sipapp/WEB-INF/classes</outputDirectory>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <webXml>
-
${basedir}/src/main/sipapp/WEB-INF/web.xml
- </webXml>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
-
${basedir}/target/filtered-sources/
+ ${basedir}/src/main/sipapp
</warSourceDirectory>
</configuration>
</plugin>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet/pom.xml
Thu Nov 25 02:30:44 2010
@@ -24,6 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet-distributable/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/simple-sip-servlet-distributable/pom.xml
Thu Nov 25 02:30:44 2010
@@ -24,6 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/speed-dial/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/speed-dial/pom.xml
Thu Nov 25 02:30:44 2010
@@ -25,6 +25,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<warSourceDirectory>
${basedir}/src/main/sipapp
</warSourceDirectory>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-examples/uac-register/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-examples/uac-register/pom.xml
Thu Nov 25 02:30:44 2010
@@ -23,6 +23,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<configuration>
<warSourceDirectory>${basedir}/src/main/sipapp</warSourceDirectory>
</configuration>