You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2006/11/11 17:30:27 UTC
svn commit: r473748 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts:
AmqCppMarshallingClassesGenerator.java AmqCppMarshallingHeadersGenerator.java
Author: tabish
Date: Sat Nov 11 08:30:26 2006
New Revision: 473748
URL: http://svn.apache.org/viewvc?view=rev&rev=473748
Log:
Updates for planned Openwire Support
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingClassesGenerator.java
incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingHeadersGenerator.java
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingClassesGenerator.java?view=diff&rev=473748&r1=473747&r2=473748
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingClassesGenerator.java (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingClassesGenerator.java Sat Nov 11 08:30:26 2006
@@ -432,7 +432,7 @@
out.println("using namespace activemq::connector::openwire;");
out.println("using namespace activemq::connector::openwire::commands;");
out.println("using namespace activemq::connector::openwire::marshal;");
-out.println("using namespace activemq::connector::openwire::util;");
+out.println("using namespace activemq::connector::openwire::utils;");
out.println("using namespace activemq::connector::openwire::marshal::v"+getOpenwireVersion()+";");
out.println("");
@@ -452,7 +452,7 @@
}
out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {");
+out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){");
out.println(" "+baseClass+"::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );");
out.println("");
@@ -479,7 +479,7 @@
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("int "+className+"::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {");
+out.println("int "+className+"::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){");
out.println("");
if( !properties.isEmpty() ) {
@@ -501,7 +501,7 @@
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {");
+out.println("void "+className+"::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){");
out.println("");
out.println(" "+baseClass+"::tightMarshal2( wireFormat, dataStructure, dataOut, bs );");
out.println("");
@@ -520,7 +520,7 @@
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {");
+out.println("void "+className+"::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){");
out.println(" "+baseClass+"::looseUnmarshal( wireFormat, dataStructure, dataIn );");
if( !properties.isEmpty() || marshallerAware ) {
@@ -541,7 +541,7 @@
out.println("}");
out.println("");
out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {");
+out.println("void "+className+"::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){");
if( !properties.isEmpty() || marshallerAware ) {
out.println(" "+jclass.getSimpleName()+"* info =");
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingHeadersGenerator.java?view=diff&rev=473748&r1=473747&r2=473748
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingHeadersGenerator.java (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppMarshallingHeadersGenerator.java Sat Nov 11 08:30:26 2006
@@ -72,13 +72,20 @@
out.println("#pragma warning( disable : 4290 )");
out.println("#endif");
out.println("");
-out.println("#include <activemq/connector/openwire/marshal/V"+getOpenwireVersion()+"/"+baseClass+".h>");
+
+ if( baseClass.equals("BaseDataStreamMarshaller") ) {
+ out.println("#include <activemq/connector/openwire/marshal/"+baseClass+".h>");
+ } else {
+ out.println("#include <activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+baseClass+".h>");
+ }
+
out.println("");
out.println("#include <activemq/io/DataInputStream.h>");
out.println("#include <activemq/io/DataOutputStream.h>");
out.println("#include <activemq/io/IOException.h>");
+out.println("#include <activemq/connector/openwire/OpenWireFormat.h>");
out.println("#include <activemq/connector/openwire/commands/DataStructure.h>");
-out.println("#include <activemq/connector/openwire/util/BooleanStream.h>");
+out.println("#include <activemq/connector/openwire/utils/BooleanStream.h>");
out.println("");
out.println("namespace activemq{");
out.println("namespace connector{");
@@ -104,7 +111,7 @@
out.println(" * Creates a new instance of this marshalable type.");
out.println(" * @return new DataStructure object pointer caller owns it.");
out.println(" */");
-out.println(" virtual DataStructure* createObject() const;");
+out.println(" virtual commands::DataStructure* createObject() const;");
out.println("");
out.println(" /**");
out.println(" * Get the Data Structure Type that identifies this Marshaller");
@@ -122,7 +129,7 @@
out.println(" virtual void tightUnmarshal( OpenWireFormat* wireFormat,");
out.println(" commands::DataStructure* dataStructure,");
out.println(" io::DataInputStream* dataIn,");
-out.println(" util::BooleanStream* bs ) throws( io::IOException );");
+out.println(" utils::BooleanStream* bs ) throw( io::IOException );");
out.println("");
out.println(" /**");
out.println(" * Write the booleans that this object uses to a BooleanStream");
@@ -133,7 +140,7 @@
out.println(" */");
out.println(" virtual int tightMarshal1( OpenWireFormat* wireFormat,");
out.println(" commands::DataStructure* dataStructure,");
-out.println(" BooleanStream* bs ) throws( io::IOException );");
+out.println(" utils::BooleanStream* bs ) throw( io::IOException );");
out.println("");
out.println(" /**");
out.println(" * Write a object instance to data output stream");
@@ -145,7 +152,7 @@
out.println(" virtual void tightMarshal2( OpenWireFormat* wireFormat,");
out.println(" commands::DataStructure* dataStructure,");
out.println(" io::DataOutputStream* dataOut,");
-out.println(" BooleanStream* bs ) throws( io::IOException );");
+out.println(" utils::BooleanStream* bs ) throw( io::IOException );");
out.println("");
out.println(" /**");
out.println(" * Un-marshal an object instance from the data input stream");
@@ -155,7 +162,7 @@
out.println(" */");
out.println(" virtual void looseUnmarshal( OpenWireFormat* wireFormat,");
out.println(" commands::DataStructure* dataStructure,");
-out.println(" io::DataInputStream* dataIn ) throws( io::IOException );");
+out.println(" io::DataInputStream* dataIn ) throw( io::IOException );");
out.println("");
out.println(" /**");
out.println(" * Write a object instance to data output stream");
@@ -165,7 +172,7 @@
out.println(" */");
out.println(" virtual void looseMarshal( OpenWireFormat* wireFormat,");
out.println(" commands::DataStructure* dataStructure,");
-out.println(" io::DataOutputStream* dataOut ) throws( io::IOException );");
+out.println(" io::DataOutputStream* dataOut ) throw( io::IOException );");
out.println("");
out.println(" };");
out.println("");