Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D0E210D06 for ; Mon, 24 Feb 2014 23:59:43 +0000 (UTC) Received: (qmail 68686 invoked by uid 500); 24 Feb 2014 23:59:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 68628 invoked by uid 500); 24 Feb 2014 23:59:39 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 68618 invoked by uid 99); 24 Feb 2014 23:59:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 23:59:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3B6169251B0; Mon, 24 Feb 2014 23:59:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chirino@apache.org To: commits@activemq.apache.org Date: Mon, 24 Feb 2014 23:59:40 -0000 Message-Id: <2e1ca73933f841d7bc9ea515ee4e30f8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: More work improving the openwire generator. 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 Authored: Mon Feb 24 18:53:33 2014 -0500 Committer: Hiram Chirino 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.")