diff --git a/activecluster/pom.xml b/activecluster/pom.xml
index b3fc69a111..abf5314861 100644
--- a/activecluster/pom.xml
+++ b/activecluster/pom.xml
@@ -20,12 +20,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.activemq.activecluster</groupId>
   <artifactId>activecluster</artifactId>
-  <version>1.3-SNAPSHOT</version>
   <name>ActiveCluster</name>
 
   <dependencies>
diff --git a/activeio/pom.xml b/activeio/pom.xml
index f6498cfa99..8be628258d 100644
--- a/activeio/pom.xml
+++ b/activeio/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index be7cc6b663..9bc20d47c8 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -136,4 +136,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index f968198395..a0dd781445 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -304,4 +304,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-dotnet/pom.xml b/activemq-dotnet/pom.xml
index 38d4cf58d4..cb027798bf 100644
--- a/activemq-dotnet/pom.xml
+++ b/activemq-dotnet/pom.xml
@@ -1,145 +1,145 @@
-<?xml version="1.0"?>
-<project>
-  <parent>
-    <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
-    <version>4.0-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>activemq-dotnet</artifactId>
-  <packaging>dotnet-library</packaging>
-
-  <build>
-
-    <outputDirectory>target/dotnet-assembly</outputDirectory>
-    <testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
-    <sourceDirectory>src/main/csharp</sourceDirectory>
-    <testSourceDirectory>src/test/csharp</testSourceDirectory>
-
-    <plugins>
-
-      <!-- Manages the lifecycle of a dotnet project -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-csharp-lifecycle-plugin</artifactId>
-        <version>1.0.RC6-SNAPSHOT</version>
-        <extensions>true</extensions>
-      </plugin>
-
-      <!-- Used to customize the dotnet compiler options -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0</version>
-        <extensions>true</extensions>
-
-        <configuration>
-          <compilerId>csharp</compilerId>
-          <fork>true</fork>
-
-          <compilerArguments>
-            <doc>true</doc>
-            <!--  example of ignoring warnings -->
-            <nowarn>1591</nowarn>
-          </compilerArguments>
-
-          <includes>
-            <include>**/*.cs</include>
-          </includes>
-
-        </configuration>
-
-        <!--  executions need to be specified for the dotnet plugin (is slightly ugly, hopefully can get rid of in future -->
-        <executions>
-
-          <!--  this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <compilerArguments>
-                <target>library</target>
-                <!--  mainClass>MyNamespace.MyStaticMainClass</mainClass -->
-              </compilerArguments>
-            </configuration>
-          </execution>
-
-          <!--  this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
-          <execution>
-            <id>testCompile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-            <configuration>
-              <compilerArguments>
-                <!--  the library element is required for test compile -->
-                <target>library</target>
-                <!--  the isTest element is required for the test compile -->
-                <out>unit-tests.dll</out>
-              </compilerArguments>
-            </configuration>
-          </execution>
-        </executions>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-csharp</artifactId>
-            <version>1.6-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <!-- For Running NUNIT tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-nunit-plugin</artifactId>
-        <version>1.0.RC6-SNAPSHOT</version>
-        <!-- configuration>
-          <configFile>src/main/resources/App.config</configFile>
-        </configuration -->
-      </plugin>
-
-      <!-- For VS.NET project generation -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-vstudio-plugin</artifactId>
-        <version>1.0.RC6-SNAPSHOT</version>
-        <configuration>
-          <frameworkHome>${dotnet.home}</frameworkHome>
-          <includes>
-            <include>**/*.aspx</include>
-            <include>**/*.resx</include>
-            <include>**/*.cs</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <dependencies>
-    <!--  example of a system dependency -->
-    <!--  dependency>
-      <groupId>System</groupId>
-      <artifactId>System</artifactId>
-      <version>1.1</version>
-      <type>dotnet-library</type>
-      <scope>system</scope>
-      <systemPath>${dotnet.home}/System.dll</systemPath>
-    </dependency -->
-
-    <dependency>
-      <groupId>nunit</groupId>
-      <artifactId>nunit-console</artifactId>
-      <version>2.2</version>
-      <type>dotnet-exe</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0"?>
+<project>
+  <parent>
+    <groupId>incubator-activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>activemq-dotnet</artifactId>
+  <packaging>dotnet-library</packaging>
+
+  <build>
+
+    <outputDirectory>target/dotnet-assembly</outputDirectory>
+    <testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
+    <sourceDirectory>src/main/csharp</sourceDirectory>
+    <testSourceDirectory>src/test/csharp</testSourceDirectory>
+
+    <plugins>
+
+      <!-- Manages the lifecycle of a dotnet project -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-csharp-lifecycle-plugin</artifactId>
+        <version>1.0.RC6-SNAPSHOT</version>
+        <extensions>true</extensions>
+      </plugin>
+
+      <!-- Used to customize the dotnet compiler options -->
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0</version>
+        <extensions>true</extensions>
+
+        <configuration>
+          <compilerId>csharp</compilerId>
+          <fork>true</fork>
+
+          <compilerArguments>
+            <doc>true</doc>
+            <!--  example of ignoring warnings -->
+            <nowarn>1591</nowarn>
+          </compilerArguments>
+
+          <includes>
+            <include>**/*.cs</include>
+          </includes>
+
+        </configuration>
+
+        <!--  executions need to be specified for the dotnet plugin (is slightly ugly, hopefully can get rid of in future -->
+        <executions>
+
+          <!--  this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <compilerArguments>
+                <target>library</target>
+                <!--  mainClass>MyNamespace.MyStaticMainClass</mainClass -->
+              </compilerArguments>
+            </configuration>
+          </execution>
+
+          <!--  this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
+          <execution>
+            <id>testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <compilerArguments>
+                <!--  the library element is required for test compile -->
+                <target>library</target>
+                <!--  the isTest element is required for the test compile -->
+                <out>unit-tests.dll</out>
+              </compilerArguments>
+            </configuration>
+          </execution>
+        </executions>
+
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-csharp</artifactId>
+            <version>1.6-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <!-- For Running NUNIT tests -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-nunit-plugin</artifactId>
+        <version>1.0.RC6-SNAPSHOT</version>
+        <!-- configuration>
+          <configFile>src/main/resources/App.config</configFile>
+        </configuration -->
+      </plugin>
+
+      <!-- For VS.NET project generation -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-vstudio-plugin</artifactId>
+        <version>1.0.RC6-SNAPSHOT</version>
+        <configuration>
+          <frameworkHome>${dotnet.home}</frameworkHome>
+          <includes>
+            <include>**/*.aspx</include>
+            <include>**/*.resx</include>
+            <include>**/*.cs</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <dependencies>
+    <!--  example of a system dependency -->
+    <!--  dependency>
+      <groupId>System</groupId>
+      <artifactId>System</artifactId>
+      <version>1.1</version>
+      <type>dotnet-library</type>
+      <scope>system</scope>
+      <systemPath>${dotnet.home}/System.dll</systemPath>
+    </dependency -->
+
+    <dependency>
+      <groupId>nunit</groupId>
+      <artifactId>nunit-console</artifactId>
+      <version>2.2</version>
+      <type>dotnet-exe</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/activemq-gbean-management/pom.xml b/activemq-gbean-management/pom.xml
index e091fa3023..4daad14a60 100644
--- a/activemq-gbean-management/pom.xml
+++ b/activemq-gbean-management/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -54,4 +54,4 @@
       <artifactId>log4j</artifactId>
     </dependency>
    </dependencies> 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-gbean/pom.xml b/activemq-gbean/pom.xml
