[Equanda-svn-commit] SF.net SVN: equanda:[872] trunk

[<tri...@us...>]

Revision: 872
          http://equanda.svn.sourceforge.net/equanda/?rev=872&view=rev
Author:   triathlon98
Date:     2008-11-23 20:29:00 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
fix integration tests

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java
    trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
    trunk/equanda-test/test-t5-gui/pom.xml

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java	2008-11-21 13:05:56 UTC (rev 871)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java	2008-11-23 20:29:00 UTC (rev 872)
@@ -156,7 +156,6 @@
             String fieldIdType = fieldType;
             String varName = selection.getVarName();
             String varListName = varName;
-            String varListIdName = varName;
             if ( selection.getField().isLink() )
             {
                 hasTableParameters = true;
@@ -193,7 +192,7 @@
                 parametersListSingleSelect.append( "_f" );
 
                 parametersList.append( varListName );
-                parametersIdList.append( varListIdName );
+                parametersIdList.append( varListName );
                 parametersListConverted.append( varName ).append( "Converted" );
                 parametersListWithTypes.append( varName );
                 parametersListWithIdTypes.append( varName );
@@ -202,7 +201,7 @@
                 parametersListSingleSelect.append( varName );
                 parametersListNoLimit.append( "getPageState()." );
                 parametersListNoLimit.append( varListName );
-                parametersIdListNoLimit.append( varListIdName );
+                parametersIdListNoLimit.append( varListName );
                 parametersListWithTypesNoLimit.append( varName );
                 parametersListWithIdTypesNoLimit.append( varName );
                 sep = ", ";
@@ -270,6 +269,7 @@
         if ( select.hasLimit() )
         {
             parametersListWithTypes.append( sep ).append( "int equandaLimit" );
+            parametersListWithIdTypes.append( sep ).append( "int equandaLimit" );
             parametersList.append( sep ).append( "equandaLimit" );
             parametersIdList.append( sep ).append( "equandaLimit" );
             parametersListConverted.append( sep ).append( "equandaLimit" );

Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm	2008-11-21 13:05:56 UTC (rev 871)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm	2008-11-23 20:29:00 UTC (rev 872)
@@ -333,7 +333,7 @@
         throws EquandaPersistenceException
     {
         #if( $select.isSingle() )
-        return getEJB( equandaSelect${select.Name}( $select.ParametersNoIdList ) );
+        return getEJB( equandaSelect${select.Name}( $select.ParametersList ) );
         #else ## is multiple
         return convertListEJB( equandaSelect${select.Name}( $select.ParametersIdList ) );
         #end

Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml	2008-11-21 13:05:56 UTC (rev 871)
+++ trunk/equanda-test/test-t5-gui/pom.xml	2008-11-23 20:29:00 UTC (rev 872)
@@ -138,5 +138,11 @@
             <version>3.7.10</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+            <version>1.0-M1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.