Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[1206] trunk
|
From: <tri...@us...> - 2010-03-10 20:08:22
|
Revision: 1206
http://equanda.svn.sourceforge.net/equanda/?rev=1206&view=rev
Author: triathlon98
Date: 2010-03-10 20:08:16 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
EQ-376 assure equanda works using tapestry 5.2
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java
Removed Paths:
-------------
trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
Deleted: trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,47 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.client;
-
-/**
- * Configuration for a specific page.
- *
- * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
- */
-public interface AuthAndConfigPages
-{
- /**
- * Set whether this page has GUI Administration rights
- *
- * @param isGuiAdmin The value to set the GUI Admin flag to
- */
- void setGuiAdmin( boolean isGuiAdmin );
-
- /**
- * Set the role being used
- *
- * @param roleName The name of the role to be used, or null if no role selected
- */
- void setRoleName( String roleName );
-}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div id="${clientId}" class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div id="${clientId}" class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="equanda-readable:table.${table.Name}">
#parse( "t5gui/render.vm" )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
<div t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<div class="eqInlR">
<div class="eqInlRL">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
<div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<div class="eqLLR" t:type="loop" volatile="true" source="value" value="current" index="index" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"">
<div class="eqLLR">
<t:equanda.formactionlink t:id="Select" context="prop:setterId">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="equanda-readable:table.${table.Name}">
<t:grid model="gridModel" row="currentRow" source="rows" pagerposition="both" rowsPerPage="prop:rowsPerPage">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="hasValue()">
#set( $sep = "" )
#foreach( $field in $table.getFieldsNotHidden() )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="hasObject()">
<t:equanda.formactionlink t:id="Edit" context="object.id">
<span t:type="${table.VarName}/Summary" t:value="object"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="action" type="org.equanda.domain.xml.Action" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, ${dollar}{equanda-message:action.${table.Name}.${action.Name}}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="action" type="org.equanda.domain.xml.Action" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, ${dollar}{equanda-message:action.${table.Name}.${action.Name}}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -55,7 +55,7 @@
import org.apache.tapestry5.runtime.Component;
import org.equanda.auth.ParsedAuthAndConfigProvider;
import org.equanda.client.AuthAndConfigProvider;
-import org.equanda.client.AuthAndConfigPages;
+import org.equanda.auth.AuthAndConfigPage;
import org.equanda.client.EquandaException;
import org.equanda.persistence.*;
import org.equanda.t5gui.services.LoginInfoService;
@@ -64,7 +64,7 @@
$!{engine.getTemplateConfig("page-class-annotation" )}
@IncludeJavaScriptLibrary( { "classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfigTables
- implements AuthAndConfigPages
+ implements AuthAndConfigPage
{
private static final Logger log = Logger.getLogger( AuthAndConfigTables.class );
private static final String noRoleIndicator = "__no_role__";
@@ -282,7 +282,7 @@
{
if( context.length == 3 )
{
- AuthAndConfigPages page = (AuthAndConfigPages)source.getPage( context[0] + "/AuthAndConfig" );
+ AuthAndConfigPage page = (AuthAndConfigPage)source.getPage( context[0] + "/AuthAndConfig" );
String roleName = (String)context[1];
String isGuiAdmin = (String)context[2];
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="dm" type="org.equanda.domain.xml.DomainModel" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Tables}</t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="select" type="org.equanda.domain.xml.Select" *#
-<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context"></span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -80,26 +80,12 @@
private Object nextPage;
@Persist
+ @Property
private boolean guiAdmin;
- public void setGuiAdmin( boolean guiAdmin )
- {
- this.guiAdmin = guiAdmin;
- }
- public boolean isGuiAdmin()
- {
- return guiAdmin;
- }
@Persist
+ @Property
private String roleName;
- public void setRoleName( String roleName )
- {
- this.roleName = roleName;
- }
- public String getRoleName()
- {
- return roleName;
- }
public SelectModel getRolesChoiceModel()
{
@@ -110,7 +96,7 @@
for ( ${roleTable} role : coll )
{
- list.add( new EquandaOptionModel (role.getRoleName(), role.getRoleName() ) );
+ list.add( new EquandaOptionModel(role.getRoleName(), role.getRoleName() ) );
}
}
catch(Exception e){
@@ -151,7 +137,7 @@
if ( guiAdmin )
{
navigationManager.beginNavigation( resources );
- tablePage.initPage( getRoleName(), guiAdmin );
+ tablePage.initPage( roleName, guiAdmin );
tablePage.refreshBoxes();
nextPage = tablePage;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,23 +1,23 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
- <t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Roles}</t:parameter>
+ <p:title>${dollar}{equanda-message:authAndConfig.title.Roles}</p:title>
- <t:if test="isGuiAdmin()">
+ <t:if test="getGuiAdmin()">
<p>${dollar}{equanda-message:authAndConfig.select.Role}</p>
<br/>
<select t:type="Select" t:model="RolesChoiceModel" t:value="roleName" t:blankOption="ALWAYS"/>
- <t:parameter name="else">
+ <p:else>
<p class="aacError">${dollar}{equanda-message:authAndConfig.select.Prohibited}</p>
- </t:parameter>
+ </p:else>
</t:if>
- <t:parameter name="buttons">
+ <p:buttons>
<input class="defaultSubmit" t:type="submit" value="equanda-message:button.OK" t:id="ok"/>
<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
- </t:parameter>
+ </p:buttons>
</t:layout>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -55,7 +55,7 @@
import org.apache.tapestry5.annotations.Environmental;
import org.equanda.auth.ParsedAuthAndConfigProvider;
import org.equanda.client.AuthAndConfigProvider;
-import org.equanda.client.AuthAndConfigPages;
+import org.equanda.auth.AuthAndConfigPage;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
import org.equanda.persistence.*;
@@ -67,7 +67,7 @@
"classpath:/org/equanda/tapestry5/resources/t5equanda.js",
"classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfig
- implements AuthAndConfigPages
+ implements AuthAndConfigPage
{
private static final Logger log = Logger.getLogger( AuthAndConfig.class );
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.configure} ${dollar}{equanda-message:table.${table.Name}}</t:parameter>
Copied: trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java (from rev 1196, trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java)
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java (rev 0)
+++ trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -0,0 +1,47 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.auth;
+
+/**
+ * Configuration for a specific page.
+ *
+ * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
+ */
+public interface AuthAndConfigPage
+{
+ /**
+ * Set whether this page has GUI Administration rights
+ *
+ * @param isGuiAdmin The value to set the GUI Admin flag to
+ */
+ void setGuiAdmin( boolean isGuiAdmin );
+
+ /**
+ * Set the role being used
+ *
+ * @param roleName The name of the role to be used, or null if no role selected
+ */
+ void setRoleName( String roleName );
+}
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -33,7 +33,7 @@
import java.util.List;
/**
- * Form aware ActionLink component. The form should containa equanda/FormSupport component or it does not work.
+ * Form aware ActionLink component. The form should contain a equanda/FormSupport component or it does not work.
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -122,5 +122,19 @@
public void setAnchor( String s ) {/*ignore*/}
public String toAbsoluteURI() { return target;}
+
+ public void removeParameter( String s ) {/*ignore*/}
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getBasePath()
+ {
+ return ""; // not really supported
+ }
+
+ public Link copyWithBasePath( String s ) {
+ return this; // not really supported
+ }
}
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/pom.xml 2010-03-10 20:08:16 UTC (rev 1206)
@@ -631,7 +631,7 @@
</profiles>
<properties>
- <tapestry-release-version>5.1.0.5</tapestry-release-version>
+ <tapestry-release-version>5.2.0-SNAPSHOT</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-version>
<!--
<staticwiki-release-version>0.9.1-SNAPSHOT</staticwiki-release-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
