activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593537 - in /activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool: AmqCppMarshallingClassesGenerator.java AmqCppMarshallingHeadersGenerator.java AmqCppTestMarshallingClassesGenerator.java
Date Fri, 09 Nov 2007 14:30:34 GMT
Author: tabish
Date: Fri Nov  9 06:30:33 2007
New Revision: 593537

URL: http://svn.apache.org/viewvc?rev=593537&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingHeadersGenerator.java
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingClassesGenerator.java

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java?rev=593537&r1=593536&r2=593537&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java
Fri Nov  9 06:30:33 2007
@@ -517,7 +517,7 @@
     }
 
 out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {");
+out.println("void "+className+"::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException
) {");
 out.println("");
 out.println("    try {");
 out.println("");
@@ -546,13 +546,13 @@
     }
 
 out.println("    }");
-out.println("    AMQ_CATCH_RETHROW( io::IOException )" );
-out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException
)" );
-out.println("    AMQ_CATCHALL_THROW( io::IOException )" );
+out.println("    AMQ_CATCH_RETHROW( decaf::io::IOException )" );
+out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)" );
+out.println("    AMQ_CATCHALL_THROW( decaf::io::IOException )" );
 out.println("}");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("int "+className+"::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {");
+out.println("int "+className+"::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {");
 out.println("");
 out.println("    try {");
 out.println("");
@@ -575,13 +575,13 @@
 out.println("");
 out.println("        return rc + "+baseSize+";");
 out.println("    }");
-out.println("    AMQ_CATCH_RETHROW( decaf::io::IOException )" );
-out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)" );
-out.println("    AMQ_CATCHALL_THROW( decaf::io::IOException )" );
+out.println("    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )" );
+out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException
)" );
+out.println("    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )" );
 out.println("}");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {");
+out.println("void "+className+"::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException
) {");
 out.println("");
 out.println("    try {");
 out.println("");
@@ -601,13 +601,13 @@
     }
 
 out.println("    }");
-out.println("    AMQ_CATCH_RETHROW( io::IOException )" );
-out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException
)" );
-out.println("    AMQ_CATCHALL_THROW( io::IOException )" );
+out.println("    AMQ_CATCH_RETHROW( decaf::io::IOException )" );
+out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)" );
+out.println("    AMQ_CATCHALL_THROW( decaf::io::IOException )" );
 out.println("}");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {");
+out.println("void "+className+"::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {");
 out.println("");
 out.println("    try {");
 out.println("");
@@ -630,13 +630,13 @@
     }
 
 out.println("    }");
-out.println("    AMQ_CATCH_RETHROW( io::IOException )" );
-out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException
)" );
-out.println("    AMQ_CATCHALL_THROW( io::IOException )" );
+out.println("    AMQ_CATCH_RETHROW( decaf::io::IOException )" );
+out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)" );
+out.println("    AMQ_CATCHALL_THROW( decaf::io::IOException )" );
 out.println("}");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
-out.println("void "+className+"::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {");
+out.println("void "+className+"::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {");
 out.println("");
 out.println("    try {");
 out.println("");
@@ -661,9 +661,9 @@
     }
 
 out.println("    }");
-out.println("    AMQ_CATCH_RETHROW( io::IOException )" );
-out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException
)" );
-out.println("    AMQ_CATCHALL_THROW( io::IOException )" );
+out.println("    AMQ_CATCH_RETHROW( decaf::io::IOException )" );
+out.println("    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)" );
+out.println("    AMQ_CATCHALL_THROW( decaf::io::IOException )" );
 out.println("}");
 out.println("");
 }

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingHeadersGenerator.java?rev=593537&r1=593536&r2=593537&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingHeadersGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingHeadersGenerator.java
Fri Nov  9 06:30:33 2007
@@ -171,9 +171,9 @@
     }
 
 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 <decaf/io/DataInputStream.h>");
