463462 - Adds JMX based smoke tests
diff --git a/build.gradle b/build.gradle
index 246b62d..1e5d3fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -112,8 +112,8 @@
 	project(':medic:org.eclipse.virgo.medic.test'),
 	project(':kernel:org.eclipse.virgo.kernel.stubs'),
 ]
-if (System.properties['local.build'] == 'true') {
-	ext.testUtils = [
+if (System.properties['skip.smoke.tests'] != 'true') {
+	ext.testUtils += [
 		project(':test:org.eclipse.virgo.test.tools'),
 	]
 }
@@ -145,8 +145,17 @@
 	//	project(':medic:org.eclipse.virgo.medic.integrationtest'),
 ]
 
-ext.javaProjects = ext.utilProjects + ext.medicProjects + ext.repositoryProjects + ext.nanoProjects + ext.kernelProjects + ext.webProjects + ext.appsProjects + ext.miscProjects
-ext.javaProjects += ext.integrationTestProjects +
+ext.smokeTestProjects = []
+if (System.properties['skip.smoke.tests'] != 'true') {
+	ext.smokeTestProjects += [
+		project(':packaging:nano:org.eclipse.virgo.nano.smoketest'),
+		project(':packaging:kernel:org.eclipse.virgo.kernel.smoketest'),
+		project(':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'),
+		project(':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'),
+	]
+}
+
+ext.javaProjects = ext.utilProjects + ext.medicProjects + ext.repositoryProjects + ext.nanoProjects + ext.kernelProjects + ext.webProjects + ext.appsProjects + ext.miscProjects + ext.integrationTestProjects + smokeTestProjects +
 		[
 			project(':nano:org.eclipse.virgo.nano.authentication'),
 			project(':nano:org.eclipse.virgo.nano.shutdown'),
@@ -223,16 +232,6 @@
 	project(':packaging:tomcat-server'),
 ]
 
-ext.smokeTestProjects = []
-if (System.properties['local.build'] == 'true') {
-	ext.smokeTestProjects = [
-		project(':packaging:nano:org.eclipse.virgo.nano.smoketest'),
-		project(':packaging:kernel:org.eclipse.virgo.kernel.smoketest'),
-		project(':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'),
-		project(':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'),
-	]
-}
-
 ext {
 	// used when copying features and products
 	tokenMap = [
@@ -709,7 +708,6 @@
 			}
 		}
 	}
-
 }
 
 configure(testUtils) {
@@ -738,28 +736,26 @@
 }
 
 configure(smokeTestProjects) {
-	if (System.properties['local.build'] == 'true') {
-		sourceSets {
-			smokeTest {
-				java.srcDir file('src/smokeTest/java')
-				resources.srcDir file('src/smokeTest/resources')
-			}
+	sourceSets {
+		smokeTest {
+			java.srcDir file('src/smokeTest/java')
+			resources.srcDir file('src/smokeTest/resources')
 		}
+	}
 
-		task smokeTest(type: Test) {
-			testClassesDir = sourceSets.smokeTest.output.classesDir
-			classpath = sourceSets.smokeTest.runtimeClasspath
-		}
+	task smokeTest(type: Test) {
+		testClassesDir = sourceSets.smokeTest.output.classesDir
+		classpath = sourceSets.smokeTest.runtimeClasspath
+	}
 
-		dependencies {
-			testCompile project(':test:org.eclipse.virgo.test.tools')
-			testCompile project(':util:org.eclipse.virgo.util.io')
+	dependencies {
+		testCompile project(':test:org.eclipse.virgo.test.tools')
+		testCompile project(':util:org.eclipse.virgo.util.io')
 
-			smokeTestCompile sourceSets.main.output
-			smokeTestCompile configurations.testCompile
-			smokeTestCompile sourceSets.test.output
-			smokeTestRuntime configurations.testRuntime
-		}
+		smokeTestCompile sourceSets.main.output
+		smokeTestCompile configurations.testCompile
+		smokeTestCompile sourceSets.test.output
+		smokeTestRuntime configurations.testRuntime
 	}
 }
 
diff --git a/packaging b/packaging
index 4e22a7a..ddd56d4 160000
--- a/packaging
+++ b/packaging
@@ -1 +1 @@
-Subproject commit 4e22a7a84303c39ba134c7f74ae24ceca4999a7f
+Subproject commit ddd56d4780d3f10e2f02b7ea0c3a91a4134f847e
diff --git a/settings.gradle b/settings.gradle
index f19ce45..0aeaf28 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -98,7 +98,7 @@
 include ':packaging:jetty-server:org.eclipse.virgo.jetty.sample.tags'
 include ':packaging:tomcat-server'
 
-if (System.properties['local.build'] == 'true') {
+if (System.properties['skip.smoke.tests'] != 'true') {
 	include ':test:org.eclipse.virgo.test.tools'
 	include ':packaging:nano:org.eclipse.virgo.nano.smoketest'
     include ':packaging:kernel:org.eclipse.virgo.kernel.smoketest'
diff --git a/test b/test
index 3b5dab6..52e5191 160000
--- a/test
+++ b/test
@@ -1 +1 @@
-Subproject commit 3b5dab63fc5c3b229c23f4882a7258f06133e564
+Subproject commit 52e5191bd435262e4a291059326df5f404a12388