From commits-return-13442-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Mon Apr 05 15:48:12 2010 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 24129 invoked from network); 5 Apr 2010 15:48:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Apr 2010 15:48:12 -0000 Received: (qmail 85893 invoked by uid 500); 5 Apr 2010 15:48:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 85873 invoked by uid 500); 5 Apr 2010 15:48:12 -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 85866 invoked by uid 99); 5 Apr 2010 15:48:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Apr 2010 15:48:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Apr 2010 15:48:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 423512388978; Mon, 5 Apr 2010 15:47:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r930885 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator: ./ src/main/java/org/apache/activemq/nms/openwire/tool/commands/ Date: Mon, 05 Apr 2010 15:47:49 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100405154749.423512388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Apr 5 15:47:48 2010 New Revision: 930885 URL: http://svn.apache.org/viewvc?rev=930885&view=rev Log: https://issues.apache.org/activemq/browse/AMQNET-246 Fix the generated code to use correct interfaces. Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/pom.xml activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandCodeGenerator.java activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandGenerator.java Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/pom.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/pom.xml?rev=930885&r1=930884&r2=930885&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/pom.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/pom.xml Mon Apr 5 15:47:48 2010 @@ -61,7 +61,7 @@ - 5.3.0 + 5.3.1 Apache NMS.ActiveMQ 0.1.0 1.6.2 Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandCodeGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandCodeGenerator.java?rev=930885&r1=930884&r2=930885&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandCodeGenerator.java (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandCodeGenerator.java Mon Apr 5 15:47:48 2010 @@ -145,6 +145,12 @@ public abstract class CommandCodeGenerat else if( name.equals("ByteSequence") ) { return "byte[]"; } + else if( name.equals("Comparable") ) { + return null; + } + else if( name.equals("MarshallAware") ) { + return null; + } else if( name.equals("boolean") ) { return "bool"; } Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandGenerator.java?rev=930885&r1=930884&r2=930885&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandGenerator.java (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ.Openwire.Generator/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandGenerator.java Mon Apr 5 15:47:48 2010 @@ -86,6 +86,15 @@ public class CommandGenerator extends Mu generator.setOpenWireOpCode( getOpenWireOpCode(getJclass()) ); generator.setComparable( className.endsWith("Id") || generator.isComparable() ); + for (int i = 0; i < getJclass().getInterfaces().length; i++) { + JClass intf = getJclass().getInterfaces()[i]; + + String name = generator.toCSharpType( intf ); + if( name != null && !name.endsWith("DataStructure") && !name.equals("Command") ) { + generator.addAdditionalBase( name ); + } + } + PrintWriter out = null; try { out = new PrintWriter(new FileWriter(headerFile));