[cargo] r3979 - core/trunk/samples extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cargo] r3979 - core/trunk/samples extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util

alitokmen-2
Author: alitokmen
Date: 2015-03-29 14:49:07 -0500 (Sun, 29 Mar 2015)
New Revision: 3979

Modified:
   core/trunk/samples/pom.xml
   extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF/web.xml
   extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util/EmbeddedContainerArtifactResolver.java
Log:
* Fix CARGO-1312: CargoDaemonServlet should load on startup
* Upgrade to Jetty 9.2.10.v20150310
* Upgrade to Tomcat 8.0.21

Modified: core/trunk/samples/pom.xml
===================================================================
--- core/trunk/samples/pom.xml 2015-03-06 21:30:10 UTC (rev 3978)
+++ core/trunk/samples/pom.xml 2015-03-29 19:49:07 UTC (rev 3979)
@@ -309,7 +309,7 @@
 
               <property>
                 <name>cargo.tomcat8x.url</name>
-                <value>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.20/bin/apache-tomcat-8.0.20.zip</value>
+                <value>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.21/bin/apache-tomcat-8.0.21.zip</value>
               </property>
               <property>
                 <name>cargo.tomcat8x.java.home</name>
@@ -393,7 +393,7 @@
                 <!--
                 <value>http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.1.5.v20140505/jetty-distribution-9.1.5.v20140505.tar.gz</value>
                  -->
-                <value>http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.2.9.v20150224/jetty-distribution-9.2.9.v20150224.tar.gz</value>
+                <value>http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.2.10.v20150310/jetty-distribution-9.2.10.v20150310.tar.gz</value>
               </property>
               <property>
                 <name>cargo.jetty9x.java.home</name>

Modified: extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF/web.xml 2015-03-06 21:30:10 UTC (rev 3978)
+++ extensions/trunk/daemon/webapp/src/main/webapp/WEB-INF/web.xml 2015-03-29 19:49:07 UTC (rev 3979)
@@ -9,6 +9,15 @@
   <servlet>
     <servlet-name>cargo</servlet-name>
     <servlet-class>org.codehaus.cargo.daemon.CargoDaemonServlet</servlet-class>
+    <!--
+      The load-on-startup element indicates that this servlet should be loaded on the startup of
+      the web application. If the value is a negative integer, or the element is not present, the
+      container is free to load the servlet whenever it chooses.
+
+      Since Cargo Daemon has a feature for autostarting containers, we need to have load-on-startup
+      set to some non-negative integer.
+      -->
+    <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet>
     <servlet-name>error</servlet-name>

Modified: extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util/EmbeddedContainerArtifactResolver.java
===================================================================
--- extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util/EmbeddedContainerArtifactResolver.java 2015-03-06 21:30:10 UTC (rev 3978)
+++ extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/util/EmbeddedContainerArtifactResolver.java 2015-03-29 19:49:07 UTC (rev 3979)
@@ -236,29 +236,29 @@
 
         List<Dependency> jetty9xDependencies = new ArrayList<Dependency>();
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-annotations",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-continuation",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-http",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-io",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-jndi",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-plus",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-util",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-security",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-server",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-servlet",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-webapp",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("org.eclipse.jetty", "jetty-xml",
-            "9.2.9.v20150224"));
+            "9.2.10.v20150310"));
         jetty9xDependencies.add(new Dependency("javax.servlet", "javax.servlet-api", "3.1.0"));
         // annotations
         jetty9xDependencies.add(new Dependency("org.ow2.asm", "asm", "5.0.1"));
@@ -318,22 +318,22 @@
 
         List<Dependency> tomcat8xDependencies = new ArrayList<Dependency>();
         tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-servlet-api",
-            "8.0.20"));
+            "8.0.21"));
         tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-annotations-api",
-            "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jsp-api", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "8.0.20"));
+            "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jsp-api", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "8.0.21"));
         tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util-scan",
-            "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-catalina", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "8.0.20"));
-        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "8.0.20"));
+            "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-catalina", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "8.0.21"));
+        tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "8.0.21"));
         tomcat8xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper-el",
-            "8.0.20"));
+            "8.0.21"));
         tomcat8xDependencies.add(new Dependency("org.eclipse.jdt.core.compiler", "ecj",
             "4.4"));
         this.containerDependencies.put("tomcat8x", tomcat8xDependencies);


---------------------------------------------------------------------
To unsubscribe from this list, please visit:

    http://xircles.codehaus.org/manage_email