activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r955235 - in /activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool: marshallers/ tests/
Date Wed, 16 Jun 2010 14:15:04 GMT
Author: tabish
Date: Wed Jun 16 14:15:04 2010
New Revision: 955235

URL: http://svn.apache.org/viewvc?rev=955235&view=rev
Log:
Place generated marshalers in a more descriptive namespace.

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java?rev=955235&r1=955234&r2=955235&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingClassesGenerator.java
Wed Jun 16 14:15:04 2010
@@ -568,7 +568,7 @@ public class AmqCppMarshallingClassesGen
         generateLicence(out);
 
 out.println("");
-out.println("#include <activemq/wireformat/openwire/marshal/universal/"+className+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/generated/"+className+".h>");
 out.println("");
 out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
 out.println("#include <activemq/exceptions/ActiveMQException.h>");
@@ -588,7 +588,7 @@ out.println("using namespace activemq::w
 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::universal;");
+out.println("using namespace activemq::wireformat::openwire::marshal::generated;");
 out.println("using namespace decaf;");
 out.println("using namespace decaf::io;");
 out.println("using namespace decaf::lang;");
@@ -793,7 +793,7 @@ out.println("");
     public void generateFactory(PrintWriter out) {
         generateLicence(out);
 
-out.println("#include <activemq/wireformat/openwire/marshal/universal/MarshallerFactory.h>");
+out.println("#include <activemq/wireformat/openwire/marshal/generated/MarshallerFactory.h>");
 
         List<JClass> list = new ArrayList<JClass>(getConcreteClasses());
         Collections.sort(list, new Comparator<JClass>(){
@@ -802,7 +802,7 @@ out.println("#include <activemq/wireform
         }});
 
         for ( JClass jclass : list ) {
-out.println("#include <activemq/wireformat/openwire/marshal/universal/"+jclass.getSimpleName()+"Marshaller.h>");
+out.println("#include <activemq/wireformat/openwire/marshal/generated/"+jclass.getSimpleName()+"Marshaller.h>");
         }
 
 out.println("");
@@ -821,7 +821,7 @@ out.println("using namespace activemq;")
 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::universal;");
+out.println("using namespace activemq::wireformat::openwire::marshal::generated;");
 out.println("");
 out.println("///////////////////////////////////////////////////////////////////////////////");
 out.println("void MarshallerFactory::configure( OpenWireFormat* format ) {");

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java?rev=955235&r1=955234&r2=955235&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/marshallers/AmqCppMarshallingHeadersGenerator.java
Wed Jun 16 14:15:04 2010
@@ -77,7 +77,7 @@ public class AmqCppMarshallingHeadersGen
     public Object run() {
         filePostFix = getFilePostFix();
         if (destDir == null) {
-            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/universal");
+            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/generated");
         }
         Object answer = super.run();
         processFactory();
@@ -220,8 +220,8 @@ out.println(" */");
         generateLicence(out);
 
 out.println("");
-out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_");
-out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_");
 out.println("");
 out.println("// Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -232,7 +232,7 @@ out.println("");
     if( baseClass.equals("BaseDataStreamMarshaller") ) {
         out.println("#include <activemq/wireformat/openwire/marshal/"+baseClass+".h>");
     } else {
-        out.println("#include <activemq/wireformat/openwire/marshal/universal/"+baseClass+".h>");
+        out.println("#include <activemq/wireformat/openwire/marshal/generated/"+baseClass+".h>");
     }
 
 out.println("");
@@ -248,7 +248,7 @@ out.println("namespace activemq{");
 out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
-out.println("namespace universal{");
+out.println("namespace generated{");
 out.println("");
 out.println("    /**");
 out.println("     * Marshaling code for Open Wire Format for "+className);
@@ -355,7 +355,7 @@ out.println("    };");
 out.println("");
 out.println("}}}}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_*/");
+out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_*/");
 out.println("");
         }
 
@@ -378,8 +378,8 @@ out.println("");
 
     public void generateFactory(PrintWriter out) {
         generateLicence(out);
-out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_MARSHALERFACTORY_H_");
-out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_MARSHALERFACTORY_H_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_MARSHALERFACTORY_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_MARSHALERFACTORY_H_");
 out.println("");
 out.println("//       Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -392,7 +392,7 @@ out.println("namespace activemq{");
 out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
-out.println("namespace universal{");
+out.println("namespace generated{");
 out.println("");
 out.println("    /**");
 out.println("     * Used to create marshallers for a specific version of the wire");
@@ -413,7 +413,7 @@ out.println("    };");
 out.println("");
 out.println("}}}}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_UNIVERSAL_MARSHALLERFACTORY_H_*/");
+out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_GENERATED_MARSHALLERFACTORY_H_*/");
     }
 
     public List<JClass> getConcreteClasses() {

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java?rev=955235&r1=955234&r2=955235&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java
Wed Jun 16 14:15:04 2010
@@ -33,9 +33,9 @@ public class AmqCppTestMarshallingClasse
         generateLicence(out);
 
 out.println("");
-out.println("#include <activemq/wireformat/openwire/marshal/universal/"+className+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/generated/"+className+".h>");
 out.println("");
-out.println("#include <activemq/wireformat/openwire/marshal/universal/"+super.getTargetClassName(jclass)+".h>");
+out.println("#include <activemq/wireformat/openwire/marshal/generated/"+super.getTargetClassName(jclass)+".h>");
 out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
 out.println("");
 out.println("#include <activemq/wireformat/openwire/OpenWireFormat.h>");
@@ -65,7 +65,7 @@ out.println("using namespace activemq::w
 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::universal;");
+out.println("using namespace activemq::wireformat::openwire::marshal::generated;");
 out.println("using namespace decaf::io;");
 out.println("using namespace decaf::lang;");
 out.println("using namespace decaf::util;");

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingHeadersGenerator.java?rev=955235&r1=955234&r2=955235&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingHeadersGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingHeadersGenerator.java
Wed Jun 16 14:15:04 2010
@@ -45,7 +45,7 @@ public class AmqCppTestMarshallingHeader
 
         filePostFix = getFilePostFix();
         if (destDir == null) {
-            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/universal");
+            destDir = new File(targetDir+"/activemq/wireformat/openwire/marshal/generated");
         }
         return super.run();
     }
@@ -128,8 +128,8 @@ out.println(" */");
         generateLicence(out);
 
 out.println("");
-out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_");
-out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_");
+out.println("#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_");
+out.println("#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_");
 out.println("");
 out.println("// Turn off warning message for ignored exception specification");
 out.println("#ifdef _MSC_VER");
@@ -143,7 +143,7 @@ out.println("namespace activemq{");
 out.println("namespace wireformat{");
 out.println("namespace openwire{");
 out.println("namespace marshal{");
-out.println("namespace universal{");
+out.println("namespace generated{");
 out.println("");
 out.println("    /**");
 out.println("     * Marshalling Test code for Open Wire Format for "+className);
@@ -176,7 +176,7 @@ out.println("    };");
 out.println("");
 out.println("}}}}}");
 out.println("");
-out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_"+className.toUpperCase()+"_H_*/");
+out.println("#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_GENERATED_"+className.toUpperCase()+"_H_*/");
         }
 
     public String getTargetDir() {



Mime
View raw message