Bug 513397 - Prepare for update of GB to 2.1.0
diff --git a/build.gradle b/build.gradle
index b15c4b0..c14e9a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,7 @@
         repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
         repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
         repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
+        repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extensions", version: geminiBlueprintVersion, ext: "jar"
 
         repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: "jar"
         repositoryExt project(':kernel:org.eclipse.virgo.management.fragment')
diff --git a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index 48b0ba5..3d116a1 100644
--- a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -1,14 +1,15 @@
-<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.0" scoped="false" atomic="false"
-			xmlns="http://www.eclipse.org/virgo/schema/plan"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
+<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.1" scoped="false" atomic="false"
+	  xmlns="http://www.eclipse.org/virgo/schema/plan"
+	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
 
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
-		<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
-		<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
-		<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
-		<artifact type="configuration" name="osgi.console" version="0"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
+	<!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
+	<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
+	<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
+	<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
+	<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
+	<artifact type="configuration" name="osgi.console" version="0"/>
 </plan>
diff --git a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
index eb8319d..b7ad494 100644
--- a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
+++ b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.management" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.management" version="3.7.1" scoped="false" atomic="false"
 			xmlns="http://www.eclipse.org/virgo/schema/plan"
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
diff --git a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
index ef633cf..f1ae9d0 100644
--- a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
+++ b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.web.jetty.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.web.jetty" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.web.jetty" version="3.7.1" scoped="false" atomic="false"
                 xmlns="http://www.eclipse.org/virgo/schema/plan"
 				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				xsi:schemaLocation="
diff --git a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index 48b0ba5..3d116a1 100644
--- a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -1,14 +1,15 @@
-<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.0" scoped="false" atomic="false"
-			xmlns="http://www.eclipse.org/virgo/schema/plan"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
+<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.1" scoped="false" atomic="false"
+	  xmlns="http://www.eclipse.org/virgo/schema/plan"
+	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
 
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
-		<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
-		<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
-		<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
-		<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
-		<artifact type="configuration" name="osgi.console" version="0"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
+	<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
+	<!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
+	<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
+	<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
+	<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
+	<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
+	<artifact type="configuration" name="osgi.console" version="0"/>
 </plan>
diff --git a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.management.plan b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
index eb8319d..b7ad494 100644
--- a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
+++ b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.management" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.management" version="3.7.1" scoped="false" atomic="false"
 			xmlns="http://www.eclipse.org/virgo/schema/plan"
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
diff --git a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index 48b0ba5..fb4838e 100644
--- a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.1" scoped="false" atomic="false"
 			xmlns="http://www.eclipse.org/virgo/schema/plan"
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
@@ -6,6 +6,7 @@
 		<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
 		<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
 		<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
+		<!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
 		<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
 		<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
 		<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
diff --git a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
index eb8319d..b7ad494 100644
--- a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
+++ b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.management.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.management" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.management" version="3.7.1" scoped="false" atomic="false"
 			xmlns="http://www.eclipse.org/virgo/schema/plan"
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
diff --git a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan
index 87f4648..bffbd2f 100644
--- a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan
+++ b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.web.tomcat.plan
@@ -1,4 +1,4 @@
-<plan name="org.eclipse.virgo.web.tomcat" version="3.7.0" scoped="false" atomic="false"
+<plan name="org.eclipse.virgo.web.tomcat" version="3.7.1" scoped="false" atomic="false"
                 xmlns="http://www.eclipse.org/virgo/schema/plan"
 				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				xsi:schemaLocation="