activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593313 - in /activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool: AmqCppClassesGenerator.java AmqCppMarshallingClassesGenerator.java
Date Thu, 08 Nov 2007 21:09:34 GMT
Author: tabish
Date: Thu Nov  8 13:09:34 2007
New Revision: 593313

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

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

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java?rev=593313&r1=593312&r2=593313&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java
Thu Nov  8 13:09:34 2007
@@ -153,7 +153,8 @@
     protected void generateFile(PrintWriter out) throws Exception {
         generateLicence(out);
 out.println("#include <activemq/connector/openwire/commands/"+className+".h>");
-out.println("#include <activemq/exceptions/NullPointerException.h>");
+out.println("#include <activemq/exceptions/ActiveMQException.h>");
+out.println("#include <decaf/lang/exceptions/NullPointerException.h>");
 out.println("");
 out.println("using namespace std;");
 out.println("using namespace activemq;");
@@ -161,6 +162,7 @@
 out.println("using namespace activemq::connector;");
 out.println("using namespace activemq::connector::openwire;");
 out.println("using namespace activemq::connector::openwire::commands;");
+out.println("using namespace decaf::lang::exceptions;");
 out.println("");
 out.println("/*");
 out.println(" *");
@@ -244,7 +246,7 @@
 out.println("");
 out.println("    if( srcPtr == NULL || src == NULL ) {");
 out.println("    ");
-out.println("        throw exceptions::NullPointerException(");
+out.println("        throw decaf::lang::exceptions::NullPointerException(");
 out.println("            __FILE__, __LINE__,");
 out.println("            \""+className+"::copyDataStructure - src is NULL or invalid\" );");
 out.println("    }");

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=593313&r1=593312&r2=593313&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
Thu Nov  8 13:09:34 2007
@@ -491,13 +491,14 @@
 out.println("");
 out.println("using namespace std;");
 out.println("using namespace activemq;");
-out.println("using namespace activemq::io;");
 out.println("using namespace activemq::connector;");
 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::utils;");
 out.println("using namespace activemq::connector::openwire::marshal::v"+getOpenwireVersion()+";");
+out.println("using namespace decaf;");
+out.println("using namespace decaf::io;");
 out.println("");
 
     String typeName = jclass.getSimpleName().toUpperCase();
@@ -574,9 +575,9 @@
 out.println("");
 out.println("        return rc + "+baseSize+";");
 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("///////////////////////////////////////////////////////////////////////////////");



Mime
View raw message