activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r733207 - /activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/
Date Sat, 10 Jan 2009 00:49:56 GMT
Author: tabish
Date: Fri Jan  9 16:49:55 2009
New Revision: 733207

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

Updated Code Generator to reflect changes in 3.0

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/AmqCppGeneratorTask.java
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
    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
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingHeadersGenerator.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=733207&r1=733206&r2=733207&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
Fri Jan  9 16:49:55 2009
@@ -43,7 +43,7 @@
         filePostFix = getFilePostFix();
         if (destDir == null) {
             destDir = new File(
-                targetDir+"/activemq/connector/openwire/commands");
+                targetDir+"/activemq/commands");
         }
 
         return super.run();
@@ -152,16 +152,14 @@
 
     protected void generateFile(PrintWriter out) throws Exception {
         generateLicence(out);
-out.println("#include <activemq/connector/openwire/commands/"+className+".h>");
+out.println("#include <activemq/commands/"+className+".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;");
 out.println("using namespace activemq::exceptions;");
-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::commands;");
 out.println("using namespace decaf::lang::exceptions;");
 out.println("");
 out.println("/*");

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java?rev=733207&r1=733206&r2=733207&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java
Fri Jan  9 16:49:55 2009
@@ -119,19 +119,19 @@
             }
             {
                 AmqCppMakefileGenerator script = new AmqCppMakefileGenerator(
-                    "activemq/connector/openwire/commands" );
+                    "activemq/commands" );
                 script.setTargetDir(target+"/src/main");
                 script.run();
             }
             {
                 AmqCppMakefileGenerator script = new AmqCppMakefileGenerator(
-                    "activemq/connector/openwire/marshal/v" + version );
+                    "activemq/wireformat/openwire/marshal/v" + version );
                 script.setTargetDir(target+"/src/main");
                 script.run();
             }
             {
                 AmqCppMakefileGenerator script = new AmqCppMakefileGenerator(
-                    "activemq/connector/openwire/marshal/v" + version );
+                    "activemq/wireformat/openwire/marshal/v" + version );
                 script.setTargetDir(target+"/src/test");
                 script.run();
             }

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java?rev=733207&r1=733206&r2=733207&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
Fri Jan  9 16:49:55 2009
@@ -39,8 +39,8 @@
         generateLicence(out);
 
 out.println("");
-out.println("#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_"+className.toUpperCase()+"_H_");
-out.println("#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_"+className.toUpperCase()+"_H_");
+out.println("#ifndef _ACTIVEMQ_COMMANDS_"+className.toUpperCase()+"_H_");
+out.println("#define _ACTIVEMQ_COMMANDS_"+className.toUpperCase()+"_H_");
 out.println("");
 out.println("// Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -48,7 +48,7 @@
 out.println("#endif");
 out.println("");
 out.println("#include <activemq/util/Config.h>");
-out.println("#include <activemq/connector/openwire/commands/"+baseClass+".h>");
+out.println("#include <activemq/commands/"+baseClass+".h>");
 
 List properties = getProperties();
 for (Iterator iter = properties.iterator(); iter.hasNext();) {
@@ -68,7 +68,7 @@
             includeName = includeName.substring(12, includeName.length()-2);
         }
 
-        out.println("#include <activemq/connector/openwire/commands/"+includeName+".h>");
+        out.println("#include <activemq/commands/"+includeName+".h>");
     }
 }
 
@@ -76,8 +76,6 @@
 out.println("#include <string>");
 out.println("");
 out.println("namespace activemq{");
-out.println("namespace connector{");
-out.println("namespace openwire{");
 out.println("namespace commands{");
 out.println("");
 out.println("    /*");
@@ -213,9 +211,9 @@
 
 out.println("    };");
 out.println("");
-out.println("}}}}");
+out.println("}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_"+className.toUpperCase()+"_H_*/");
+out.println("#endif /*_ACTIVEMQ_COMMANDS_"+className.toUpperCase()+"_H_*/");
 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=733207&r1=733206&r2=733207&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 Jan  9 16:49:55 2009
@@ -479,9 +479,9 @@
         generateLicence(out);
 
 out.println("");
