You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2014/02/25 00:59:39 UTC
[1/4] git commit: Add support for getting the intended host name from
the WireFormatInfo in openwire.
Repository: activemq-apollo
Updated Branches:
refs/heads/trunk 1637f4b51 -> 861d918d0
Add support for getting the intended host name from the WireFormatInfo in openwire.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/8013addc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/8013addc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/8013addc
Branch: refs/heads/trunk
Commit: 8013addc33ef16180e01a3c77334484c993bda06
Parents: bb366a2
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Mon Feb 24 18:54:00 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Mon Feb 24 18:54:07 2014 -0500
----------------------------------------------------------------------
.../activemq/apollo/openwire/command/WireFormatInfo.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/8013addc/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/WireFormatInfo.java
----------------------------------------------------------------------
diff --git a/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/WireFormatInfo.java b/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/WireFormatInfo.java
index c368dec..b1d3107 100644
--- a/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/WireFormatInfo.java
+++ b/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/WireFormatInfo.java
@@ -29,6 +29,7 @@ import org.apache.activemq.apollo.openwire.support.MarshallingSupport;
import org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtbuf.ByteArrayInputStream;
import org.fusesource.hawtbuf.ByteArrayOutputStream;
+import org.fusesource.hawtbuf.UTF8Buffer;
/**
* @openwire:marshaller code="1"
@@ -332,4 +333,12 @@ public class WireFormatInfo implements Command, MarshallAware {
public boolean isShutdownInfo() {
return false;
}
+
+ public String getHost() throws IOException {
+ return (String) getProperty("Host");
+ }
+
+ public void setHost(String hostname) throws IOException {
+ setProperty("Host", hostname);
+ }
}
[3/4] git commit: Support configuring the package names in the
openwire generator standalone app.
Posted by ch...@apache.org.
Support configuring the package names in the openwire generator standalone app.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/22025b7c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/22025b7c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/22025b7c
Branch: refs/heads/trunk
Commit: 22025b7cfdd3385103c09203985d736c31366355
Parents: 1637f4b
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Mon Feb 24 09:45:46 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Mon Feb 24 18:54:07 2014 -0500
----------------------------------------------------------------------
.../activemq/apollo/openwire/generator/GeneratorTask.scala | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/22025b7c/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
----------------------------------------------------------------------
diff --git a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
index 62017ea..d2d0cf9 100644
--- a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
+++ b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
@@ -49,6 +49,12 @@ object GeneratorTask {
if (args.length > 2) {
generator.targetDir = new File(args(2))
}
+ if (args.length > 3) {
+ generator.packagePrefix = args(3)
+ }
+ if (args.length > 4) {
+ generator.commandPackage = args(4)
+ }
generator.execute
}
}
[4/4] git commit: Pickup new releases of dependencies.
Posted by ch...@apache.org.
Pickup new releases of dependencies.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/861d918d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/861d918d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/861d918d
Branch: refs/heads/trunk
Commit: 861d918d0a86d69a24efabea5795ba787cb054c2
Parents: 8013add
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Mon Feb 24 18:59:06 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Mon Feb 24 18:59:06 2014 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/861d918d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88af467..5eeeb17 100755
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<rome-version>0.8</rome-version>
<slf4j-version>1.6.1</slf4j-version>
- <mqtt-client-version>1.7</mqtt-client-version>
+ <mqtt-client-version>1.9</mqtt-client-version>
<jaxb-api-version>2.1</jaxb-api-version>
<jaxb-version>2.1.6</jaxb-version>
@@ -98,7 +98,7 @@
<felix-version>1.0.0</felix-version>
<hawtdispatch-version>1.20</hawtdispatch-version>
- <hawtbuf-version>1.9</hawtbuf-version>
+ <hawtbuf-version>1.10</hawtbuf-version>
<stompjms-version>1.18</stompjms-version>
<bdb-version>5.0.34</bdb-version>
[2/4] git commit: More work improving the openwire generator.
Posted by ch...@apache.org.
More work improving the openwire generator.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/bb366a22
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/bb366a22
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/bb366a22
Branch: refs/heads/trunk
Commit: bb366a2217dabef2f8d2a38646c193ada91fe146
Parents: 22025b7
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Mon Feb 24 18:53:33 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Mon Feb 24 18:54:07 2014 -0500
----------------------------------------------------------------------
.../apollo/openwire/generator/ApolloMarshallingGenerator.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/bb366a22/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
----------------------------------------------------------------------
diff --git a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
index 36570ec..6467076 100644
--- a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
+++ b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
@@ -298,10 +298,10 @@ class ApolloMarshallingGenerator extends MultiSourceGenerator {
protected def generateFactory(out: PrintWriter): Unit = {
generateLicence(out)
out.println("")
- out.println("package org.apache.activemq.apollo.openwire.codec.v" + getOpenwireVersion + ";")
+ out.println("package "+packagePrefix+".v" + getOpenwireVersion + ";")
out.println("")
- out.println("import org.apache.activemq.apollo.openwire.codec.DataStreamMarshaller;")
- out.println("import org.apache.activemq.apollo.openwire.codec.OpenWireFormat;")
+ out.println("import "+packagePrefix+".DataStreamMarshaller;")
+ out.println("import "+packagePrefix+".OpenWireFormat;")
out.println("")
out.println("/**")
out.println(" * MarshallerFactory for Open Wire Format.")