+out.println("#include <decaf/io/DataOutputStream.h>");
+out.println("#include <decaf/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/utils/BooleanStream.h>");
@@ -223,7 +223,7 @@
 out.println("         */");
 out.println("        virtual void tightUnmarshal( OpenWireFormat* wireFormat,");
 out.println("                                     commands::DataStructure* dataStructure,");
-out.println("                                     io::DataInputStream* dataIn,");
+out.println("                                     decaf::io::DataInputStream* dataIn,");
 out.println("                                     utils::BooleanStream* bs ) throw( io::IOException
);");
 out.println("");
 out.println("        /**");
@@ -246,7 +246,7 @@
 out.println("         */");
 out.println("        virtual void tightMarshal2( OpenWireFormat* wireFormat,");
 out.println("                                    commands::DataStructure* dataStructure,");
-out.println("                                    io::DataOutputStream* dataOut,");
+out.println("                                    decaf::io::DataOutputStream* dataOut,");
 out.println("                                    utils::BooleanStream* bs ) throw( io::IOException
);");
 out.println("");
 out.println("        /**");
@@ -257,7 +257,7 @@
 out.println("         */");
 out.println("        virtual void looseUnmarshal( OpenWireFormat* wireFormat,");
 out.println("                                     commands::DataStructure* dataStructure,");
-out.println("                                     io::DataInputStream* dataIn ) throw( io::IOException
);");
+out.println("                                     decaf::io::DataInputStream* dataIn ) throw(
io::IOException );");
 out.println("");
 out.println("        /**");
 out.println("         * Write a object instance to data output stream");
@@ -267,7 +267,7 @@
 out.println("         */");
 out.println("        virtual void looseMarshal( OpenWireFormat* wireFormat,");
 out.println("                                   commands::DataStructure* dataStructure,");
-out.println("                                   io::DataOutputStream* dataOut ) throw( io::IOException
);");
+out.println("                                   decaf::io::DataOutputStream* dataOut ) throw(
io::IOException );");
 out.println("");
 out.println("    };");
 out.println("");

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingClassesGenerator.java?rev=593537&r1=593536&r2=593537&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingClassesGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingClassesGenerator.java
Fri Nov  9 06:30:33 2007
@@ -50,15 +50,15 @@
 out.println("");
 out.println("CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v"+getOpenwireVersion()+"::"+className+"
);");
 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/utils/BooleanStream.h>");
-out.println("#include <activemq/io/ByteArrayOutputStream.h>");
-out.println("#include <activemq/io/ByteArrayInputStream.h>");
-out.println("#include <activemq/util/Properties.h>");
+out.println("#include <decaf/io/DataInputStream.h>");
+out.println("#include <decaf/io/DataOutputStream.h>");
+out.println("#include <decaf/io/IOException.h>");
+out.println("#include <decaf/io/ByteArrayOutputStream.h>");
+out.println("#include <decaf/io/ByteArrayInputStream.h>");
+out.println("#include <decaf/util/Properties.h>");
 out.println("//");
 out.println("//     NOTE!: This file is autogenerated - do not modify!");
 out.println("//            if you need to make a change, please see the Java Classes in the");
@@ -67,7 +67,6 @@
 out.println("");
 out.println("using namespace std;");
 out.println("using namespace activemq;");
-out.println("using namespace activemq::io;");
 out.println("using namespace activemq::util;");
 out.println("using namespace activemq::exceptions;");
 out.println("using namespace activemq::connector;");
@@ -76,6 +75,9 @@
 out.println("using namespace activemq::connector::openwire::marshal;");
 out.println("using namespace activemq::connector::openwire::utils;");
 out.println("using namespace activemq::connector::openwire::marshal::v"+getOpenwireVersion()+";");
+out.println("using namespace decaf::io;");
+out.println("using namespace decaf::lang;");
+out.println("using namespace decaf::util;");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
 out.println("void "+className+"::test() {");



Mime
View raw message