diff --git a/assembly/pom.xml b/assembly/pom.xml
index 99cf597318..3f6602a828 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -282,17 +282,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>pertest</forkMode>
-          <excludes>
-            <!-- These tests run too slow to execute as part of the unit tests -->
-            <exclude implementation="java.lang.String">**/DefaultStoreBrokerTest.*</exclude>
-            <exclude implementation="java.lang.String">**/ActiveIOTransportBrokerTest.*</exclude>
-            <!-- These tests fails -->
-            <exclude implementation="java.lang.String">**/SpringTest.*</exclude>
-            <exclude implementation="java.lang.String">**/*QuickJournalRecoveryBrokerTest.*</exclude>
-          </excludes>
-          <includes>
-            <include implementation="java.lang.String">**/*RetroactiveConsumerTestWithDestinationBasedBufferTest.*</include>
-          </includes>
         </configuration>
       </plugin>
       <plugin>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 0b077e1728..dabcb1130e 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -98,6 +98,23 @@
         <include>run.jar</include>
       </includes>
     </fileSet>
+
+    <!-- lets copy the portions of the web app we need - as we can't exclude stuff from the WAR -->
+    <fileSet>
+      <directory>../activemq-web-console/src/main/webapp</directory>
+      <outputDirectory>/webapps/admin</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/applicationContext.xml</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../activemq-web-console/target/classes</directory>
+      <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
@@ -105,17 +122,17 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>backport-util-concurrent:backport-util-concurrent</include>
-         <include>commons-logging:commons-logging</include>
-         <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-core</include>
-         <include>${pom.groupId}:activeio-core</include>
-         <include>${pom.groupId}:activemq-console</include>         
-         <include>${pom.groupId}:activemq-jaas</include>
-         <include>mx4j:mx4j</include>         
-         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-web</include>
+        <include>backport-util-concurrent:backport-util-concurrent</include>
+        <include>commons-logging:commons-logging</include>
+        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
+        <include>${pom.groupId}:activemq-core</include>
+        <include>${pom.groupId}:activeio-core</include>
+        <include>${pom.groupId}:activemq-console</include>
+        <include>${pom.groupId}:activemq-jaas</include>
+        <include>mx4j:mx4j</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+        <include>${pom.groupId}:activemq-web</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -123,26 +140,26 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>${pom.groupId}:activemq-rar</include>
-         <include>${pom.groupId}:activemq-optional</include>
-         <include>${pom.groupId}:activemq-xmpp</include>
-         <include>${pom.groupId}:activecluster</include>
-         <include>commons-beanutils:commons-beanutils</include>
-         <include>commons-collections:commons-collections</include>
-         <include>commons-httpclient:commons-httpclient</include>
-         <include>commons-dbcp:commons-dbcp</include>
-         <include>commons-pool:commons-pool</include>
-         <include>log4j:log4j</include>
-         <include>mx4j:mx4j-remote</include>
-         <include>mx4j:mx4j-tools</include>
-         <include>org.apache.derby:derby</include>
-         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-         <include>org.apache.xbean:xbean-spring</include>
-         <include>org.springframework:spring</include>
-         <include>xstream:xstream</include>
-         <include>xmlpull:xmlpull</include>
-         <include>activemq:jmdns</include>
+        <include>${pom.groupId}:activemq-rar</include>
+        <include>${pom.groupId}:activemq-optional</include>
+        <include>${pom.groupId}:activemq-xmpp</include>
+        <include>${pom.groupId}:activecluster</include>
+        <include>commons-beanutils:commons-beanutils</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-httpclient:commons-httpclient</include>
+        <include>commons-dbcp:commons-dbcp</include>
+        <include>commons-pool:commons-pool</include>
+        <include>log4j:log4j</include>
+        <include>mx4j:mx4j-remote</include>
+        <include>mx4j:mx4j-tools</include>
+        <include>org.apache.derby:derby</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.xbean:xbean-spring</include>
+        <include>org.springframework:spring</include>
+        <include>xstream:xstream</include>
+        <include>xmlpull:xmlpull</include>
+        <include>activemq:jmdns</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -150,23 +167,42 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>org.mortbay.jetty:jetty</include>
-         <include>org.mortbay.jetty:jetty-util</include>
-         <include>org.mortbay.jetty:jetty-xbean</include>
-         <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>org.mortbay.jetty:jetty</include>
+        <include>org.mortbay.jetty:jetty-util</include>
+        <include>org.mortbay.jetty:jetty-xbean</include>
+        <include>org.mortbay.jetty:servlet-api-2.5</include>
         <include>org.slf4j:slf4j-jcl</include>
 
         <!-- JSP support -->
