Author: tabish
Date: Sun Jan 11 11:49:33 2009
New Revision: 733502
URL: http://svn.apache.org/viewvc?rev=733502&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/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/AmqCppTestMarshallingHeadersGenerator.java
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=733502&r1=733501&r2=733502&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
Sun Jan 11 11:49:33 2009
@@ -88,12 +88,10 @@
out.println(" * in the activemq-openwire-generator module");
out.println(" *");
out.println(" */");
-out.println(" class AMQCPP_API "+className+" : public
"+getProperBaseClassName( className, baseClass ) );
-out.println(" {");
+out.println(" class AMQCPP_API "+className+" : public
"+getProperBaseClassName( className, baseClass )+" {" );
out.println(" protected:");
out.println("");
-
if( className.equals( "Message" ) ) {
out.println(" static const unsigned int DEFAULT_MESSAGE_SIZE = 1024;");
@@ -214,7 +212,6 @@
out.println("}}");
out.println("");
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=733502&r1=733501&r2=733502&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
Sun Jan 11 11:49:33 2009
@@ -673,7 +673,7 @@
public void generateFactory(PrintWriter out) {
generateLicence(out);
-out.println("#include
<activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/MarshallerFactory.h>");
+out.println("#include
<activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/MarshallerFactory.h>");
List list = new ArrayList(getConcreteClasses());
Collections.sort(list, new Comparator(){
@@ -685,7 +685,7 @@
for (Iterator iter = list.iterator(); iter.hasNext();) {
JClass jclass = (JClass) iter.next();
-out.println("#include
<activemq/connector/openwire/marshal/v"+getOpenwireVersion()+"/"+jclass.getSimpleName()+"Marshaller.h>");
+out.println("#include
<activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+jclass.getSimpleName()+"Marshaller.h>");
}
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=733502&r1=733501&r2=733502&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
Sun Jan 11 11:49:33 2009
@@ -194,8 +194,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 AMQCPP_API "+className+" : public "+baseClass);
-out.println(" {");
+out.println(" class AMQCPP_API "+className+" : public "+baseClass+" {");
out.println(" public:");
out.println("");
out.println(" "+className+"() {}");
@@ -276,7 +275,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("");
}
@@ -306,8 +305,7 @@
out.println(" * if you need to make a change, please see the
Groovy scripts");
out.println(" * in the activemq-openwire-generator module");
out.println(" */");
-out.println(" class MarshallerFactory");
-out.println(" {");
+out.println(" class MarshallerFactory {");
out.println(" public:");
out.println("");
out.println(" virtual ~MarshallerFactory() {};");
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=733502&r1=733501&r2=733502&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
Sun Jan 11 11:49:33 2009
@@ -178,7 +178,6 @@
out.println("}}}}}");
out.println("");
out.println("#endif
/*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_V"+getOpenwireVersion()+"_"+className.toUpperCase()+"_H_*/");
-out.println("");
}
public String getTargetDir() {
