You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/05/05 10:29:42 UTC
qpid-dispatch git commit: DISPATCH-307: misc fixups/additions for
console plugin bits
Repository: qpid-dispatch
Updated Branches:
refs/heads/master f5a48173a -> 532c89741
DISPATCH-307: misc fixups/additions for console plugin bits
- combine duplicate servlet spec dependencies.
- ensure spec uses provided scope to stop including in war.
- remove some plugin version overides, use the newer versions already configured by the parent.
- add some detail around issues/scm, tweak description, update readme etc.
- set compiler source/target for Java 7 rather than parent default of 5.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/532c8974
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/532c8974
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/532c8974
Branch: refs/heads/master
Commit: 532c897413f2237a88d580a2213fb3d53dae349f
Parents: f5a4817
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu May 5 11:25:30 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu May 5 11:25:30 2016 +0100
----------------------------------------------------------------------
console/hawtio/README.md | 8 ++++----
console/hawtio/pom.xml | 41 +++++++++++++++++++++++------------------
2 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/532c8974/console/hawtio/README.md
----------------------------------------------------------------------
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index ffc255d..139c573 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -1,6 +1,6 @@
# hawtio dispatch router plugin
-dispatch-plugin.war is a standalone hawtio plugin that can be deployed in a server alongside the main hawtio-web application.
+dispatch-plugin.war is a standalone [hawtio](http://hawt.io/) plugin that can be deployed in a server alongside the main hawtio-web application.
The project creates a war file that can be deployed in various application services and is also OSGi-ified so it deploys nicely into Apache Karaf.
@@ -17,14 +17,14 @@ The dispatch-plugin.war file is pre-built and can be installed alongside the haw
$ mvn clean install
-The dispatch-plugin-1.4.60.war file should now be in the target directory.
+The dispatch-plugin-<version>.war file should now be in the target directory.
## Apache Tomcat installation
-Copy the dispatch-plugin-1.4.60.war file as the following name
+Copy the dispatch-plugin-<version>.war file as the following name
dispatch-plugin.war
-to the deploy directory of Apache Tomcat or similar Java web container. Ensure the hawtio.war file is present in the same directory. Point a browser at http://\<tomcathost:post\>/hawtio
+to the deploy directory of Apache Tomcat or similar Java web container. Ensure the hawtio.war file is present in the same directory. Point a browser at http://\<tomcat-host:port\>/hawtio
Dispatch Router should be available as a tab in the console.
## Connecting to a router
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/532c8974/console/hawtio/pom.xml
----------------------------------------------------------------------
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index dce200d..27dd354 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -12,14 +12,24 @@
<artifactId>dispatch-plugin</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>${project.artifactId}</name>
<inceptionYear>2016</inceptionYear>
<url>https://qpid.apache.org</url>
<description>
- hawtio :: hawtio Dispatch plugin
+ Qpid Dispatch hawtio console plugin
</description>
+ <issueManagement>
+ <url>https://issues.apache.org/jira/browse/DISPATCH</url>
+ <system>JIRA</system>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/qpid-dispatch.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git</url>
+ </scm>
+
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
@@ -39,15 +49,15 @@
string -->
<plugin-domain />
- <!-- the hawtio version to build against -->
+ <!-- dependency versions -->
<hawtio-version>1.4.60</hawtio-version>
- <!-- properties from hawtio pom @ https://repo1.maven.org/maven2/io/hawt/project/1.4.60/project-1.4.60.pom -->
- <servlet-api-version>2.5</servlet-api-version>
+ <geronimo-servlet-2-5-spec-version>1.2</geronimo-servlet-2-5-spec-version>
<slf4j-version>1.7.13</slf4j-version>
+
+ <!-- plugin versions -->
<maven-antrun-plugin-version>1.7</maven-antrun-plugin-version>
- <maven-resources-plugin-version>2.6</maven-resources-plugin-version>
<maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
- <war-plugin-version>2.1.1</war-plugin-version>
+
<webapp-dir>${project.artifactId}-${project.version}</webapp-dir>
<webapp-outdir>${basedir}/target/${webapp-dir}</webapp-outdir>
@@ -57,6 +67,9 @@
javax.servlet,
*;resolution:=optional
</dispatch.osgi.import>
+
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
@@ -70,14 +83,6 @@
<version>${hawtio-version}</version>
</dependency>
- <!-- servlet API is provided by the container -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api-version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -90,10 +95,12 @@
<version>${slf4j-version}</version>
</dependency>
+ <!-- servlet API is provided by the container -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <version>${geronimo-servlet-2-5-spec-version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -167,7 +174,6 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin-version}</version>
<executions>
<execution>
<!-- defining this maven plugin in the same phase as the
@@ -236,7 +242,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>${war-plugin-version}</version>
<configuration>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>**/classes/OSGI-INF/**</packagingExcludes>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org