-         <include>org.mortbay.jetty:jsp-2.1</include>
-         <include>org.mortbay.jetty:jsp-api-2.1</include>
-         <include>org.eclipse.jdt:core</include>
-         <include>ant:ant</include>
+        <include>org.mortbay.jetty:jsp-2.1</include>
+        <include>org.mortbay.jetty:jsp-api-2.1</include>
+        <include>org.eclipse.jdt:core</include>
+        <include>ant:ant</include>
 
-         <!-- JSTL and other web stuff -->
-         <include>opensymphony:sitemesh</include>
-         <include>javax.servlet:jstl</include>
-         <include>taglibs:standard</include>
+        <!-- JSTL and other web stuff -->
+        <include>opensymphony:sitemesh</include>
+        <include>javax.servlet:jstl</include>
+        <include>taglibs:standard</include>
+
+        <!-- Atom/RSS support -->
+        <include>rome:rome</include>
+        <include>jdom:jdom</include>
       </includes>
     </dependencySet>
-  </dependencySets>  
+
+
+    <!-- we cannot exclude stuff from inside the war...
+    <dependencySet>
+      <outputDirectory>/webapps/admin</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>${pom.groupId}:activemq-web-console</include>
+      </includes>
+      <excludes>
+        <exclude>**/*.jar</exclude>
+      </excludes>
+    </dependencySet>
+    -->
+  </dependencySets>
 </assembly>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index ff5dbd8023..e1e3056063 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -102,24 +102,42 @@
         <include>run.jar</include>
       </includes>
     </fileSet>
+
+    <!-- lets copy the portions of the web app we need - as we can't exclude stuff from the WAR -->
+    <fileSet>
+      <directory>../activemq-web-console/src/main/webapp</directory>
+      <outputDirectory>/webapps/admin</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/applicationContext.xml</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../activemq-web-console/target/classes</directory>
+      <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
   </fileSets>
+
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>backport-util-concurrent:backport-util-concurrent</include>
-         <include>commons-logging:commons-logging</include>
-         <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-core</include>
-         <include>${pom.groupId}:activeio-core</include>
-         <include>${pom.groupId}:activemq-console</include>         
-         <include>${pom.groupId}:activemq-jaas</include>
-         <include>mx4j:mx4j</include>         
-         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-web</include>
+        <include>backport-util-concurrent:backport-util-concurrent</include>
+        <include>commons-logging:commons-logging</include>
+        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
+        <include>${pom.groupId}:activemq-core</include>
+        <include>${pom.groupId}:activeio-core</include>
+        <include>${pom.groupId}:activemq-console</include>
+        <include>${pom.groupId}:activemq-jaas</include>
+        <include>mx4j:mx4j</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+        <include>${pom.groupId}:activemq-web</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -127,29 +145,29 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>${pom.groupId}:activemq-rar</include>
-         <include>${pom.groupId}:activemq-optional</include>
-         <include>${pom.groupId}:activemq-xmpp</include>
-         <include>${pom.groupId}:activecluster</include>
-         <include>commons-beanutils:commons-beanutils</include>
-         <include>commons-collections:commons-collections</include>
-         <include>commons-httpclient:commons-httpclient</include>
-         <include>commons-dbcp:commons-dbcp</include>
-         <include>commons-pool:commons-pool</include>
-         <include>org.mortbay.jetty:jetty</include>
-         <include>org.mortbay.jetty:jetty-util</include>
-         <include>org.mortbay.jetty:servlet-api-2.5</include>
-         <include>log4j:log4j</include>
-         <include>mx4j:mx4j-remote</include>
-         <include>mx4j:mx4j-tools</include>
-         <include>org.apache.derby:derby</include>
-         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-         <include>org.apache.xbean:xbean-spring</include>
-         <include>org.springframework:spring</include>
-         <include>xstream:xstream</include>
-         <include>xmlpull:xmlpull</include>
-         <include>activemq:jmdns</include>
+        <include>${pom.groupId}:activemq-rar</include>
+        <include>${pom.groupId}:activemq-optional</include>
+        <include>${pom.groupId}:activemq-xmpp</include>
+        <include>${pom.groupId}:activecluster</include>
+        <include>commons-beanutils:commons-beanutils</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-httpclient:commons-httpclient</include>
+        <include>commons-dbcp:commons-dbcp</include>
+        <include>commons-pool:commons-pool</include>
+        <include>org.mortbay.jetty:jetty</include>
+        <include>org.mortbay.jetty:jetty-util</include>
+        <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>log4j:log4j</include>
+        <include>mx4j:mx4j-remote</include>
+        <include>mx4j:mx4j-tools</include>
+        <include>org.apache.derby:derby</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.xbean:xbean-spring</include>
+        <include>org.springframework:spring</include>
+        <include>xstream:xstream</include>
+        <include>xmlpull:xmlpull</include>
+        <include>activemq:jmdns</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -157,23 +175,27 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>org.mortbay.jetty:jetty</include>
-         <include>org.mortbay.jetty:jetty-util</include>
-         <include>org.mortbay.jetty:jetty-xbean</include>
-         <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>org.mortbay.jetty:jetty</include>
+        <include>org.mortbay.jetty:jetty-util</include>
+        <include>org.mortbay.jetty:jetty-xbean</include>
+        <include>org.mortbay.jetty:servlet-api-2.5</include>
         <include>org.slf4j:slf4j-jcl</include>
 
         <!-- JSP support -->
-         <include>org.mortbay.jetty:jsp-2.1</include>
-         <include>org.mortbay.jetty:jsp-api-2.1</include>
-         <include>org.eclipse.jdt:core</include>
-         <include>ant:ant</include>
+        <include>org.mortbay.jetty:jsp-2.1</include>
+        <include>org.mortbay.jetty:jsp-api-2.1</include>
+        <include>org.eclipse.jdt:core</include>
+        <include>ant:ant</include>
 
-         <!-- JSTL and other web stuff -->
-         <include>opensymphony:sitemesh</include>
-         <include>javax.servlet:jstl</include>
-         <include>taglibs:standard</include>
+        <!-- JSTL and other web stuff -->
+        <include>opensymphony:sitemesh</include>
+        <include>javax.servlet:jstl</include>
+        <include>taglibs:standard</include>
+
+        <!-- Atom/RSS support -->
+        <include>rome:rome</include>
+        <include>jdom:jdom</include>
       </includes>
     </dependencySet>
-  </dependencySets>  
+  </dependencySets>
 </assembly>
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 856b327cbe..530940d8ef 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -98,7 +98,7 @@
     </connectors>
 
     <handlers>
-      <webAppContext contextPath="/admin" resourceBase="webapps" parentLoaderPriority="false" />
+      <webAppContext contextPath="/admin" resourceBase="webapps/admin" parentLoaderPriority="false" />
     </handlers>
   </jetty>
 
diff --git a/assembly/src/release/webapps/admin/WEB-INF/applicationContext.xml b/assembly/src/release/webapps/admin/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000000..9b0c51fe41
--- /dev/null
+++ b/assembly/src/release/webapps/admin/WEB-INF/applicationContext.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+  <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+  
+  
+  <bean id="sessionPool" class="org.apache.activemq.web.SessionPool"/>
+  
+  <!-- use the following bean for a local in-JVM broker -->
+  <bean id="brokerQuery" class="org.apache.activemq.web.SingletonBrokerFacade" autowire='constructor' singleton="false"/>
+
+  <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire='constructor' singleton="false"/>
+  <bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire='constructor' singleton="false"/>
+
+</beans>
diff --git a/assembly/src/release/webapps/index.html b/assembly/src/release/webapps/index.html
new file mode 100644
index 0000000000..ad60d69b41
--- /dev/null
+++ b/assembly/src/release/webapps/index.html
@@ -0,0 +1,5 @@
+<html>
+	<body>
+		<h1>Welcome to Apache ActiveMQ!</h1>
+	</body>
+</html>
\ No newline at end of file