You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/05/04 19:16:18 UTC
qpid-dispatch git commit: DISPATCH-201: changed parent, version,
and some properties in pom.xml. Updated README.md build/install
instructions
Repository: qpid-dispatch
Updated Branches:
refs/heads/master b5370187e -> 71947c2c8
DISPATCH-201: changed parent, version, and some properties in pom.xml. Updated README.md build/install instructions
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/71947c2c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/71947c2c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/71947c2c
Branch: refs/heads/master
Commit: 71947c2c8a42e1b724b57b9583f30ea8a96bdd17
Parents: b537018
Author: Ernest Allen <ea...@redhat.com>
Authored: Wed May 4 15:15:53 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Wed May 4 15:15:53 2016 -0400
----------------------------------------------------------------------
console/hawtio/README.md | 37 ++++++-------------------
console/hawtio/pom.xml | 63 ++++++++++++++++++++++++++++---------------
2 files changed, 50 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71947c2c/console/hawtio/README.md
----------------------------------------------------------------------
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index 206400c..ffc255d 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -11,29 +11,11 @@ The fastest way to use the console is to run the [docker image](https://hub.dock
## Building
The dispatch-plugin.war file is pre-built and can be installed alongside the hawtio.war on any system with a modern java installation. If you want to build the dispatch-plugin.war from source:
-- clone the hawtio git repo
-
- $ git clone https://github.com/hawtio/hawtio.git
-
-- build hawtio
-
- $ cd hawtio
-
- $ mvn clean install
-
- If you encounter any errors when building hawtio, visit [the hawtio build page](http://hawt.io/building/index.html) for help.
-
-- create a dispatch dir under the hawtio dir and copy the source code
-
- $ mkdir dispatch
-
- $ cp -r {dir where this file is located}/dispatch/* dispatch/
-
- do a maven build of dispatch
- $ cd dispach
+ $ cd console/hawtio
- $ mvn package
+ $ mvn clean install
The dispatch-plugin-1.4.60.war file should now be in the target directory.
@@ -51,16 +33,15 @@ On the Dispatch Router's console page, select the Connect sub tab. Enter the add
### Websockts to tcp proxy
-The console communicates to a router using Qpid Proton's [rhea](https://github.com/grs/rhea) javascript binding. When run from a browser, it uses websockets.
-The router communicates using tcp. Therefore a websockts/tcp proxy is required.
+The console communicates to a router using websockets.
+The router listens for tcp. Therefore a websockts/tcp proxy is required.
#### Manually running a python websockets/tcp proxy
A popular python based proxy is [websockify](https://github.com/kanaka/websockify). To use it:
- $ git clone https://github.com/kanaka/websockify.git
- $ cd websockify
- $ ./run 5673 0.0.0.0:20009 &
+ $ yum install python-websockify
+ $ websockify 5673 0.0.0.0:20009 &
In the above, websockify is listening for ws traffic on port 5673 and will proxy it to 0.0.0.0:20009. One of the routers will need a listener on the proxied port. An example router .conf file entry is:
@@ -78,9 +59,7 @@ You can automatically start the proxy program when a router starts. Add the list
console {
listener: ProxyListener
- proxy: /pathToWebsockify/run
- wsport: 5673
+ proxy: wobsockify
+ args: $host:5673 $host:$port
}
-The value for proxy: can be any program that has execute permission. The router will execute it and pass <wsport> <addr:port> as arguments.
-
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71947c2c/console/hawtio/pom.xml
----------------------------------------------------------------------
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index effdfb4..dce200d 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -1,25 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
- <groupId>io.hawt</groupId>
- <artifactId>project</artifactId>
- <version>1.4.60</version>
- </parent>
-<!--
- <parent>
- <groupId>io.hawt</groupId>
- <artifactId>hawtio-plugin-examples</artifactId>
- <version>1.4.60</version>
- <relativePath>..</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
</parent>
--->
<modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.qpid</groupId>
<artifactId>dispatch-plugin</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <packaging>war</packaging>
<name>${project.artifactId}</name>
- <description>hawtio :: hawtio Dispatch plugin</description>
+ <inceptionYear>2016</inceptionYear>
+ <url>https://qpid.apache.org</url>
- <!-- hawtio plugins are almost always war files -->
- <packaging>war</packaging>
+ <description>
+ hawtio :: hawtio Dispatch plugin
+ </description>
+
+ <prerequisites>
+ <maven>3.0.4</maven>
+ </prerequisites>
<properties>
<!-- filtered plugin properties, we don't define plugin-scripts here
@@ -36,12 +39,24 @@
string -->
<plugin-domain />
+ <!-- the hawtio version to build against -->
+ <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>
+ <slf4j-version>1.7.13</slf4j-version>
+ <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>
+
<!-- this lets this plugin deploy nicely into karaf, these get used
for the ImportPackage directive for maven-bundle-plugin -->
- <fuse.osgi.import>
+ <dispatch.osgi.import>
javax.servlet,
*;resolution:=optional
- </fuse.osgi.import>
+ </dispatch.osgi.import>
</properties>
<dependencies>
@@ -52,7 +67,7 @@
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-plugin-mbean</artifactId>
- <version>${project.version}</version>
+ <version>${hawtio-version}</version>
</dependency>
<!-- servlet API is provided by the container -->
@@ -75,6 +90,12 @@
<version>${slf4j-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ </dependency>
+
</dependencies>
<build>
@@ -193,10 +214,10 @@
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Export-Package>${fuse.osgi.export}</Export-Package>
- <Import-Package>${fuse.osgi.import}</Import-Package>
- <DynamicImport-Package>${fuse.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${fuse.osgi.private.pkg}</Private-Package>
+ <Export-Package>${dispatch.osgi.export}</Export-Package>
+ <Import-Package>${dispatch.osgi.import}</Import-Package>
+ <DynamicImport-Package>${dispatch.osgi.dynamic}</DynamicImport-Package>
+ <Private-Package>${dispatch.osgi.private.pkg}</Private-Package>
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org