From 98269e05cf8760cb878c90ea810cd4a2c556b0cb Mon Sep 17 00:00:00 2001
From: "Adrian T. Co" <aco@apache.org>
Date: Tue, 31 Oct 2006 17:54:21 +0000
Subject: [PATCH] AMQ-1015: Upgraded maven-jetty-plugin

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@469583 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-web-console/pom.xml | 28 +++++++++++++++++-----------
 activemq-web-demo/pom.xml    | 12 +++++++++++-
 pom.xml                      |  7 +++++++
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 7fdacb189e..faae52f014 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -41,18 +41,21 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.0.0</version>
+        <version>${jetty-version}</version>
         <configuration>
-          
-	         <systemProperties>
-            
-              <!-- enable easy connection to JConsole -->
-              <systemProperty>
-								<name>com.sun.management.jmxremote</name>
-								<value></value>
-							</systemProperty>
-           </systemProperties>
-
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>${jetty.port}</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+          <systemProperties>
+            <!-- enable easy connection to JConsole -->
+            <systemProperty>
+              <name>com.sun.management.jmxremote</name>
+              <value></value>
+            </systemProperty>
+          </systemProperties>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
@@ -191,4 +194,7 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <jetty.port>8080</jetty.port>
+  </properties>
 </project>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 7cd67b1ce1..1bf0c7ff07 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -40,8 +40,15 @@
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>${jetty-version}</version>
         <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>${jetty.port}</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
@@ -133,4 +140,7 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <jetty.port>8080</jetty.port>
+  </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index ce28436218..5e79c3741a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
     <module>activemq-rar</module>
     <module>activemq-web</module>
     <module>activemq-web-demo</module>
+    <module>activemq-web-console</module>
     <module>activemq-optional</module>
     <module>maven-bundle-plugin</module>
     <!--
@@ -763,6 +764,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.1.3</version>
         </plugin>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>${jetty-version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -808,6 +814,7 @@
   </reporting>
 
   <properties>
+    <jetty-version>6.0.1</jetty-version>
     <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
     <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/maven/</site-repo-url>