Merge branch 'jetty-11.0.x' of github.com:eclipse/jetty.project into jetty-11.0.x
This commit is contained in:
Lachlan Roberts
commit
66a68c9c61
|
|
@ -1,36 +0,0 @@
|
|||
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
|
||||
|
||||
[description]
|
||||
Deploys the Hawtio console as a web application.
|
||||
|
||||
[tags]
|
||||
3rdparty
|
||||
|
||||
[depend]
|
||||
stats
|
||||
deploy
|
||||
jmx
|
||||
|
||||
[xml]
|
||||
etc/hawtio.xml
|
||||
|
||||
[files]
|
||||
etc/hawtio/
|
||||
lib/hawtio/
|
||||
maven://io.hawt/hawtio-default/${hawtio.version}/war|lib/hawtio/hawtio.war
|
||||
basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml
|
||||
|
||||
[license]
|
||||
Hawtio is a redhat JBoss project released under the Apache License, v2.0
|
||||
http://hawt.io/
|
||||
http://github.com/hawtio/hawtio
|
||||
http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
|
||||
[ini]
|
||||
hawtio.version?=@hawtio.version@
|
||||
|
||||
[ini-template]
|
||||
## Hawt.io configuration
|
||||
-Dhawtio.authenticationEnabled?=false
|
||||
-Dhawtio.dirname?=/dirname
|
||||
-Dhawtio.config.dir?=${jetty.base}/etc/hawtio
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
|
||||
<Call name="addHandler">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<Set name="contextPath">/hawtio</Set>
|
||||
<Set name="war"><Property name="jetty.base"/>/lib/hawtio/hawtio.war</Set>
|
||||
<Set name="extractWAR">true</Set>
|
||||
<Set name="copyWebDir">false</Set>
|
||||
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Configure>
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
|
||||
|
||||
[description]
|
||||
Deploys the JAMon web application.
|
||||
|
||||
[tags]
|
||||
3rdparty
|
||||
|
||||
[depend]
|
||||
stats
|
||||
deploy
|
||||
jmx
|
||||
jsp
|
||||
|
||||
[xml]
|
||||
etc/jamon.xml
|
||||
|
||||
[files]
|
||||
lib/jamon/
|
||||
maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar
|
||||
maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war
|
||||
basehome:modules/jamon/jamon.xml|etc/jamon.xml
|
||||
|
||||
[lib]
|
||||
lib/jamon/**.jar
|
||||
|
||||
[license]
|
||||
JAMon is a source forge hosted project released under a BSD derived license.
|
||||
http://jamonapi.sourceforge.net
|
||||
http://jamonapi.sourceforge.net/JAMonLicense.html
|
||||
|
||||
[ini]
|
||||
jamon.version?=@jamon.version@
|
||||
|
||||
[ini-template]
|
||||
## Jamon Configuration
|
||||
# jamon.summaryLabels=demo
|
||||
jamon.summaryLabels=default, request.getStatus().contextpath.value.ms
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Mixin the Jamon Handler -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
||||
|
||||
<Call name="insertHandler">
|
||||
<Arg>
|
||||
<New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew">
|
||||
<Set name="summaryLabels"><Property name="jamon.summaryLabels" /></Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
|
||||
<Ref refid="Contexts">
|
||||
<Call name="addHandler">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<Set name="contextPath">/jamon</Set>
|
||||
<Set name="war"><Property name="jetty.base"/>/lib/jamon/jamon.war</Set>
|
||||
<Set name="extractWAR">true</Set>
|
||||
<Set name="copyWebDir">false</Set>
|
||||
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Ref>
|
||||
|
||||
</Configure>
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
||||
<Call name="addBean">
|
||||
<Arg>
|
||||
<New class="org.jminix.console.tool.StandaloneMiniConsole">
|
||||
<Arg type="int"><Property name="jminix.port" default="8088" /></Arg>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Configure>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
|
||||
|
||||
[description]
|
||||
Deploys the Jolokia console as a web application.
|
||||
|
||||
[tags]
|
||||
3rdparty
|
||||
|
||||
[depend]
|
||||
stats
|
||||
deploy
|
||||
jmx
|
||||
|
||||
[xml]
|
||||
etc/jolokia.xml
|
||||
|
||||
[files]
|
||||
maven://org.jolokia/jolokia-war/${jolokia.version}/war|lib/jolokia/jolokia.war
|
||||
basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml
|
||||
|
||||
[ini]
|
||||
jolokia.version?=@jolokia.version@
|
||||
|
||||
[license]
|
||||
Jolokia is released under the Apache License 2.0
|
||||
http://www.jolokia.org
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
|
||||
<Call name="addHandler">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<Set name="contextPath">/jolokia</Set>
|
||||
<Set name="war"><Property name="jetty.base"/>/lib/jolokia/jolokia.war</Set>
|
||||
<Set name="extractWAR">true</Set>
|
||||
<Set name="copyWebDir">false</Set>
|
||||
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Configure>
|
||||
3
pom.xml
3
pom.xml
|
|
@ -48,7 +48,6 @@
|
|||
<guava.version>31.0.1-jre</guava.version>
|
||||
<guice.version>5.1.0</guice.version>
|
||||
<hamcrest.version>2.2</hamcrest.version>
|
||||
<hawtio.version>2.14.4</hawtio.version>
|
||||
<hazelcast.version>4.2.4</hazelcast.version>
|
||||
<infinispan.protostream.version>4.3.5.Final</infinispan.protostream.version>
|
||||
<infinispan.version>11.0.14.Final</infinispan.version>
|
||||
|
|
@ -74,7 +73,6 @@
|
|||
<jakarta.xml.bind.impl.version>3.0.2</jakarta.xml.bind.impl.version>
|
||||
<jakarta.xml.jaxws.impl.version>3.0.2</jakarta.xml.jaxws.impl.version>
|
||||
<jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
|
||||
<jamon.version>2.82</jamon.version>
|
||||
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version> <!-- TODO: remove? -->
|
||||
<javax.cdi.api.version>2.0</javax.cdi.api.version> <!-- TODO: remove? -->
|
||||
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version> <!-- TODO: remove? -->
|
||||
|
|
@ -97,7 +95,6 @@
|
|||
<jnr-ffi.version>2.2.11</jnr-ffi.version>
|
||||
<jnr-posix.version>3.1.15</jnr-posix.version>
|
||||
<jnr-unixsocket.version>0.38.17</jnr-unixsocket.version>
|
||||
<jolokia.version>1.3.3</jolokia.version>
|
||||
<json-simple.version>1.1.1</json-simple.version>
|
||||
<json-smart.version>2.4.7</json-smart.version>
|
||||
<jsp.impl.version>10.0.14</jsp.impl.version>
|
||||
|
|
|
|||
|
|
@ -1,185 +0,0 @@
|
|||
//
|
||||
// ========================================================================
|
||||
// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
|
||||
//
|
||||
// This program and the accompanying materials are made available under the
|
||||
// terms of the Eclipse Public License v. 2.0 which is available at
|
||||
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
|
||||
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
|
||||
//
|
||||
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
|
||||
// ========================================================================
|
||||
//
|
||||
|
||||
package org.eclipse.jetty.tests.distribution;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.eclipse.jetty.client.api.ContentResponse;
|
||||
import org.eclipse.jetty.http.HttpStatus;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
public class ThirdPartyModulesTests extends AbstractJettyHomeTest
|
||||
{
|
||||
@Test
|
||||
@Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595")
|
||||
public void testHawtio() 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=hawtio,http"
|
||||
};
|
||||
|
||||
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));
|
||||
|
||||
startHttpClient();
|
||||
ContentResponse response = client.GET("http://localhost:" + httpPort + "/hawtio");
|
||||
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
|
||||
assertThat(response.getContentAsString(), containsString("<title>Hawtio</title>"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595")
|
||||
public void testJAMon() 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=jamon,http"
|
||||
};
|
||||
|
||||
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));
|
||||
|
||||
startHttpClient();
|
||||
ContentResponse response = client.GET("http://localhost:" + httpPort + "/jamon");
|
||||
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
|
||||
assertThat(response.getContentAsString(), containsString("<title>JAMon"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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
|
||||
@Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595")
|
||||
public void testjolokia() 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=jolokia,http"
|
||||
};
|
||||
|
||||
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));
|
||||
|
||||
startHttpClient();
|
||||
ContentResponse response = client.GET("http://localhost:" + httpPort + "/jolokia");
|
||||
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
|
||||
assertThat(response.getContentAsString(), containsString("\"agentType\":\"servlet\""));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue