diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 42a57f3898..1685bbcbc4 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -39,17 +37,22 @@
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
-	      <version>${jetty-version}</version>
+        <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>${jetty.port}</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  
+
   <dependencies>
-  
+
     <!-- j2ee jars -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -79,7 +82,7 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
-        <dependency>
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
@@ -88,20 +91,20 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-    
+
     <!-- web container -->
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <!-- For Spring servlet -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
     </dependency>
-    
+
     <!--  for custom XML parsing -->
     <dependency>
       <groupId>org.apache.xbean</groupId>
@@ -111,20 +114,20 @@
     <dependency>
       <groupId>xmlpull</groupId>
       <artifactId>xmlpull</artifactId>
-    </dependency>    
+    </dependency>
 
     <dependency>
       <groupId>xstream</groupId>
       <artifactId>xstream</artifactId>
-    </dependency>    
-    
+    </dependency>
+
     <!-- used for testing -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <!-- Derby SQL DB used for testing JDBC message store -->
     <dependency>
       <groupId>org.apache.derby</groupId>
@@ -132,4 +135,7 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <jetty.port>8080</jetty.port>
+  </properties>
 </project>