From 73603c3d711d33caec01edeca2b91c63a310ad3b Mon Sep 17 00:00:00 2001 From: James Strachan Date: Fri, 17 Feb 2006 12:02:35 +0000 Subject: [PATCH] patch the code generation to work with the latest JNDI changes git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378493 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-core/src/gram/script/GenerateJavaMarshalling.groovy | 4 ++-- activemq-core/src/gram/script/GenerateJavaTests.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy index 8c5eb334ac..9219328ed2 100755 --- a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy @@ -89,8 +89,8 @@ for (pkg in jclass.importedPackages) { } } -def baseClass = "org.apache.activemq.openwire.DataStreamMarshaller" -if( !jclass.superclass.simpleName.equals("Object") ) { +def baseClass = "DataStreamMarshaller" +if (!jclass.superclass.simpleName.equals("JNDIBaseStorable") && !jclass.superclass.simpleName.equals("Object") ) { baseClass = jclass.superclass.simpleName + "Marshaller"; } diff --git a/activemq-core/src/gram/script/GenerateJavaTests.groovy b/activemq-core/src/gram/script/GenerateJavaTests.groovy index 6e8051a52a..85a444856c 100755 --- a/activemq-core/src/gram/script/GenerateJavaTests.groovy +++ b/activemq-core/src/gram/script/GenerateJavaTests.groovy @@ -92,7 +92,7 @@ for (pkg in jclass.importedPackages) { } def baseClass = "DataFileGeneratorTestSupport" -if( !jclass.superclass.simpleName.equals("Object") ) { +if (!jclass.superclass.simpleName.equals("JNDIBaseStorable") && !jclass.superclass.simpleName.equals("Object") ) { baseClass = jclass.superclass.simpleName + "Test"; }