svn commit: r378493 - in /incubator/activemq/trunk/activemq-core/src/gram/script: GenerateJavaMarshalling.groovy GenerateJavaTests.groovy

[jstrachan]

Author: jstrachan
Date: Fri Feb 17 04:02:35 2006
New Revision: 378493

URL: http://svn.apache.org/viewcvs?rev=378493&view=rev
Log:
patch the code generation to work with the latest JNDI changes

Modified:
    
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
    
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy

Modified: 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy?rev=378493&r1=378492&r2=378493&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
 Fri Feb 17 04:02:35 2006
@@ -89,8 +89,8 @@
     }
 }
 
-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";
 }
 

Modified: 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy?rev=378493&r1=378492&r2=378493&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy 
(original)
+++ 
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaTests.groovy 
Fri Feb 17 04:02:35 2006
@@ -92,7 +92,7 @@
 }
 
 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";
 }