Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-119 Upgraded to Jetty 9.2.

This commit is contained in:
John D. Ament 2015-06-03 22:10:51 -04:00 committed by Clebert Suconic
parent 7f8a173500
commit ef1b9605dc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
View File

@ -24,10 +24,10 @@ import org.apache.activemq.artemis.dto.ComponentDTO;
import org.apache.activemq.artemis.dto.WebServerDTO; import org.apache.activemq.artemis.dto.WebServerDTO;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
public class WebServerComponent implements ExternalComponent public class WebServerComponent implements ExternalComponent
@ -44,7 +44,7 @@ public class WebServerComponent implements ExternalComponent
String path = webServerConfig.path.startsWith("/") ? webServerConfig.path : "/" + webServerConfig.path; String path = webServerConfig.path.startsWith("/") ? webServerConfig.path : "/" + webServerConfig.path;
URI uri = new URI(webServerConfig.bind); URI uri = new URI(webServerConfig.bind);
server = new Server(); server = new Server();
org.eclipse.jetty.server.nio.SelectChannelConnector connector = new SelectChannelConnector(); ServerConnector connector = new ServerConnector(server);
connector.setPort(uri.getPort()); connector.setPort(uri.getPort());
connector.setHost(uri.getHost()); connector.setHost(uri.getHost());
@ -92,7 +92,7 @@ public class WebServerComponent implements ExternalComponent
public boolean isStarted() public boolean isStarted()
{ {
return false; return server.isStarted();
} }
private void deployWar(String url, String warURL, String activeMQHome, String path) private void deployWar(String url, String warURL, String activeMQHome, String path)

9
pom.xml
View File

@ -54,6 +54,7 @@
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging --> <!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<netty.version>4.0.28.Final</netty.version> <netty.version>4.0.28.Final</netty.version>
<jetty.version>9.2.11.v20150529</jetty.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<activemq.version.versionName>${project.version}</activemq.version.versionName> <activemq.version.versionName>${project.version}</activemq.version.versionName>
<activemq.version.majorVersion>1</activemq.version.majorVersion> <activemq.version.majorVersion>1</activemq.version.majorVersion>
@ -437,7 +438,7 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId> <artifactId>jetty-all</artifactId>
<version>8.1.16.v20140903</version> <version>${jetty.version}</version>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 --> <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency> </dependency>
<dependency> <dependency>
@ -757,9 +758,9 @@
<version>2.1</version> <version>2.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>6.1.26</version> <version>${jetty.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>