index 6446bdea79..81eabf9bb9 100644
--- a/activemq-gbean/pom.xml
+++ b/activemq-gbean/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -106,4 +106,4 @@
     </plugins>
   </build>  
 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 0878598a7c..7705af2307 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -121,4 +121,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index 54ed3f10a4..05b122997e 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 482e5328b8..e0d02aa54e 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -100,4 +100,4 @@
   </build>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-systest/pom.xml b/activemq-systest/pom.xml
index 8f6b2d86dd..4d48d5521b 100755
--- a/activemq-systest/pom.xml
+++ b/activemq-systest/pom.xml
@@ -19,7 +19,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 980a73b044..32ed114b79 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 871a939866..5389addbb8 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 425498c5ef..0b7562c9ce 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -25,12 +25,12 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>activemq-assembly</artifactId>
+  <artifactId>activemq</artifactId>
   <packaging>jar</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-web</artifactId>
+      <artifactId>activemq-web-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
@@ -77,6 +77,12 @@
       <artifactId>activecluster</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <type>rar</type>
+      <optional>true</optional>
+    </dependency>
     
     <!-- commons -->
     <dependency>
@@ -223,6 +229,22 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>incubator-activemq</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${pom.version}</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>createbundle</goal>
+            </goals>
+            <configuration>
+              <includes>activemq-core,activemq-console,activeio-core,activemq-optional,backport-util-concurrent,commons-logging,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec,derby</includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -242,20 +264,6 @@
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
-          <execution>
-            <id>full</id>
-            <phase>package</phase>
-            <goals>
-              <goal>assembly</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                 <descriptor>src/main/descriptors/all-jar.xml</descriptor>
-              </descriptors>
-              <finalName>activemq-full-${pom.version}</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
 
diff --git a/assembly/src/main/descriptors/bin.xml b/assembly/src/main/descriptors/bin.xml
index 8cc2b961b8..9c7edaa71d 100644
--- a/assembly/src/main/descriptors/bin.xml
+++ b/assembly/src/main/descriptors/bin.xml
@@ -24,6 +24,7 @@
   <fileSets>
     <fileSet>
       <includes>
+        <include>STATUS*</include>
         <include>README*</include>
         <include>LICENSE*</include>
         <include>NOTICE*</include>
@@ -71,17 +72,19 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-          <!-- <include>${pom.groupId}:activemq-ra</include> -->
+         <include>incubator-activemq:activemq-ra</include>
          <include>incubator-activemq:activemq-optional</include>
-         <include>activecluster:activecluster</include>
+         <include>incubator-activemq: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>jetty:jetty</include>
+         <include>org.mortbay.jetty:jetty</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>
@@ -123,4 +126,4 @@
   </dependencySets>
   -->
   
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/jmeter/pom.xml b/jmeter/pom.xml
index 3b90700ce1..0a2e6032ce 100644
--- a/jmeter/pom.xml
+++ b/jmeter/pom.xml
@@ -19,7 +19,7 @@
     
     <parent>
         <groupId>activemq</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq-parent</artifactId>
         <version>4.0-SNAPSHOT</version>
     </parent>
     
@@ -122,7 +122,7 @@
       
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <artifactId>activemq-parent</artifactId>
             <version>${version}</version>
         </dependency>
         
diff --git a/maven-bundle-plugin/pom.xml b/maven-bundle-plugin/pom.xml
new file mode 100644
index 0000000000..dc8a7559bc
--- /dev/null
+++ b/maven-bundle-plugin/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed 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">
+  
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>incubator-activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>maven-bundle-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Bundle Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-archiver</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java b/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
new file mode 100644
index 0000000000..21ba94f26f
--- /dev/null
+++ b/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
@@ -0,0 +1,113 @@
+package org.apache.activemq.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * @goal createbundle
+ * @description Creates an xfire bundle
+ */
+public class BundleMojo extends AbstractMojo 
+{
+    /**
+     * The output directory of the assembled distribution file.
+     *
+     * @parameter expression="${project.build.outputDirectory}"
+     * @required
+     */
+    protected File outputDirectory;
+    
+    /**
+     * Inclusion list
+     *
+     * @parameter
+     */
+    String includes = "";
+    
+    /**
+     * The Maven Project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    MavenProject project;
+    
+    /**
+     * To look up Archiver/UnArchiver implementations
+     *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
+     * @required
+     */
+    protected ArchiverManager archiverManager;
+    
+    public void execute() throws MojoExecutionException 
+    {
+        String[] include = includes.split(",");
+        List includeList = Arrays.asList(include);
+        getLog().info("Inclusions: " + includeList);
+        getLog().info("OutputDirectory: " + outputDirectory);
+        outputDirectory.mkdirs();
+        
+        for (Iterator itr = project.getArtifacts().iterator(); itr.hasNext();)
+        {
+            Artifact a = (Artifact) itr.next();
+
+            if (includeList.contains(a.getArtifactId()))
+            {
+                getLog().info("Found " + a.getArtifactId());
+                
+                try 
+                {
+                    unpack( a.getFile(), outputDirectory );
+                } 
+                catch (MojoExecutionException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                } 
+                catch (NoSuchArchiverException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    
+    protected void unpack( File file, File location )
+        throws MojoExecutionException, NoSuchArchiverException
+    {
+        String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase();
+    
+        try
+        {
+            UnArchiver unArchiver = this.archiverManager.getUnArchiver( archiveExt );
+    
+            unArchiver.setSourceFile( file );
+    
+            unArchiver.setDestDirectory( location );
+    
+            unArchiver.extract();
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error unpacking file: " + file + "to: " + location, e );
+        }
+        catch ( ArchiverException e )
+        {
+            throw new MojoExecutionException( "Error unpacking file: " + file + "to: " + location, e );
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index 3fe65d0dd4..d28d696fbb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>incubator-activemq</groupId>
-  <artifactId>activemq</artifactId>
+  <artifactId>activemq-parent</artifactId>
   <version>4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
@@ -120,6 +120,7 @@
   </distributionManagement>
 
   <modules>
+    <module>activeio</module>
     <module>activecluster</module>
     <module>activemq-jaas</module>
     <module>activemq-core</module>
@@ -131,6 +132,7 @@
     <module>activemq-gbean</module>
     <module>activemq-gbean-management</module>
     <!--module>activemq-systest</module -->
+    <module>maven-bundle-plugin</module>
     <module>assembly</module>
 
 <!--
@@ -188,6 +190,7 @@
         <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-web-demo</artifactId>
         <version>${pom.version}</version>
+        <type>war</type>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 50048dc4b1..3e3fade3b7 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.activemq.sandbox</groupId>