You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/06/04 16:21:36 UTC
[1/4] activemq-artemis git commit: ARTEMIS-119 Upgraded to Jetty 9.2.
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7f8a17350 -> a4a3a4070
ARTEMIS-119 Upgraded to Jetty 9.2.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ef1b9605
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ef1b9605
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ef1b9605
Branch: refs/heads/master
Commit: ef1b9605dc92de4bd68c899b30e7adb48a04ab53
Parents: 7f8a173
Author: John D. Ament <jo...@apache.org>
Authored: Wed Jun 3 22:10:51 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 4 10:20:32 2015 -0400
----------------------------------------------------------------------
.../activemq/artemis/component/WebServerComponent.java | 6 +++---
pom.xml | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef1b9605/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index e160d30..8453c46 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -24,10 +24,10 @@ import org.apache.activemq.artemis.dto.ComponentDTO;
import org.apache.activemq.artemis.dto.WebServerDTO;
import org.eclipse.jetty.server.Connector;
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.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class WebServerComponent implements ExternalComponent
@@ -44,7 +44,7 @@ public class WebServerComponent implements ExternalComponent
String path = webServerConfig.path.startsWith("/") ? webServerConfig.path : "/" + webServerConfig.path;
URI uri = new URI(webServerConfig.bind);
server = new Server();
- org.eclipse.jetty.server.nio.SelectChannelConnector connector = new SelectChannelConnector();
+ ServerConnector connector = new ServerConnector(server);
connector.setPort(uri.getPort());
connector.setHost(uri.getHost());
@@ -92,7 +92,7 @@ public class WebServerComponent implements ExternalComponent
public boolean isStarted()
{
- return false;
+ return server.isStarted();
}
private void deployWar(String url, String warURL, String activeMQHome, String path)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef1b9605/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e022695..4ef69f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
<!-- 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>
<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>
<activemq.version.versionName>${project.version}</activemq.version.versionName>
<activemq.version.majorVersion>1</activemq.version.majorVersion>
@@ -437,7 +438,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
- <version>8.1.16.v20140903</version>
+ <version>${jetty.version}</version>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency>
<dependency>
@@ -757,9 +758,9 @@
<version>2.1</version>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[3/4] activemq-artemis git commit: This closes #16 Update on Jetty
Posted by cl...@apache.org.
This closes #16 Update on Jetty
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a4a3a407
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a4a3a407
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a4a3a407
Branch: refs/heads/master
Commit: a4a3a4070da12cbe0a2b2a95c6e474218b740d7b
Parents: 7f8a173 fed0317
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jun 4 10:20:33 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 4 10:20:33 2015 -0400
----------------------------------------------------------------------
artemis-distribution/pom.xml | 4 ++--
artemis-distribution/src/main/assembly/dep.xml | 2 +-
.../artemis/component/WebServerComponent.java | 6 +++---
.../artemis/test/WebServerComponentTest.java | 3 +++
pom.xml | 22 ++++++++++----------
5 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[4/4] activemq-artemis git commit: ARTEMIS-119 Added proper tests for
webserver component startup checks.
Posted by cl...@apache.org.
ARTEMIS-119 Added proper tests for webserver component startup checks.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fed0317d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fed0317d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fed0317d
Branch: refs/heads/master
Commit: fed0317df89520be6278ae0788fad1e69f882fc1
Parents: e2f301d
Author: John D. Ament <jo...@apache.org>
Authored: Thu Jun 4 09:53:49 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 4 10:20:33 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/component/WebServerComponent.java | 2 +-
.../org/apache/activemq/artemis/test/WebServerComponentTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fed0317d/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 8453c46..7a1a423 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -92,7 +92,7 @@ public class WebServerComponent implements ExternalComponent
public boolean isStarted()
{
- return server.isStarted();
+ return server != null && server.isStarted();
}
private void deployWar(String url, String warURL, String activeMQHome, String path)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fed0317d/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java b/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java
index d432d5f..dafd14e 100644
--- a/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java
+++ b/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java
@@ -64,6 +64,7 @@ public class WebServerComponentTest extends Assert
webServerDTO.bind = "http://localhost:8161";
webServerDTO.path = "webapps";
WebServerComponent webServerComponent = new WebServerComponent();
+ Assert.assertFalse(webServerComponent.isStarted());
webServerComponent.configure(webServerDTO, "./src/test/resources/", "./src/test/resources/");
webServerComponent.start();
// Make the connection attempt.
@@ -92,7 +93,9 @@ public class WebServerComponentTest extends Assert
assertEquals(clientHandler.body, "12345");
// Wait for the server to close the connection.
ch.close();
+ Assert.assertTrue(webServerComponent.isStarted());
webServerComponent.stop();
+ Assert.assertFalse(webServerComponent.isStarted());
}
class ClientHandler extends SimpleChannelInboundHandler<HttpObject>
[2/4] activemq-artemis git commit: ARTEMIS-119 Changed dependency to
use Tomcat Servlet API 3.1.
Posted by cl...@apache.org.
ARTEMIS-119 Changed dependency to use Tomcat Servlet API 3.1.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e2f301dd
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e2f301dd
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e2f301dd
Branch: refs/heads/master
Commit: e2f301dd851b1ccca9397b48926219859b63306f
Parents: ef1b960
Author: John D. Ament <jo...@apache.org>
Authored: Thu Jun 4 09:33:41 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 4 10:20:33 2015 -0400
----------------------------------------------------------------------
artemis-distribution/pom.xml | 4 ++--
artemis-distribution/src/main/assembly/dep.xml | 2 +-
pom.xml | 13 ++++++-------
3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/artemis-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 273bb0b..ebde324 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -154,8 +154,8 @@
<artifactId>jetty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/artemis-distribution/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index e2466c3..aa464a3 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -80,7 +80,7 @@
<include>javax.inject:javax.inject</include>
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
+ <include>org.apache.tomcat:tomcat-servlet-api</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-logging:commons-logging</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e2f301dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ef69f1..2f7b61a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
<!-- ### Build Time Dependencies ### -->
<!-- This is a build dependency of this project, but is not needed at compile or runtime by other
projects that depend on this project. This should be in the compiler plugin but can't because of a bug,
- see https://jira.codehaus.org/browse/MCOMPILER-203-->
+ see https://issues.apache.org/jira/browse/MCOMPILER-203-->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
@@ -441,12 +441,11 @@
<version>${jetty.version}</version>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- <!-- License: Apache 2.0 -->
- </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>8.0.23</version>
+ </dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>