From b419a8956e504050227a6718a5caff8cb4437202 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 23 Mar 2022 16:02:35 -0500 Subject: [PATCH] Issue #6879 - Remove jminix (#7770) Signed-off-by: Joakim Erdfelt --- .../src/main/resources/modules/jminix.mod | 46 ------------------- .../main/resources/modules/jminix/jminix.xml | 12 ----- .../distribution/ThirdPartyModulesTests.java | 34 -------------- 3 files changed, 92 deletions(-) delete mode 100644 jetty-home/src/main/resources/modules/jminix.mod delete mode 100644 jetty-home/src/main/resources/modules/jminix/jminix.xml diff --git a/jetty-home/src/main/resources/modules/jminix.mod b/jetty-home/src/main/resources/modules/jminix.mod deleted file mode 100644 index c3d6f7f71bb..00000000000 --- a/jetty-home/src/main/resources/modules/jminix.mod +++ /dev/null @@ -1,46 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Deploys the Jminix JMX Console within the server. - -[tags] -3rdparty - -[depend] -stats -jmx -commons-logging - -[xml] -etc/jminix.xml - -[files] -lib/jminix/ -maven://org.jminix/jminix/1.1.0|lib/jminix/jminix-1.1.0.jar -https://maven.restlet.talend.com/org/restlet/org.restlet/1.1.5/org.restlet-1.1.5.jar|lib/jminix/org.restlet-1.1.5.jar -https://maven.restlet.talend.com/org/restlet/org.restlet.ext.velocity/1.1.5/org.restlet.ext.velocity-1.1.5.jar|lib/jminix/org.restlet.ext.velocity-1.1.5.jar -maven://org.apache.velocity/velocity/1.5|lib/jminix/velocity-1.5.jar -maven://oro/oro/2.0.8|lib/jminix/oro-2.0.8.jar -https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet/1.1.5/com.noelios.restlet-1.1.5.jar|lib/jminix/com.noelios.restlet-1.1.5.jar -https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet.ext.servlet/1.1.5/com.noelios.restlet.ext.servlet-1.1.5.jar|lib/jminix/com.noelios.restlet.ext.servlet-1.1.5.jar -maven://net.sf.json-lib/json-lib/2.2.3/jar/jdk15|lib/jminix/json-lib-2.2.3-jdk15.jar -maven://commons-lang/commons-lang/2.4|lib/jminix/commons-lang-2.4.jar -maven://commons-beanutils/commons-beanutils/1.7.0|lib/jminix/commons-beanutils-1.7.0.jar -maven://commons-collections/commons-collections/3.2|lib/jminix/commons-collections-3.2.jar -maven://net.sf.ezmorph/ezmorph/1.0.6|lib/jminix/ezmorph-1.0.6.jar -maven://org.jgroups/jgroups/2.12.1.3.Final|lib/jminix/jgroups-2.12.1.3.Final.jar -maven://org.jasypt/jasypt/1.8|lib/jminix/jasypt-1.8.jar -basehome:modules/jminix/jminix.xml|etc/jminix.xml - -[lib] -lib/jminix/**.jar - -[license] -JMiniX is a hosted at google code and released under the Apache License 2.0 -https://code.google.com/p/jminix/ -http://www.apache.org/licenses/LICENSE-2.0 - -[ini-template] -## Jminix Configuration -# jminix.port=8088 - diff --git a/jetty-home/src/main/resources/modules/jminix/jminix.xml b/jetty-home/src/main/resources/modules/jminix/jminix.xml deleted file mode 100644 index 933de82b697..00000000000 --- a/jetty-home/src/main/resources/modules/jminix/jminix.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java index 9b8d44154f3..15151871aa7 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java @@ -105,40 +105,6 @@ public class ThirdPartyModulesTests extends AbstractJettyHomeTest } } - @Test - public void testjminix() throws Exception - { - Path jettyBase = newTestJettyBaseDirectory(); - String jettyVersion = System.getProperty("jettyVersion"); - JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() - .jettyVersion(jettyVersion) - .jettyBase(jettyBase) - .mavenLocalRepository(System.getProperty("mavenRepoPath")) - .build(); - - int httpPort = distribution.freePort(); - - String[] argsConfig = { - "--approve-all-licenses", - "--add-modules=jminix,http,logging-jcl-capture" - }; - - try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) - { - assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES)); - assertEquals(0, runConfig.getExitValue()); - - String[] argsStart = { - "jetty.http.port=" + httpPort - }; - - try (JettyHomeTester.Run runStart = distribution.start(argsStart)) - { - assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS)); - } - } - } - @Test public void testjolokia() throws Exception {