Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 14375 invoked from network); 28 Jun 2010 22:27:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Jun 2010 22:27:37 -0000 Received: (qmail 47765 invoked by uid 500); 28 Jun 2010 22:27:37 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 47728 invoked by uid 500); 28 Jun 2010 22:27:37 -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 47721 invoked by uid 99); 28 Jun 2010 22:27:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jun 2010 22:27:36 +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, 28 Jun 2010 22:27:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 87A9623889BB; Mon, 28 Jun 2010 22:26:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r958768 - in /activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool: commands/ marshallers/ Date: Mon, 28 Jun 2010 22:26:39 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100628222639.87A9623889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Jun 28 22:26:38 2010 New Revision: 958768 URL: http://svn.apache.org/viewvc?rev=958768&view=rev Log: Update the code generators to not add throw specifiers to the generated methods. Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageHeaderGenerator.java activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java Mon Jun 28 22:26:38 2010 @@ -159,8 +159,7 @@ public class CommandHeaderGenerator exte out.println(" * " ); out.println(" * @return a Response to the visitor being called or NULL if no response." ); out.println(" */" ); - out.println(" virtual Pointer visit( activemq::state::CommandVisitor* visitor )" ); - out.println(" throw( exceptions::ActiveMQException );" ); + out.println(" virtual Pointer visit( activemq::state::CommandVisitor* visitor );" ); out.println(""); } Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java Mon Jun 28 22:26:38 2010 @@ -177,8 +177,7 @@ public class CommandSourceGenerator exte if( getBaseClassName().equals( "BaseCommand" ) ) { out.println("////////////////////////////////////////////////////////////////////////////////"); - out.println("decaf::lang::Pointer "+getClassName()+"::visit( activemq::state::CommandVisitor* visitor ) "); - out.println(" throw( activemq::exceptions::ActiveMQException ) {"); + out.println("decaf::lang::Pointer "+getClassName()+"::visit( activemq::state::CommandVisitor* visitor ) {"); out.println(""); out.println(" return visitor->process"+getClassName()+"( this );"); out.println("}"); Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageHeaderGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageHeaderGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageHeaderGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageHeaderGenerator.java Mon Jun 28 22:26:38 2010 @@ -78,16 +78,14 @@ public class MessageHeaderGenerator exte out.println(" * wire"); out.println(" * @param wireFormat - the wireformat controller"); out.println(" */"); - out.println(" virtual void beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )"); - out.println(" throw ( decaf::io::IOException );"); + out.println(" virtual void beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED );"); out.println(""); out.println(" /**"); out.println(" * Called after unmarshaling is started to cleanup the object being"); out.println(" * unmarshaled."); out.println(" * @param wireFormat - the wireformat object to control unmarshaling"); out.println(" */"); - out.println(" virtual void afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )"); - out.println(" throw ( decaf::io::IOException );"); + out.println(" virtual void afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED );"); out.println(""); out.println(" /**"); out.println(" * Indicates that this command is aware of Marshaling, and needs"); Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageSourceGenerator.java Mon Jun 28 22:26:38 2010 @@ -111,8 +111,7 @@ public class MessageSourceGenerator exte out.println("}"); out.println(""); out.println("////////////////////////////////////////////////////////////////////////////////"); - out.println("void Message::beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )"); - out.println(" throw ( decaf::io::IOException ) {"); + out.println("void Message::beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED ) {"); out.println(""); out.println(" try{"); out.println(""); @@ -128,8 +127,7 @@ public class MessageSourceGenerator exte out.println("}"); out.println(""); out.println("////////////////////////////////////////////////////////////////////////////////"); - out.println("void Message::afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )"); - out.println(" throw ( decaf::io::IOException ) {"); + out.println("void Message::afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED ) {"); out.println(""); out.println(" try{"); out.println(""); Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java Mon Jun 28 22:26:38 2010 @@ -610,7 +610,7 @@ out.println(""); } out.println("///////////////////////////////////////////////////////////////////////////////"); -out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {"); +out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {"); out.println(""); out.println(" try {"); out.println(""); @@ -651,7 +651,7 @@ out.println(" AMQ_CATCHALL_THROW( dec out.println("}"); out.println(""); out.println("///////////////////////////////////////////////////////////////////////////////"); -out.println("int "+className+"::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {"); +out.println("int "+className+"::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {"); out.println(""); out.println(" try {"); out.println(""); @@ -686,7 +686,7 @@ out.println(" AMQ_CATCHALL_THROW( dec out.println("}"); out.println(""); out.println("///////////////////////////////////////////////////////////////////////////////"); -out.println("void "+className+"::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {"); +out.println("void "+className+"::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {"); out.println(""); out.println(" try {"); out.println(""); @@ -718,7 +718,7 @@ out.println(" AMQ_CATCHALL_THROW( dec out.println("}"); out.println(""); out.println("///////////////////////////////////////////////////////////////////////////////"); -out.println("void "+className+"::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {"); +out.println("void "+className+"::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {"); out.println(""); out.println(" try {"); out.println(""); @@ -753,7 +753,7 @@ out.println(" AMQ_CATCHALL_THROW( dec out.println("}"); out.println(""); out.println("///////////////////////////////////////////////////////////////////////////////"); -out.println("void "+className+"::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {"); +out.println("void "+className+"::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {"); out.println(""); out.println(" try {"); out.println(""); Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java?rev=958768&r1=958767&r2=958768&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java (original) +++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java Mon Jun 28 22:26:38 2010 @@ -266,90 +266,32 @@ out.println(""); if( !isAbstractClass() ) { -out.println(" /**"); -out.println(" * Creates a new instance of this marshalable type."); -out.println(" *"); -out.println(" * @return new DataStructure object pointer caller owns it."); -out.println(" */"); out.println(" virtual commands::DataStructure* createObject() const;"); out.println(""); -out.println(" /**"); -out.println(" * Get the Data Structure Type that identifies this Marshaler"); -out.println(" *"); -out.println(" * @return byte holding the data structure type value"); -out.println(" */"); out.println(" virtual unsigned char getDataStructureType() const;"); out.println(""); } -out.println(" /**"); -out.println(" * Un-marshal an object instance from the data input stream."); -out.println(" *"); -out.println(" * @param wireFormat - describes the wire format of the broker."); -out.println(" * @param dataStructure - Object to be un-marshaled."); -out.println(" * @param dataIn - BinaryReader that provides that data."); -out.println(" * @param bs - BooleanStream stream used to unpack bits from the wire."); -out.println(" *"); -out.println(" * @throws IOException if an error occurs during the unmarshal."); -out.println(" */"); out.println(" virtual void tightUnmarshal( OpenWireFormat* wireFormat,"); out.println(" commands::DataStructure* dataStructure,"); out.println(" decaf::io::DataInputStream* dataIn,"); -out.println(" utils::BooleanStream* bs ) throw( decaf::io::IOException );"); +out.println(" utils::BooleanStream* bs );"); out.println(""); -out.println(" /**"); -out.println(" * Write the booleans that this object uses to a BooleanStream"); -out.println(" *"); -out.println(" * @param wireFormat - describes the wire format of the broker"); -out.println(" * @param dataStructure - Object to be marshaled"); -out.println(" * @param bs - BooleanStream stream used to pack bits from the wire."); -out.println(" * @returns int value indicating the size of the marshaled object."); -out.println(" *"); -out.println(" * @throws IOException if an error occurs during the marshal."); -out.println(" */"); out.println(" virtual int tightMarshal1( OpenWireFormat* wireFormat,"); out.println(" commands::DataStructure* dataStructure,"); -out.println(" utils::BooleanStream* bs ) throw( decaf::io::IOException );"); +out.println(" utils::BooleanStream* bs );"); out.println(""); -out.println(" /**"); -out.println(" * Write a object instance to data output stream"); -out.println(" *"); -out.println(" * @param wireFormat - describes the wire format of the broker"); -out.println(" * @param dataStructure - Object to be marshaled"); -out.println(" * @param dataOut - BinaryReader that provides that data sink"); -out.println(" * @param bs - BooleanStream stream used to pack bits from the wire."); -out.println(" *"); -out.println(" * @throws IOException if an error occurs during the marshal."); -out.println(" */"); out.println(" virtual void tightMarshal2( OpenWireFormat* wireFormat,"); out.println(" commands::DataStructure* dataStructure,"); out.println(" decaf::io::DataOutputStream* dataOut,"); -out.println(" utils::BooleanStream* bs ) throw( decaf::io::IOException );"); +out.println(" utils::BooleanStream* bs );"); out.println(""); -out.println(" /**"); -out.println(" * Un-marshal an object instance from the data input stream"); -out.println(" *"); -out.println(" * @param wireFormat - describes the wire format of the broker"); -out.println(" * @param dataStructure - Object to be marshaled"); -out.println(" * @param dataIn - BinaryReader that provides that data source"); -out.println(" *"); -out.println(" * @throws IOException if an error occurs during the unmarshal."); -out.println(" */"); out.println(" virtual void looseUnmarshal( OpenWireFormat* wireFormat,"); out.println(" commands::DataStructure* dataStructure,"); -out.println(" decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );"); +out.println(" decaf::io::DataInputStream* dataIn );"); out.println(""); -out.println(" /**"); -out.println(" * Write a object instance to data output stream"); -out.println(" *"); -out.println(" * @param wireFormat - describs the wire format of the broker"); -out.println(" * @param dataStructure - Object to be marshaled"); -out.println(" * @param dataOut - BinaryWriter that provides that data sink"); -out.println(" *"); -out.println(" * @throws IOException if an error occurs during the marshal."); -out.println(" */"); out.println(" virtual void looseMarshal( OpenWireFormat* wireFormat,"); out.println(" commands::DataStructure* dataStructure,"); -out.println(" decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );"); +out.println(" decaf::io::DataOutputStream* dataOut );"); out.println(""); out.println(" };"); out.println("");