From 7d88ce8f27d1c6866e4a0501d1e391baa2da86db Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt
Date: Fri, 16 Jan 2015 15:17:27 -0700
Subject: 457696 - JMX implementation should not be overridden by WebApp
classes
+ Adding integration tests for the jmx issues
---
tests/test-jmx/jmx-webapp-it/pom.xml | 215 +++++++++++++++++++++++++++++++++++
1 file changed, 215 insertions(+)
create mode 100644 tests/test-jmx/jmx-webapp-it/pom.xml
(limited to 'tests/test-jmx/jmx-webapp-it/pom.xml')
diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml
new file mode 100644
index 0000000000..4272e5072c
--- /dev/null
+++ b/tests/test-jmx/jmx-webapp-it/pom.xml
@@ -0,0 +1,215 @@
+
+
+
+
+ org.eclipse.jetty.tests
+ test-jmx-parent
+ 9.2.8-SNAPSHOT
+
+ 4.0.0
+ jmx-webapp-it
+ jar
+ Jetty Tests :: JMX :: WebApp Integration Tests
+ http://www.eclipse.org/jetty
+
+ UTF-8
+ UTF-8
+ ${project.groupId}.jmx.webapp.it
+ ${project.basedir}/src/test/scripts
+ ${project.build.directory}/test-base
+ ${project.build.directory}/test-home
+
+
+
+ org.eclipse.jetty
+ jetty-distribution
+ ${project.version}
+ zip
+ runtime
+
+
+ org.eclipse.jetty.tests
+ jmx-webapp
+ ${project.version}
+ war
+ runtime
+
+
+ org.eclipse.jetty.toolchain
+ jetty-test-helper
+ test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ copy-apps-for-testing
+ process-test-resources
+
+ copy-dependencies
+
+
+ jmx-webapp
+ runtime
+ war
+ true
+ true
+ true
+ ${test-base-dir}/webapps
+
+
+
+ unpack-jetty-distro
+ process-test-resources
+
+ unpack-dependencies
+
+
+ jetty-distribution
+ runtime
+ zip
+ true
+ ${test-home-dir}
+ true
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.17
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.7
+
+
+ start-jetty
+ pre-integration-test
+
+ run
+
+
+
+
+
+ Integration Test : Setup Jetty
+
+
+
+
+
+
+
+
+ Integration Test : Starting Jetty ...
+
+
+
+
+
+
+
+
+
+
+ Integration Test : Jetty is now available
+
+
+
+
+ stop-jetty
+ post-integration-test
+
+ run
+
+
+
+
+
+ Integration Test : Stop Jetty
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ it-windows
+
+
+ Windows
+
+
+
+ cmd
+ /c
+ start-jetty.bat
+ stop-jetty.bat
+
+
+
+ it-unix
+
+
+ unix
+
+
+
+ sh
+ --
+ setup-jetty.sh
+ start-jetty.sh
+ stop-jetty.sh
+
+
+
+
--
cgit v1.2.3
From c6b07e09d9fd76d114fb3298a6423dcf8edadf24 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt
Date: Mon, 19 Jan 2015 14:04:45 -0700
Subject: Re-enabling test-jmx tree
---
tests/pom.xml | 1 +
tests/test-jmx/jmx-webapp-it/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'tests/test-jmx/jmx-webapp-it/pom.xml')
diff --git a/tests/pom.xml b/tests/pom.xml
index b107aa4b07..4c52947124 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -48,5 +48,6 @@
test-loginservice
test-integration
test-quickstart
+ test-jmx
diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml
index 4272e5072c..a27d6d32d5 100644
--- a/tests/test-jmx/jmx-webapp-it/pom.xml
+++ b/tests/test-jmx/jmx-webapp-it/pom.xml
@@ -147,7 +147,7 @@
+ checkevery="500" checkeveryunit="millisecond">
Integration Test : Jetty is now available
--
cgit v1.2.3