svn commit: r1074412 - in /servicemix/smx4/features/trunk/examples: pom.xml web/pom.xml web/src/main/java/org/apache/servicemix/web/WebAppListener.java

[jbonofre]

Author: jbonofre
Date: Fri Feb 25 07:05:02 2011
New Revision: 1074412

URL: http://svn.apache.org/viewvc?rev=1074412&view=rev
Log:
[SMX4-763] Examples web is not managed by maven examples reactor.

Modified:
    servicemix/smx4/features/trunk/examples/pom.xml
    servicemix/smx4/features/trunk/examples/web/pom.xml
    
servicemix/smx4/features/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java

Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=1074412&r1=1074411&r2=1074412&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Fri Feb 25 07:05:02 2011
@@ -51,6 +51,7 @@
         <module>cxf-wsdl-first-osgi-package</module>
         <module>cxf-ws-security-osgi</module>
         <module>cxf-ws-rm</module>
+        <module>web</module>
         <module>itests</module>
     </modules>
 

Modified: servicemix/smx4/features/trunk/examples/web/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/web/pom.xml?rev=1074412&r1=1074411&r2=1074412&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/web/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/web/pom.xml Fri Feb 25 07:05:02 2011
@@ -48,13 +48,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>apache-servicemix</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <type>zip</type>
     </dependency>
   </dependencies>
@@ -84,7 +84,6 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.26RC0</version>
         <configuration>
           <connectors>
             <connector 
implementation="org.mortbay.jetty.nio.SelectChannelConnector">

Modified: 
servicemix/smx4/features/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java?rev=1074412&r1=1074411&r2=1074412&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
 (original)
+++ 
servicemix/smx4/features/trunk/examples/web/src/main/java/org/apache/servicemix/web/WebAppListener.java
 Fri Feb 25 07:05:02 2011
@@ -49,7 +49,7 @@ public class WebAppListener implements S
         try {
             System.err.println("contextDestroyed");
             if (main != null) {
-                main.destroy(false);
+                main.destroy();
             }
         } catch (Exception e) {
             e.printStackTrace();