Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[876] trunk
|
From: <tri...@us...> - 2008-11-26 15:16:14
|
Revision: 876
http://equanda.svn.sourceforge.net/equanda/?rev=876&view=rev
Author: triathlon98
Date: 2008-11-26 15:16:09 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
EQ-285 upgrade to tapestry 5.0.17
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui.ini
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
trunk/equanda-tapestry5/src/site/wiki/validationtrackerdelegate.wiki
trunk/pom.xml
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2008-11-26 15:16:09 UTC (rev 876)
@@ -277,7 +277,7 @@
}
}
- void endRender()
+ void afterRender()
{
if ( null != keepException ) environment.pop( MessageContainer.class );
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2008-11-26 15:16:09 UTC (rev 876)
@@ -1,3 +1,7 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="dollar" type="java.lang.String" *#
+#* @vtlvariable name="package" type="java.lang.String" *#
+#* @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
#**
* This file is part of the equanda project.
*
@@ -46,15 +50,10 @@
import org.equanda.tapestry5.components.JSPagedLoop;
import org.equanda.tapestry5.translators.StringTranslator;
import org.equanda.persistence.EquandaPersistenceException;
-import org.equanda.persistence.Uoid;
import org.equanda.validation.*;
import java.util.*;
-import ${ejbPackage}.client.${table.Name};
-import ${package}.pages.${table.Name}EquandaAll;
-import ${package}.pages.${table.Name}Edit;
-
/**
* Component for a multiple primitives
*/
Modified: trunk/equanda-generate/src/main/velocity/t5gui.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui.ini 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/equanda-generate/src/main/velocity/t5gui.ini 2008-11-26 15:16:09 UTC (rev 876)
@@ -23,6 +23,12 @@
output8=${outputDir}${packageDir}pages/AuthAndConfigRoles.tml
template8=pages/SelectAuthConfig.tml.vm
+output9=${outputDir}${packageDir}components/InlinePrimitiveList.java
+template9=components/InlinePrimitiveList.java.vm
+output10=${outputDir}${packageDir}components/InlinePrimitiveList.tml
+template10=components/InlinePrimitiveList.tml.vm
+
+
[root-table]
// components for each table
@@ -67,32 +73,27 @@
output16=${outputDir}${packageDir}components/${_table}/InlineLinkList.tml
template16=components/InlineLinkList.tml.vm
-output17=${outputDir}${packageDir}components/InlinePrimitiveList.java
-template17=components/InlinePrimitiveList.java.vm
-output18=${outputDir}${packageDir}components/InlinePrimitiveList.tml
-template18=components/InlinePrimitiveList.tml.vm
+output17=${outputDir}${packageDir}components/${_table}/Display.java
+template17=components/Display.java.vm
+output18=${outputDir}${packageDir}components/${_table}/Display.tml
+template18=components/Display.tml.vm
-output19=${outputDir}${packageDir}components/${_table}/Display.java
-template19=components/Display.java.vm
-output20=${outputDir}${packageDir}components/${_table}/Display.tml
-template20=components/Display.tml.vm
-
// edit page
-output21=${outputDir}${packageDir}pages/${table}Edit.java
-template21=pages/Edit.java.vm
-output22=${outputDir}${packageDir}pages/${table}Edit.tml
-template22=pages/Edit.tml.vm
+output19=${outputDir}${packageDir}pages/${table}Edit.java
+template19=pages/Edit.java.vm
+output20=${outputDir}${packageDir}pages/${table}Edit.tml
+template20=pages/Edit.tml.vm
+output21=${outputDir}${packageDir}pages/${_table}/AuthAndConfig.java
+template21=pages/TableAuthConfig.java.vm
+output22=${outputDir}${packageDir}pages/${_table}/AuthAndConfig.tml
+template22=pages/TableAuthConfig.tml.vm
+
output23=${outputDir}${packageDir}base/${_table}/OneObjectComponentBase.java
template23=base/OneObjectComponentBase.java.vm
-output24=${outputDir}${packageDir}pages/${_table}/AuthAndConfig.java
-template24=pages/TableAuthConfig.java.vm
-output25=${outputDir}${packageDir}pages/${_table}/AuthAndConfig.tml
-template25=pages/TableAuthConfig.tml.vm
-
[action-not-hidden]
// action pages
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2008-11-26 15:16:09 UTC (rev 876)
@@ -100,7 +100,7 @@
private int rowsPerPage;
@Persist
- private int currentPage = 1;
+ private int currentPage;
// @Persist
private int addedRowCount;
@@ -322,6 +322,7 @@
@SetupRender
Object setupRender()
{
+ currentPage = 1;
rowIds = new ArrayList<String>();
assignedClientId = renderSupport.allocateClientId( clientId );
Modified: trunk/equanda-tapestry5/src/site/wiki/validationtrackerdelegate.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/validationtrackerdelegate.wiki 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/equanda-tapestry5/src/site/wiki/validationtrackerdelegate.wiki 2008-11-26 15:16:09 UTC (rev 876)
@@ -37,7 +37,7 @@
if ( null != keepMessage ) environment.push( MessageContainer.class, new MessageContainer( keepMessage ) );
}
-void endRender()
+void afterRender()
{
if ( null != keepMessage ) environment.pop( MessageContainer.class );
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-25 15:34:07 UTC (rev 875)
+++ trunk/pom.xml 2008-11-26 15:16:09 UTC (rev 876)
@@ -568,7 +568,7 @@
</profiles>
<properties>
- <tapestry-release-version>5.0.16</tapestry-release-version>
+ <tapestry-release-version>5.0.17</tapestry-release-version>
<tapestry-commons-version>0.5.15</tapestry-commons-version>
<staticwiki-release-version>0.9</staticwiki-release-version>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
