svn commit: r515862 - in /activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts: AmqCppTestMarshallingClassesGenerator.java AmqCppTestMarshallingHeadersGenerator.java

[ta...@apache.org]

Author: tabish
Date: Wed Mar  7 16:19:39 2007
New Revision: 515862

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

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingClassesGenerator.java
    activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingHeadersGenerator.java

Modified: activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingClassesGenerator.java?view=diff&rev=515862&r1=515861&r2=515862
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingClassesGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingClassesGenerator.java Wed Mar  7 16:19:39 2007
@@ -49,6 +49,12 @@
 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("//");
 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");
@@ -68,6 +74,8 @@
 out.println("///////////////////////////////////////////////////////////////////////////////");
 out.println("void "+className+"::test() {");
 out.println("");
+out.println("    "+ super.getClassName() + " myMarshaller;");
+out.println("    "+ jclass.getSimpleName() + " myCommand;");
 out.println("}");
     }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingHeadersGenerator.java?view=diff&rev=515862&r1=515861&r2=515862
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingHeadersGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/openwire-scripts/AmqCppTestMarshallingHeadersGenerator.java Wed Mar  7 16:19:39 2007
@@ -30,7 +30,17 @@
 
     protected String targetDir="./src/main";
 
+    protected void processClass(JClass jclass) {
+
+        if( isAbstractClass() ) {
+            return;
+        }
+
+        super.processClass( jclass );
+    }
+
     public Object run() {
+
         filePostFix = getFilePostFix();
         if (destDir == null) {
             destDir = new File(targetDir+"/activemq/connector/openwire/marshal/v"+getOpenwireVersion());
@@ -111,10 +121,6 @@
     protected void generateFile(PrintWriter out) throws Exception {
         generateLicence(out);
 
-        if( isAbstractClass() ) {
-            return;
-        }
-
 out.println("");
 out.println("#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
 out.println("#define _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
@@ -124,13 +130,6 @@
 out.println("#pragma warning( disable : 4290 )");
 out.println("#endif");
 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("");
 out.println("#include <cppunit/TestFixture.h>");
 out.println("#include <cppunit/extensions/HelperMacros.h>");
 out.println("");
@@ -147,8 +146,7 @@
 out.println("     *         if you need to make a change, please see the Java Classes");
 out.println("     *         in the activemq-openwire-generator module");
 out.println("     */");
-out.println("    class "+className+" : public CppUnit::TestFixture" );
-out.println("    {");
+out.println("    class "+className+" : public CppUnit::TestFixture {" );
 out.println("");
 out.println("        CPPUNIT_TEST_SUITE( "+className+" );");
 out.println("        CPPUNIT_TEST( test );");