-out.println("#include <activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+className+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+className+".h>");
 out.println("");
-out.println("#include <activemq/connector/openwire/commands/"+jclass.getSimpleName()+".h>");
+out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
 out.println("#include <activemq/exceptions/ActiveMQException.h>");
 out.println("");
 out.println("//");
@@ -493,12 +493,12 @@
 out.println("using namespace std;");
 out.println("using namespace activemq;");
 out.println("using namespace activemq::exceptions;");
-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 activemq::commands;");
+out.println("using namespace activemq::wireformat;");
+out.println("using namespace activemq::wireformat::openwire;");
+out.println("using namespace activemq::wireformat::openwire::marshal;");
+out.println("using namespace activemq::wireformat::openwire::utils;");
+out.println("using namespace activemq::wireformat::openwire::marshal::v"+getOpenwireVersion()+";");
 out.println("using namespace decaf;");
 out.println("using namespace decaf::io;");
 out.println("");
@@ -701,10 +701,10 @@
 out.println(" */");
 out.println("");
 out.println("using namespace activemq;");
-out.println("using namespace activemq::connector;");
-out.println("using namespace activemq::connector::openwire;");
-out.println("using namespace activemq::connector::openwire::marshal;");
-out.println("using namespace activemq::connector::openwire::marshal::v"+getOpenwireVersion()+";");
+out.println("using namespace activemq::wireformat;");
+out.println("using namespace activemq::wireformat::openwire;");
+out.println("using namespace activemq::wireformat::openwire::marshal;");
+out.println("using namespace activemq::wireformat::openwire::marshal::v"+getOpenwireVersion()+";");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
 out.println("void MarshallerFactory::configure( OpenWireFormat* format ) {");

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=733207&r1=733206&r2=733207&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 Jan  9 16:49:55 2009
@@ -34,7 +34,7 @@
     public Object run() {
         filePostFix = getFilePostFix();
         if (destDir == null) {
-            destDir = new File(targetDir+"/activemq/connector/openwire/marshal/v"+getOpenwireVersion());
+            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/v"+getOpenwireVersion());
         }
         return super.run();
     }
@@ -157,8 +157,8 @@
         generateLicence(out);
 
 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_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
 out.println("");
 out.println("// Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -167,9 +167,9 @@
 out.println("");
 
     if( baseClass.equals("BaseDataStreamMarshaller") ) {
-        out.println("#include <activemq/connector/openwire/marshal/"+baseClass+".h>");
+        out.println("#include <activemq/wireformat/openwire/marshal/"+baseClass+".h>");
     } else {
-        out.println("#include <activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+baseClass+".h>");
+        out.println("#include <activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+baseClass+".h>");
     }
 
 out.println("");
@@ -177,12 +177,12 @@
 out.println("#include <decaf/io/DataOutputStream.h>");
 out.println("#include <decaf/io/IOException.h>");
 out.println("#include <activemq/util/Config.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/commands/DataStructure.h>");
+out.println("#include <activemq/wireformat/openwire/OpenWireFormat.h>");
+out.println("#include <activemq/wireformat/openwire/utils/BooleanStream.h>");
 out.println("");
 out.println("namespace activemq{");
-out.println("namespace connector{");
+out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
 out.println("namespace v"+getOpenwireVersion()+"{");
@@ -282,18 +282,18 @@
 
     public void generateFactory(PrintWriter out) {
         generateLicence(out);
-out.println("#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_MARSHALERFACTORY_H_");
-out.println("#define _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_MARSHALERFACTORY_H_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_MARSHALERFACTORY_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_MARSHALERFACTORY_H_");
 out.println("");
 out.println("//       Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
 out.println("#pragma warning( disable : 4290 )");
 out.println("#endif");
 out.println("");
-out.println("#include <activemq/connector/openwire/OpenWireFormat.h>");
+out.println("#include <activemq/wireformat/openwire/OpenWireFormat.h>");
 out.println("");
 out.println("namespace activemq{");
-out.println("namespace connector{");
+out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
 out.println("namespace v"+getOpenwireVersion()+"{");
@@ -318,7 +318,7 @@
 out.println("");
 out.println("}}}}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_V"+getOpenwireVersion()+"_MARSHALLERFACTORY_H_*/");
+out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_V"+getOpenwireVersion()+"_MARSHALLERFACTORY_H_*/");
     }
 
     public String getTargetDir() {

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=733207&r1=733206&r2=733207&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 Jan  9 16:49:55 2009
@@ -43,16 +43,16 @@
         generateLicence(out);
 
 out.println("");
-out.println("#include <activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+className+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+className+".h>");
 out.println("");
-out.println("#include <activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+super.getTargetClassName(jclass)+".h>");
-out.println("#include <activemq/connector/openwire/commands/"+jclass.getSimpleName()+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+super.getTargetClassName(jclass)+".h>");
+out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
 out.println("");
-out.println("CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v"+getOpenwireVersion()+"::"+className+"
);");
+out.println("CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::v"+getOpenwireVersion()+"::"+className+"
);");
 out.println("");
-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/wireformat/openwire/OpenWireFormat.h>");
+out.println("#include <activemq/commands/DataStructure.h>");
+out.println("#include <activemq/wireformat/openwire/utils/BooleanStream.h>");
 out.println("#include <decaf/io/DataInputStream.h>");
 out.println("#include <decaf/io/DataOutputStream.h>");
 out.println("#include <decaf/io/IOException.h>");
@@ -69,12 +69,12 @@
 out.println("using namespace activemq;");
 out.println("using namespace activemq::util;");
 out.println("using namespace activemq::exceptions;");
-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 activemq::commands;");
+out.println("using namespace activemq::wireformat;");
+out.println("using namespace activemq::wireformat::openwire;");
+out.println("using namespace activemq::wireformat::openwire::marshal;");
+out.println("using namespace activemq::wireformat::openwire::utils;");
+out.println("using namespace activemq::wireformat::openwire::marshal::v"+getOpenwireVersion()+";");
 out.println("using namespace decaf::io;");
 out.println("using namespace decaf::lang;");
 out.println("using namespace decaf::util;");

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingHeadersGenerator.java?rev=733207&r1=733206&r2=733207&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingHeadersGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppTestMarshallingHeadersGenerator.java
Fri Jan  9 16:49:55 2009
@@ -46,7 +46,7 @@
 
         filePostFix = getFilePostFix();
         if (destDir == null) {
-            destDir = new File(targetDir+"/activemq/connector/openwire/marshal/v"+getOpenwireVersion());
+            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/v"+getOpenwireVersion());
         }
         return super.run();
     }
@@ -129,8 +129,8 @@
         generateLicence(out);
 
 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_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_");
 out.println("");
 out.println("// Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -141,7 +141,7 @@
 out.println("#include <cppunit/extensions/HelperMacros.h>");
 out.println("");
 out.println("namespace activemq{");
-out.println("namespace connector{");
+out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
 out.println("namespace v"+getOpenwireVersion()+"{");
@@ -177,7 +177,7 @@
 out.println("");
 out.println("}}}}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_*/");
+out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_*/");
 out.println("");
         }
 



Mime
View raw message