Menu
▾
▴
equanda-svn-commit — svn commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2009-03-10 12:59:55
|
Revision: 1034
http://equanda.svn.sourceforge.net/equanda/?rev=1034&view=rev
Author: triathlon98
Date: 2009-03-10 12:59:39 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
EQ-324 upgrade to tapestry 5.1.0.0
Modified Paths:
--------------
t5-equanda-example/pom.xml
t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2009-03-01 09:54:39 UTC (rev 1033)
+++ t5-equanda-example/pom.xml 2009-03-10 12:59:39 UTC (rev 1034)
@@ -158,8 +158,8 @@
</pluginRepositories>
<properties>
- <equanda-release-version>0.9.3-SNAPSHOT</equanda-release-version>
- <tapestry-release-version>5.0.18</tapestry-release-version>
+ <equanda-release-version>0.9.4-SNAPSHOT</equanda-release-version>
+ <tapestry-release-version>5.1.0.0</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-version>
</properties>
</project>
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java 2009-03-01 09:54:39 UTC (rev 1033)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java 2009-03-10 12:59:39 UTC (rev 1034)
@@ -57,7 +57,7 @@
private String title;
- public String getTitle()
+ public String getNavigationPageTitle()
{
if ( null == title ) title = "A, " + MsgGenerator.get() + " persisted=" + getPersistedValue();
return title;
@@ -76,7 +76,8 @@
Object onActionFromPageBNavigation()
{
navigationManager.beginNavigation( resources );
- pageB.setPersistedValue( "from " + getTitle().substring( 0, getTitle().indexOf( " persisted" ) ) );
+ pageB.setPersistedValue(
+ "from " + getNavigationPageTitle().substring( 0, getNavigationPageTitle().indexOf( " persisted" ) ) );
return pageB;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-03-01 09:54:44
|
Revision: 1033
http://equanda.svn.sourceforge.net/equanda/?rev=1033&view=rev
Author: triathlon98
Date: 2009-03-01 09:54:39 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
branch for removing stateful beans, removing mediators and replacing with validators and helper classes
Added Paths:
-----------
branches/EQ-130/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-27 12:02:07
|
Revision: 1032
http://equanda.svn.sourceforge.net/equanda/?rev=1032&view=rev
Author: triathlon98
Date: 2009-02-27 12:02:03 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
EQ-323 no more "remove" method
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBLocal.java.vm
Modified: trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2009-02-26 17:45:23 UTC (rev 1031)
+++ trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2009-02-27 12:02:03 UTC (rev 1032)
@@ -131,7 +131,4 @@
}
return null;
}
-
- @javax.ejb.Remove
- public void remove() {}
}
Modified: trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBLocal.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBLocal.java.vm 2009-02-26 17:45:23 UTC (rev 1031)
+++ trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBLocal.java.vm 2009-02-27 12:02:03 UTC (rev 1032)
@@ -54,6 +54,4 @@
* @return AuthAndConfig string for role
*/
String getRoleAuthAndConfig( String role );
-
- void remove();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-26 17:45:26
|
Revision: 1031
http://equanda.svn.sourceforge.net/equanda/?rev=1031&view=rev
Author: triathlon98
Date: 2009-02-26 17:45:23 +0000 (Thu, 26 Feb 2009)
Log Message:
-----------
EQ-322 increase username and password length
Modified Paths:
--------------
trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
Modified: trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
===================================================================
--- trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2009-02-26 12:01:12 UTC (rev 1030)
+++ trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2009-02-26 17:45:23 UTC (rev 1031)
@@ -6,7 +6,7 @@
Definition of a user for a GUI application.
</description>
<page name="ALL">
- <field name="UserName" type="string" length="10">
+ <field name="UserName" type="string" length="30">
<constraints>
<unique/>
<required/>
@@ -17,7 +17,7 @@
<field name="Name" type="string" length="30"/>
</page>
<page>
- <field name="Password" type="string" length="10"/>
+ <field name="Password" type="string" length="30"/>
<field name="Roles" type="EquandaRole">
<description>Grouping of security rights for this user</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-26 13:01:57
|
Revision: 1030
http://equanda.svn.sourceforge.net/equanda/?rev=1030&view=rev
Author: triathlon98
Date: 2009-02-26 12:01:12 +0000 (Thu, 26 Feb 2009)
Log Message:
-----------
update cfr chenillekit-access 1.0
Modified Paths:
--------------
trunk/src/site/wiki/templates/t5gui.wiki
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-02-24 20:21:39 UTC (rev 1029)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-02-26 12:01:12 UTC (rev 1030)
@@ -243,5 +243,5 @@
{code}
[t5gui]
-pag...@or...( roles = 1 )
+pag...@or...( role = 1 )
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-24 20:21:42
|
Revision: 1029
http://equanda.svn.sourceforge.net/equanda/?rev=1029&view=rev
Author: triathlon98
Date: 2009-02-24 20:21:39 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
changed handling of addedRowsList
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
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 2009-02-24 20:16:02 UTC (rev 1028)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2009-02-24 20:21:39 UTC (rev 1029)
@@ -347,21 +347,20 @@
currentPage = 1;
assignedClientId = renderSupport.allocateClientId( clientId );
- if ( null == addedRowsList ) addedRowsList = new ArrayList<Object>();
- pagedSource = new ArrayList<Object>();
-
- if ( source != null ) pagedSource.addAll( source );
-
if ( objectCreatorDelegate != null )
{
+ if ( null == addedRowsList ) addedRowsList = new ArrayList<Object>();
for ( int i = 0; i < additionalRowCount ; i++ )
{
Object object = objectCreatorDelegate.createObject();
- pagedSource.add( object );
addedRowsList.add( object );
}
}
+ pagedSource = new ArrayList<Object>();
+ if ( source != null ) pagedSource.addAll( source );
+ if ( null != addedRowsList ) pagedSource.addAll( addedRowsList );
+
// If there's no rows, display the empty block placeholder.
if ( pagedSource.size() == 0 )
{
@@ -421,8 +420,8 @@
{
objectCreatorDelegate.addNewObject( addedRowsList.get( i ) );
}
+ addedRowsList.clear();
}
- addedRowsList.clear();
addedRowCount = count;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-24 20:16:19
|
Revision: 1028
http://equanda.svn.sourceforge.net/equanda/?rev=1028&view=rev
Author: triathlon98
Date: 2009-02-24 20:16:02 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
small fixes
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-02-24 20:16:02 UTC (rev 1028)
@@ -84,7 +84,6 @@
@Inject
private SymbolSource symbolSource;
- @Persist
private ${table.Name} current;
private String deletedRows;
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java 2009-02-23 19:43:51 UTC (rev 1027)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java 2009-02-24 20:16:02 UTC (rev 1028)
@@ -47,7 +47,6 @@
{
selectedList = list;
selectedSetter = ss;
- System.out.println( "Setting SelectedSettings filter to " + filter );
this.filter = filter;
}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java 2009-02-23 19:43:51 UTC (rev 1027)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java 2009-02-24 20:16:02 UTC (rev 1028)
@@ -24,6 +24,7 @@
package org.equanda.t5nav.internal;
+import org.apache.log4j.Logger;
import org.apache.tapestry5.services.ApplicationStateManager;
import org.apache.tapestry5.services.PersistentFieldChange;
import org.apache.tapestry5.services.PersistentFieldStrategy;
@@ -40,6 +41,8 @@
public class NavigationPersistentFieldStrategy
implements PersistentFieldStrategy
{
+ private static final Logger log = Logger.getLogger( NavigationPersistentFieldStrategy.class );
+
private final ApplicationStateManager asoManager;
public NavigationPersistentFieldStrategy( ApplicationStateManager asoManager )
@@ -50,6 +53,10 @@
public Collection<PersistentFieldChange> gatherFieldChanges( String pageName )
{
NavigationContext context = getContextFromASO();
+ if ( log.isDebugEnabled() && null != context )
+ {
+ log.debug( "gatherFieldChanges for " + pageName + ", navid=" + context.getId() );
+ }
if ( context == null )
{
@@ -71,6 +78,11 @@
public void postChange( String pageName, String componentId, String fieldName, Object newValue )
{
NavigationContext context = getContextFromASO();
+ if ( log.isDebugEnabled() && null != context )
+ {
+ log.debug( "postChange for " + pageName + ", component " + componentId + ", field " + fieldName +
+ ", navid=" + context.getId() );
+ }
if ( context == null )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-23 19:43:57
|
Revision: 1027
http://equanda.svn.sourceforge.net/equanda/?rev=1027&view=rev
Author: triathlon98
Date: 2009-02-23 19:43:51 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
fixes in navigation handling
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.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/Select.java.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-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -173,12 +173,8 @@
{
selectedSettings.getSelectedSetter().setSelected( getObject() );
}
- nextPage = selectedSettings.getSelectedReturnPage();
}
- else
- {
- nextPage = navigationManager.endNavigation();
- }
+ nextPage = navigationManager.endNavigation();
}
catch ( EquandaException epe )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -47,6 +47,7 @@
import org.equanda.t5gui.SelectedSettings;
import org.equanda.t5gui.SelectedSettingsForSelect;
import org.equanda.t5gui.services.EquandaSetterCache;
+import org.equanda.t5nav.services.NavigationManager;
import org.equanda.tapestry5.components.FormSupport;
import org.slf4j.Logger;
@@ -62,6 +63,9 @@
@Inject
private ComponentResources resources;
+ @Inject
+ private NavigationManager navigationManager;
+
@Parameter( required = true, defaultPrefix = "prop" )
private ListGetter<T> selector;
@@ -142,7 +146,7 @@
}
}
resources.discardPersistentFieldChanges();
- return selectedSettings.getSelectedReturnPage();
+ return navigationManager.endNavigation();
}
final void setupRender()
@@ -237,14 +241,14 @@
resources.discardPersistentFieldChanges();
SelectedSetter<T> setter = checkSelectedSettings().getSelectedSetter();
setter.setSelected( getObject( uoid ) );
- return selectedSettings.getSelectedReturnPage();
+ return navigationManager.endNavigation();
}
final Object onActionFromSelectList( Uoid uoid )
{
resources.discardPersistentFieldChanges();
checkSelectedSettings().getSelectedList().add( getObject( uoid ) );
- return selectedSettings.getSelectedReturnPage();
+ return navigationManager.endNavigation();
}
public boolean isForSelect()
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -39,7 +39,8 @@
import org.equanda.persistence.EquandaProxy;
import org.equanda.t5gui.ListGetter;
import org.equanda.t5gui.SelectedSettings;
-import org.equanda.t5nav.PageWithTitle;import org.equanda.t5nav.services.NavigationManager;
+import org.equanda.t5nav.PageWithTitle;
+import org.equanda.t5nav.services.NavigationManager;
/**
* Select page base class.
@@ -69,6 +70,7 @@
final public void onSelectedFromCreate()
{
+ navigationManager.beginNavigation( resources );
EditPageBase<T> createPage = getEquandaCreatePage();
createPage.setObject( null );
if ( selectedSettings != null )
@@ -79,7 +81,6 @@
{
Object retPage = nextPage;
if ( retPage == null ) retPage = resources.createPageLink( resources.getPageName(), false );
- navigationManager.beginNavigation( resources );
}
nextPage = createPage;
}
@@ -89,7 +90,7 @@
resources.discardPersistentFieldChanges();
if ( selectedSettings != null )
{
- nextPage = selectedSettings.getSelectedReturnPage();
+ nextPage = navigationManager.endNavigation();
}
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -190,10 +190,10 @@
#foreach( $field in $table.LinkFields )
#if( !$field.isMultiple() )
cache.put( setterId + "§${field.Name}",
- new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( null, null, get${field.Name}Setter() ) );
+ new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( null, get${field.Name}Setter() ) );
#else
cache.put( setterId + "§${field.Name}",
- new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( null, get${field.Name}SetterList(), null ) );
+ new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( get${field.Name}SetterList(), null ) );
#end
#end
#if( $table.Types.size() > 1 )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -36,6 +36,7 @@
import ${ejbPackage}.client.${table.Name};
import org.equanda.t5gui.SelectedSettings;
import org.equanda.t5gui.SelectedSettingsForSelect;
+import org.equanda.t5nav.services.NavigationManager;
import ${package}.pages.${table.Name}EquandaAll;
import ${package}.pages.${table.Name}Edit;
import org.apache.tapestry5.ComponentResources;
@@ -75,6 +76,9 @@
@Inject
private ComponentResources resources;
+ @Inject
+ private NavigationManager navigationManager;
+
@Property
private ${table.Name} current;
@@ -101,18 +105,17 @@
Object onActionFromAdd( String setterId )
{
- return add( new SelectedSettingsForSelect<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), filter, setterId ) );
+ return add( new SelectedSettingsForSelect<${table.Name}>( filter, setterId ) );
}
Object onActionFromAdd()
{
- return add( new SelectedSettings<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), value, null, filter ) );
+ return add( new SelectedSettings<${table.Name}>( value, null, filter ) );
}
Object add( SelectedSettings<${table.Name}> selectedSettings )
{
+ navigationManager.beginNavigation( resources );
if ( embedded )
{
createPage.setObject( null );
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -41,6 +41,7 @@
import org.equanda.client.EquandaException;
import org.equanda.t5gui.*;
import org.equanda.t5gui.services.*;
+import org.equanda.t5nav.services.NavigationManager;
import org.equanda.tapestry5.components.Zone;
import ${package}.pages.${table.Name}EquandaAll;
import org.apache.tapestry5.*;
@@ -84,6 +85,9 @@
private ComponentResources resources;
@Inject
+ private NavigationManager navigationManager;
+
+ @Inject
private EquandaSetterCache cache;
public String getFilter()
@@ -118,15 +122,15 @@
Object onActionFromSelect( String setterId )
{
- select.setSelectedSettings( new SelectedSettingsForSelect<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), filter, setterId ) );
+ navigationManager.beginNavigation( resources );
+ select.setSelectedSettings( new SelectedSettingsForSelect<${table.Name}>( filter, setterId ) );
return select;
}
Object onActionFromSelect()
{
- select.setSelectedSettings( new SelectedSettings<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), null, setter, filter ) );
+ navigationManager.beginNavigation( resources );
+ select.setSelectedSettings( new SelectedSettings<${table.Name}>( null, setter, filter ) );
return select;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -127,8 +127,8 @@
Object onActionFromEdit( Uoid object )
{
+ navigationManager.beginNavigation( resources );
edit.onActivate( object );
- navigationManager.beginNavigation( resources );
return edit;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -61,8 +61,8 @@
Object onActionFromEdit( Uoid object )
{
+ navigationManager.beginNavigation( resources );
edit.onActivate( object );
- navigationManager.beginNavigation( resources );
return edit;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -48,7 +48,7 @@
public class ${table.Name}Edit
extends EditPageBase<${ejbPackage}.client.${table.Name}>
{
- public String getTitle()
+ public String getNavigationPageTitle()
{
return "${table.Name}, Edit";
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -2,7 +2,7 @@
#* @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:parameter name="title">${dollar}{title}</t:parameter>
+ <t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
</t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -287,9 +287,9 @@
try
{
+ navigationManager.beginNavigation( resources );
page.setIsGuiAdmin( isGuiAdmin.equals("off") ? false : true );
page.setRoleName( roleName.equals(noRoleIndicator) ? null : roleName );
- navigationManager.beginNavigation( resources );
}
catch( Exception e )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -63,7 +63,7 @@
{
private static final Logger equandaLog = Logger.getLogger( ${table.Name}${select.Name}.class );
- public String getTitle()
+ public String getNavigationPageTitle()
{
return "${table.Name}, select";
}
@@ -87,6 +87,9 @@
#foreach( $sel in $select.SelectionsTestAndParameterDeep )
+ public ${sel.Field.JavaFieldType} get${sel.CamelName}() { return getPageState().${sel.Name}; }
+ public void set${sel.CamelName}( ${sel.Field.JavaFieldType} obj ) { getPageState().${sel.Name} = obj; }
+
#set( $field = $sel.Field )
#if( $field.isLink() )
public SelectedSetter<${ejbPackage}.client.$field.FieldTypeName> get${field.Name}Setter()
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -2,7 +2,7 @@
#* @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:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, ${dollar}{equanda-message:select.${table.Name}.${select.Name}}</t:parameter>
+ <t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context">context info</span>
</t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-02-23 19:43:51 UTC (rev 1027)
@@ -145,9 +145,9 @@
if ( getIsGuiAdmin() )
{
navigationManager.beginNavigation( resources );
- nextPage = tablePage;
tablePage.initPage( getRoleName(), getIsGuiAdmin() );
tablePage.refreshBoxes();
+ nextPage = tablePage;
}
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettings.java 2009-02-23 19:43:51 UTC (rev 1027)
@@ -33,32 +33,24 @@
*/
public class SelectedSettings<T>
{
- private Object selectedReturnPage;
private List<T> selectedList;
private SelectedSetter<T> selectedSetter;
private String filter;
- public SelectedSettings( Object returnPage, List<T> list, SelectedSetter<T> ss )
+ public SelectedSettings( List<T> list, SelectedSetter<T> ss )
{
- selectedReturnPage = returnPage;
selectedList = list;
selectedSetter = ss;
}
- public SelectedSettings( Object returnPage, List<T> list, SelectedSetter<T> ss, String filter )
+ public SelectedSettings( List<T> list, SelectedSetter<T> ss, String filter )
{
- selectedReturnPage = returnPage;
selectedList = list;
selectedSetter = ss;
System.out.println( "Setting SelectedSettings filter to " + filter );
this.filter = filter;
}
- public Object getSelectedReturnPage()
- {
- return selectedReturnPage;
- }
-
public List<T> getSelectedList()
{
return selectedList;
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java 2009-02-23 19:43:51 UTC (rev 1027)
@@ -35,9 +35,9 @@
{
private String setterId;
- public SelectedSettingsForSelect( Object returnPage, String filter, String setterId )
+ public SelectedSettingsForSelect( String filter, String setterId )
{
- super( returnPage, null, null, filter );
+ super( null, null, filter );
this.setterId = setterId;
}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java 2009-02-23 19:43:51 UTC (rev 1027)
@@ -36,5 +36,5 @@
*
* @return page title
*/
- String getTitle();
+ String getNavigationPageTitle();
}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-23 13:55:39 UTC (rev 1026)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-23 19:43:51 UTC (rev 1027)
@@ -85,7 +85,7 @@
String pageName = resources.getPageName();
String title = pageName;
Component page = resources.getPage();
- if ( page instanceof PageWithTitle ) title = ( (PageWithTitle) page ).getTitle();
+ if ( page instanceof PageWithTitle ) title = ( (PageWithTitle) page ).getNavigationPageTitle();
context.setReturnTarget(
new NavigationTargetImpl( resources.createPageLink( pageName, false ), title ) );
return context;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-23 13:55:42
|
Revision: 1026
http://equanda.svn.sourceforge.net/equanda/?rev=1026&view=rev
Author: triathlon98
Date: 2009-02-23 13:55:39 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
small improvements
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/MemTabs.java
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/MemTabs.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/MemTabs.java 2009-02-23 13:52:07 UTC (rev 1025)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/MemTabs.java 2009-02-23 13:55:39 UTC (rev 1026)
@@ -26,7 +26,6 @@
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.Link;
-import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.RenderSupport;
import org.apache.tapestry5.annotations.AfterRender;
import org.apache.tapestry5.annotations.Environmental;
@@ -77,7 +76,7 @@
}
@AfterRender
- void afterRender( MarkupWriter writer )
+ void afterRender()
{
for ( int i = 0; i < getPanelCount() ; i++ )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-23 13:52:10
|
Revision: 1025
http://equanda.svn.sourceforge.net/equanda/?rev=1025&view=rev
Author: triathlon98
Date: 2009-02-23 13:52:07 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
EQ-321 view/edit switching should remember state
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-02-16 07:44:05 UTC (rev 1024)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-02-23 13:52:07 UTC (rev 1025)
@@ -74,6 +74,9 @@
public class Edit
extends ${package}.base.${table.VarName}.OneObjectComponentBase
{
+ private static final String DISPLAY_NONE = "display:none";
+ private static final String DISPLAY_BLOCK = "display:block";
+
@Environmental
private RenderSupport renderSupport;
@@ -116,6 +119,13 @@
@Parameter( value = "prop:true", defaultPrefix = BindingConstants.PROP )
private boolean canSwitch;
+ @Persist
+ private boolean initialized;
+#foreach( $page in $table.Pages )
+ @Persist
+ private boolean editPage${page.Name};
+#end
+
public boolean isCanSwitch()
{
return canSwitch;
@@ -136,15 +146,15 @@
editMode = value;
}
- public String getShowStyle()
- {
- return editMode ? "display:none" : "display:block";
- }
+ public String getShowStyle() { return editMode ? DISPLAY_NONE : DISPLAY_BLOCK; }
+ public String getEditStyle() {return editMode ? DISPLAY_BLOCK : DISPLAY_NONE; }
- public String getEditStyle()
- {
- return editMode ? "display:block" : "display:none";
- }
+#foreach( $page in $table.Pages )
+ public String getShowStyle${page.Name}() { return editPage${page.Name} ? DISPLAY_NONE : DISPLAY_BLOCK; }
+ public String getEditStyle${page.Name}() { return editPage${page.Name} ? DISPLAY_BLOCK : DISPLAY_NONE; }
+ public void onToEd${page.Name}() { editPage${page.Name} = true; }
+ public void onToDi${page.Name}() { editPage${page.Name} = false; }
+#end
public boolean isIncludeShow() { return canSwitch || !editMode; }
public boolean isIncludeEdit() { return canSwitch || editMode; }
@@ -166,6 +176,13 @@
void beginRender()
{
+ if ( !initialized )
+ {
+#foreach( $page in $table.Pages )
+ editPage${page.Name} = editMode;
+#end
+ initialized = true;
+ }
clientId = renderSupport.allocateClientId( resources );
if ( null == setterIdStart ) setterIdStart = clientId;
setterId = setterIdStart;
@@ -186,8 +203,10 @@
#foreach( $page in $table.Pages )
if ( isCanSwitch() )
{
- renderSupport.addScript( "$('%ste${page.Name}').observe(\"click\", function() { eqFFedit('%s','${page.Name}'); });", clientId, clientId );
- renderSupport.addScript( "$('%sts${page.Name}').observe(\"click\", function() { eqFFshow('%s','${page.Name}'); });", clientId, clientId );
+ renderSupport.addScript( "$('%ste${page.Name}').observe(\"click\", function() { eqFFedit('%s','${page.Name}','%s'); });",
+ clientId, clientId, resources.createEventLink( "ToEd${page.Name}" ).toAbsoluteURI() );
+ renderSupport.addScript( "$('%sts${page.Name}').observe(\"click\", function() { eqFFshow('%s','${page.Name}','%s'); });",
+ clientId, clientId, resources.createEventLink( "ToDi${page.Name}" ).toAbsoluteURI() );
}
#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2009-02-16 07:44:05 UTC (rev 1024)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2009-02-23 13:52:07 UTC (rev 1025)
@@ -1,6 +1,7 @@
#* @vtlmacrolibrary path="../render.vm" *#
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="pageindex" type="java.lang.Integer" *#
+#* @vtlvariable name="pageindex" type="java.lang.Integer" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
@@ -39,11 +40,11 @@
#end##end macro
<t:if test="isCanSwitch()">
-<a class="eqSwL" href="#" id="${dollar}{clientId}te${page.Name}" style="${showStyle}">${dollar}{equanda-message:toEdit}</a>
-<a class="eqSwL" href="#" id="${dollar}{clientId}ts${page.Name}" style="${editStyle}">${dollar}{equanda-message:toDisplay}</a>
+<a class="eqSwL" href="#" id="${dollar}{clientId}te${page.Name}" style="${dollar}{showStyle${page.Name}}">${dollar}{equanda-message:toEdit}</a>
+<a class="eqSwL" href="#" id="${dollar}{clientId}ts${page.Name}" style="${dollar}{editStyle${page.Name}}">${dollar}{equanda-message:toDisplay}</a>
</t:if>
<t:if test="isIncludeShow()">
-<div id="${dollar}{clientId}show${page.Name}" style="${showStyle}">
+<div id="${dollar}{clientId}show${page.Name}" style="${dollar}{showStyle${page.Name}}">
<div>
#set( $readOnlyContext = true )
#pageContent()
@@ -51,7 +52,7 @@
</div>
</t:if>
<t:if test="isIncludeEdit()">
-<div id="${dollar}{clientId}edit${page.Name}" style="${editStyle}">
+<div id="${dollar}{clientId}edit${page.Name}" style="${dollar}{editStyle${page.Name}}">
<div>
#set( $readOnlyContext = false )
#pageContent()
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-02-16 07:44:05 UTC (rev 1024)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-02-23 13:52:07 UTC (rev 1025)
@@ -159,8 +159,9 @@
* @param clientId
* @param page
*/
-function eqFFedit( clientId, page )
+function eqFFedit( clientId, page, link )
{
+ if ( link ) new Ajax.Request( link );
$( clientId + 'te' + page ).style.display = 'none';
$( clientId + 'ts' + page ).style.display = 'block';
if ( Prototype.Browser.IE )
@@ -179,8 +180,9 @@
* @param clientId
* @param page
*/
-function eqFFshow( clientId, page )
+function eqFFshow( clientId, page, link )
{
+ if ( link ) new Ajax.Request( link );
$( clientId + 'te' + page ).style.display = 'block';
$( clientId + 'ts' + page ).style.display = 'none';
if ( Prototype.Browser.IE )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-16 07:44:10
|
Revision: 1024
http://equanda.svn.sourceforge.net/equanda/?rev=1024&view=rev
Author: triathlon98
Date: 2009-02-16 07:44:05 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
doesn't work with "current" plugin, doesn't work with "fixed version either
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-16 07:35:09 UTC (rev 1023)
+++ trunk/pom.xml 2009-02-16 07:44:05 UTC (rev 1024)
@@ -186,7 +186,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <!--<version>2.0-beta-7</version>-->
<dependencies>
<dependency>
<groupId>org.staticwiki</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-16 07:35:15
|
Revision: 1023
http://equanda.svn.sourceforge.net/equanda/?rev=1023&view=rev
Author: triathlon98
Date: 2009-02-16 07:35:09 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
site improvements
Modified Paths:
--------------
trunk/pom.xml
trunk/src/site/site.xml
trunk/src/site/wiki/index.wiki
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
+++ trunk/pom.xml 2009-02-16 07:35:09 UTC (rev 1023)
@@ -186,6 +186,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
<dependencies>
<dependency>
<groupId>org.staticwiki</groupId>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2009-02-16 05:44:34 UTC (rev 1022)
+++ trunk/src/site/site.xml 2009-02-16 07:35:09 UTC (rev 1023)
@@ -49,6 +49,7 @@
<menu name="tapestry5">
<item name="tapestry5" href="equanda-tapestry5/index.html"/>
+ <item name="navigation" href="equanda-t5navigation/index.html"/>
</menu>
<menu name="t5gui">
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2009-02-16 05:44:34 UTC (rev 1022)
+++ trunk/src/site/wiki/index.wiki 2009-02-16 07:35:09 UTC (rev 1023)
@@ -118,13 +118,14 @@
equanda contains several modules.
- client : client side code. This module needs to be included by the client components for equanda applications.
-- server : server side code which is needed for the equanda framework
+- server : server side code which is needed for the equanda framework.
- [generate|generate.html] : module which handles the code generation, processing the domain model and contains the templates.
-- maven-plugin : maven plugin which allows the generation to be done as part of a maven build cycle, but also for editing the translations and doing a database update
-- [tapestry5|equanda-tapestry5/index.html] : collection of tapestry5 components which can also be used outside of equanda applications
-- [t5gui|t5gui.html] : collection of tapestry5 components which are specific for equanda generated applications
-- tool : tool provided for import, export, remote printing of reports
-- util : contains several utility classes containing (amongst others) ean128 barcode support, [FScript|http://fscript.sf.net/] extensions, useful Swing classes
+- maven-plugin : maven plugin which allows the generation to be done as part of a maven build cycle, but also for editing the translations and doing a database update.
+- [tapestry5|equanda-tapestry5/index.html] : collection of tapestry5 components which can also be used outside of equanda applications.
+- [t5navigation|equanda-t5navigation/index.html] : tapestry5 extension which allows easy building of breadcrumbs, helping in navigations and removes a limitations from tapestry's default persistence mechanism.
+- [t5gui|t5gui.html] : collection of tapestry5 components which are specific for equanda generated applications.
+- tool : tool provided for import, export, remote printing of reports.
+- util : contains several utility classes containing (amongst others) ean128 barcode support, [FScript|http://fscript.sf.net/] extensions, useful Swing classes.
- test : this module is used to do integration testing. It is only included when the "-Dfulltest" switch is used in maven.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-16 05:44:36
|
Revision: 1022
http://equanda.svn.sourceforge.net/equanda/?rev=1022&view=rev
Author: triathlon98
Date: 2009-02-16 05:44:34 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
move on to 0.9.4-SNAPSHOT
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-client/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-dm/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-generate/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-maven-plugin/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-server/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-t5gui/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-t5gui</name>
<build>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-t5navigation/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-t5navigation</name>
<build>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-tapestry5/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-tapestry5</name>
<build>
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-test</name>
<description>tests for equanda</description>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-core/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-test/test-test/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>test-test</name>
<description>test test</description>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-tool/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/equanda-util/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-15 19:59:11 UTC (rev 1021)
+++ trunk/pom.xml 2009-02-16 05:44:34 UTC (rev 1022)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.3</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>equanda</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-15 19:59:14
|
Revision: 1021
http://equanda.svn.sourceforge.net/equanda/?rev=1021&view=rev
Author: triathlon98
Date: 2009-02-15 19:59:11 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
release of 0.9.3
Added Paths:
-----------
tags/equanda-0.9.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-15 19:58:25
|
Revision: 1020
http://equanda.svn.sourceforge.net/equanda/?rev=1020&view=rev
Author: triathlon98
Date: 2009-02-15 19:58:16 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
prepare for release of 0.9.3
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-tapestry5/src/site/wiki/index.wiki
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
trunk/src/site/wiki/gettingstarted.wiki
trunk/src/site/wiki/plugin/archetype.wiki
trunk/src/site/wiki/roadmap.wiki
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-client/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-dm/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-generate/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-maven-plugin/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -477,7 +477,7 @@
</profiles>
<properties>
- <equanda-version>0.9.2</equanda-version>
+ <equanda-version>0.9.3</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
<tapestry-version>5.0.18</tapestry-version>
<chenillekit-version>1.0.0</chenillekit-version>
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-server/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-t5gui/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-t5gui</name>
<build>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-t5navigation/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-t5navigation</name>
<build>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-tapestry5/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-tapestry5</name>
<build>
Modified: trunk/equanda-tapestry5/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-02-15 19:58:16 UTC (rev 1020)
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
- <version>0.9.2</version>
+ <version>0.9.3</version>
</dependency>
{code}
For this to work, you need to also include the [PROGS|http://www.progs.be/] maven repository.
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-test</name>
<description>tests for equanda</description>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-core/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-test/test-test/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>test-test</name>
<description>test test</description>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-tool/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/equanda-util/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/pom.xml 2009-02-15 19:58:16 UTC (rev 1020)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.3</version>
<name>equanda</name>
<description>
Modified: trunk/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/src/site/wiki/gettingstarted.wiki 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/src/site/wiki/gettingstarted.wiki 2009-02-15 19:58:16 UTC (rev 1020)
@@ -5,7 +5,7 @@
{code}
mvn equanda:archetype
-DgroupId=org.equanda.example -DartifactId=example
- -DarchetypeVersion=0.9.2 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin -DremoteRepositories=http://maven.progs.be/m2repo
+ -DarchetypeVersion=0.9.3 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin -DremoteRepositories=http://maven.progs.be/m2repo
{code}
This will create a mostly empty example project in the "example" subdirectory. The base package for the classes is "org.equanda.example".
Modified: trunk/src/site/wiki/plugin/archetype.wiki
===================================================================
--- trunk/src/site/wiki/plugin/archetype.wiki 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/src/site/wiki/plugin/archetype.wiki 2009-02-15 19:58:16 UTC (rev 1020)
@@ -9,7 +9,7 @@
{code}
mvn equanda:archetype
-DgroupId=com.mycompany -DartifactId=example
- -DarchetypeVersion=0.9.2 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin
+ -DarchetypeVersion=0.9.3 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin
{code}
All the parameters on the last line are used internally by maven.
Modified: trunk/src/site/wiki/roadmap.wiki
===================================================================
--- trunk/src/site/wiki/roadmap.wiki 2009-02-15 19:44:10 UTC (rev 1019)
+++ trunk/src/site/wiki/roadmap.wiki 2009-02-15 19:58:16 UTC (rev 1020)
@@ -3,12 +3,14 @@
equanda version 0.9 is the first version which includes a user interface which is built using tapestry 5 and has a reasonable amount of documentation.
With 0.9.1 a lot of improvements were made to make it more feature complete and more reliable.
-Most important improvements for 0.9.2 include fine grained access control configurations, a lot of user interface improvements, new unique-for constraint, new TreeTable component, ajax enabled textfield component.
+Version 0.9.2 included fine grained access control configurations, a lot of user interface improvements, new unique-for constraint, new TreeTable component, ajax enabled textfield component.
+For 0.9.3 the major change is the introduction of the t5navigation module.
For changes see the release notes
- changes in [0.9|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10001&styleName=Html&projectId=10000&Create=Create]
- changes in [0.9.1|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10020&styleName=Html&projectId=10000&Create=Create]
- changes in [0.9.2|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10024&styleName=Html&projectId=10000&Create=Create]
+- changes in [0.9.3|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10030&styleName=Html&projectId=10000&Create=Create]
This version is very useable and reliable, however we still have a lot of stuff we want to implement before we can call it version 1.0.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-15 19:44:12
|
Revision: 1019
http://equanda.svn.sourceforge.net/equanda/?rev=1019&view=rev
Author: triathlon98
Date: 2009-02-15 19:44:10 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
comments about tapestry compatibility
Modified Paths:
--------------
trunk/equanda-t5navigation/src/site/wiki/index.wiki
Modified: trunk/equanda-t5navigation/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-15 19:37:56 UTC (rev 1018)
+++ trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-15 19:44:10 UTC (rev 1019)
@@ -8,12 +8,16 @@
A demonstration of these features can be found at the [equanda tapestry5 components demo|http://app.spoon-it.be/t5example/pagea].
+Note that this module uses internal classes from tapestry. Therefore version 0.9.3 works on the GA version of tapestry 5 (5.0.18). Version 0.9.4 and following will support tapestry 5.1.
+
+
h2. Interactions
There are three main interactions when using this module.
The examples here assume you have an actionlink in your template. We show the event code.
The first two cases don't need any code if you use the [pagelink|pagelink.html] component.
+
h3. Go to another page, creating a new navigation context, allowing return (chained)
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-15 19:38:00
|
Revision: 1018
http://equanda.svn.sourceforge.net/equanda/?rev=1018&view=rev
Author: triathlon98
Date: 2009-02-15 19:37:56 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
EQ-320 fix contribution of translators
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/services/EquandaModule.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java 2009-02-15 12:04:15 UTC (rev 1017)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java 2009-02-15 19:37:56 UTC (rev 1018)
@@ -144,9 +144,9 @@
*
* @param configuration configuration to add to
*/
- public static void contributeTranslatorDefaultSource( MappedConfiguration<Class, Translator> configuration )
+ public static void contributeTranslatorSource( Configuration<Translator> configuration )
{
- configuration.add( Uoid.class, new UoidTranslator() );
+ configuration.add( new UoidTranslator() );
}
/**
@@ -262,6 +262,7 @@
*
* @param configuration configuration to add to
* @param messagesSource Equanda Message Source
+ * @param loginInfo login info service
*/
public static void contributeBindingSource( MappedConfiguration<String, BindingFactory> configuration,
EquandaMessagesSource messagesSource, LoginInfoService loginInfo )
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/services/EquandaModule.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/services/EquandaModule.java 2009-02-15 12:04:15 UTC (rev 1017)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/services/EquandaModule.java 2009-02-15 19:37:56 UTC (rev 1018)
@@ -37,7 +37,6 @@
import org.equanda.tapestry5.translators.TimestampTranslator;
import java.io.IOException;
-import java.sql.Timestamp;
/**
* Module definition
@@ -59,12 +58,12 @@
*
* @param configuration configuration to add to
*/
- public static void contributeTranslatorDefaultSource( MappedConfiguration<Class, Translator> configuration )
+ public static void contributeTranslatorSource( Configuration<Translator> configuration )
{
- configuration.add( Double.class, new DoubleTranslator() );
- configuration.add( Timestamp.class, new TimestampTranslator() );
- configuration.add( Boolean.class, new BooleanTranslator() );
- configuration.add( String.class, new StringTranslator() );
+ configuration.add( new DoubleTranslator() );
+ configuration.add( new TimestampTranslator() );
+ configuration.add( new BooleanTranslator() );
+ configuration.add( new StringTranslator() );
}
public static void contributeFactoryDefaults( MappedConfiguration<String, String> configuration )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-15 12:04:18
|
Revision: 1017
http://equanda.svn.sourceforge.net/equanda/?rev=1017&view=rev
Author: triathlon98
Date: 2009-02-15 12:04:15 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
fix in adsense content
Modified Paths:
--------------
t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2009-02-10 19:48:51 UTC (rev 1016)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2009-02-15 12:04:15 UTC (rev 1017)
@@ -54,10 +54,12 @@
<div id="layout-info">
<script type="text/javascript"><!--
google_ad_client = "pub-3075143938601956";
-google_ad_slot = "9592078419";
+/* 728x90, gemaakt 15-2-09, t5example */
+google_ad_slot = "2370093124";
google_ad_width = 728;
google_ad_height = 90;
-//--></script>
+//-->
+</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-10 19:48:57
|
Revision: 1016
http://equanda.svn.sourceforge.net/equanda/?rev=1016&view=rev
Author: triathlon98
Date: 2009-02-10 19:48:51 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
EQ-297 navigation module, apply in templates
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.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/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/pages/Start.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java
trunk/equanda-t5navigation/src/site/wiki/index.wiki
Modified: trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-02-10 19:48:51 UTC (rev 1016)
@@ -44,11 +44,4 @@
* @param roleName The name of the role to be used, or null if no role selected
*/
void setRoleName( String roleName );
-
- /**
- * Set the return page which is displayed when OK/Cancel is selected
- *
- * @param page The page to be set as the return page.
- */
- void setReturnPage( Object page );
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -45,7 +45,9 @@
import org.equanda.persistence.Uoid;
import org.equanda.persistence.SelectorsState;
import org.equanda.t5gui.*;
+import org.equanda.t5nav.PageWithTitle;
import org.equanda.t5gui.services.EquandaSetterCache;
+import org.equanda.t5nav.services.NavigationManager;
import org.equanda.tapestry5.data.MessageContainer;
import org.equanda.util.ExceptionUtil;
@@ -54,13 +56,11 @@
* Base class for edit page
*/
public abstract class EditPageBase<T extends EquandaProxy>
+ implements PageWithTitle
{
private static final Logger log = Logger.getLogger( EditPageBase.class );
private static final String REDIRECT_KEEP_EXCEPTION_KEY = "equanda-redirect-keep-exception";
- @Persist
- private Object returnPage;
-
private Object nextPage; // page to move to after submit
@Persist
@@ -83,6 +83,9 @@
@Inject
private EquandaSetterCache cache;
+ @Inject
+ private NavigationManager navigationManager;
+
public void setObject( T object )
{
this.object = object;
@@ -138,20 +141,8 @@
final Uoid onPassivate() { return getObject() != null ? (Uoid) getObject().getId() : null; }
- public Object getReturnPage()
- {
- return returnPage;
- }
-
- public void setReturnPage( Object retPage )
- {
- returnPage = retPage;
- selectedSettings = null;
- }
-
public void setSelectedSettings( SelectedSettings<T> setter )
{
- returnPage = null;
selectedSettings = setter;
}
@@ -186,7 +177,7 @@
}
else
{
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
}
catch ( EquandaException epe )
@@ -211,7 +202,7 @@
try
{
getObject().equandaReset();
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
catch ( EquandaException epe ) { log.warn( epe ); }
}
@@ -223,6 +214,7 @@
{
log.info( "going to delete " + getObject() );
getObject().removeEntityBean();
+ Object returnPage = navigationManager.endNavigation();
nextPage = returnPage == null ? getAllPage() : returnPage;
}
catch ( EquandaException epe )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -32,24 +32,29 @@
package ${package}.base;
-import org.equanda.t5gui.ListGetter;
-import org.equanda.t5gui.SelectedSettings;
import org.apache.log4j.Logger;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.persistence.EquandaProxy;
+import org.equanda.t5gui.ListGetter;
+import org.equanda.t5gui.SelectedSettings;
+import org.equanda.t5nav.PageWithTitle;import org.equanda.t5nav.services.NavigationManager;
/**
* Select page base class.
*/
public abstract class SelectPageBase<T extends EquandaProxy>
+ implements PageWithTitle
{
private static final Logger log = Logger.getLogger( SelectPageBase.class );
@Inject
private ComponentResources resources;
+ @Inject
+ private NavigationManager navigationManager;
+
@Persist
private SelectedSettings selectedSettings;
@@ -74,13 +79,11 @@
{
Object retPage = nextPage;
if ( retPage == null ) retPage = resources.createPageLink( resources.getPageName(), false );
- createPage.setReturnPage( retPage );
+ navigationManager.beginNavigation( resources );
}
nextPage = createPage;
}
-
-
final public void onSelectedFromCancel()
{
resources.discardPersistentFieldChanges();
@@ -90,8 +93,6 @@
}
}
-
-
final public Object onSubmit()
{
if ( null != nextPage ) resources.discardPersistentFieldChanges();
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -43,6 +43,7 @@
import ${package}.pages.${table.Name}Edit;
import org.apache.log4j.Logger;
import org.equanda.t5gui.services.EquandaMessages;
+import org.equanda.t5nav.services.NavigationManager;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.InjectPage;
import org.apache.tapestry5.annotations.Retain;
@@ -72,6 +73,9 @@
@Inject
private EquandaMessages messages;
+ @Inject
+ private NavigationManager navigationManager;
+
@Retain
private BeanModel<${table.Name}> model;
@@ -124,7 +128,7 @@
Object onActionFromEdit( Uoid object )
{
edit.onActivate( object );
- edit.setReturnPage( resources.createPageLink( resources.getPageName(), false ) );
+ navigationManager.beginNavigation( resources );
return edit;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -40,6 +40,7 @@
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ComponentResources;
import org.equanda.persistence.Uoid;
+import org.equanda.t5nav.services.NavigationManager;
/**
* Object (short) display component
@@ -55,10 +56,13 @@
@Inject
private ComponentResources resources;
+ @Inject
+ private NavigationManager navigationManager;
+
Object onActionFromEdit( Uoid object )
{
edit.onActivate( object );
- edit.setReturnPage( resources.createPageLink( resources.getPageName(), false ) );
+ navigationManager.beginNavigation( resources );
return edit;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -48,6 +48,11 @@
public class ${table.Name}Edit
extends EditPageBase<${ejbPackage}.client.${table.Name}>
{
+ public String getTitle()
+ {
+ return "${table.Name}, Edit";
+ }
+
public ${ejbPackage}.client.${table.Name} createObject()
throws EquandaException
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -2,7 +2,7 @@
#* @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:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, Edit</t:parameter>
+ <t:parameter name="title">${dollar}{title}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
</t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -48,12 +48,13 @@
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.ComponentSource;
import org.apache.tapestry5.runtime.Component;
-import org.equanda.client.EquandaException;
-import org.equanda.persistence.*;
-import org.equanda.t5gui.services.LoginInfoService;
import org.equanda.auth.ParsedAuthAndConfigProvider;
import org.equanda.client.AuthAndConfigProvider;
import org.equanda.client.AuthAndConfigPages;
+import org.equanda.client.EquandaException;
+import org.equanda.persistence.*;
+import org.equanda.t5gui.services.LoginInfoService;
+import org.equanda.t5nav.services.NavigationManager;
$!{engine.getTemplateConfig("page-class-annotation" )}
@IncludeJavaScriptLibrary( { "classpath:/org/equanda/tapestry5/resources/authandconfig.js" } )
@@ -71,6 +72,9 @@
@Inject
private ComponentSource source;
+
+ @Inject
+ private NavigationManager navigationManager;
@Persist
private String roleName;
@@ -99,18 +103,7 @@
{
return getIsGuiAdmin() && (getRoleName() != null);
}
-
- @Persist
- private Object returnPage;
- public Object getReturnPage()
- {
- return returnPage;
- }
- public void setReturnPage( Object returnPage )
- {
- this.returnPage = returnPage;
- }
-
+
private Object nextPage;
public void initPage( String roleName, boolean isGuiAdmin )
@@ -192,7 +185,7 @@
setAuths( "${table.Name}", $readBox, $writeBox, $deleteBox );
#end
commitAuths();
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
catch ( EquandaException epe )
{
@@ -215,7 +208,7 @@
public void onSelectedFromCancel()
{
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
public Object onSubmit()
@@ -296,7 +289,7 @@
{
page.setIsGuiAdmin( isGuiAdmin.equals("off") ? false : true );
page.setRoleName( roleName.equals(noRoleIndicator) ? null : roleName );
- page.setReturnPage( resources.getPage() );
+ navigationManager.beginNavigation( resources );
}
catch( Exception e )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -63,6 +63,11 @@
{
private static final Logger equandaLog = Logger.getLogger( ${table.Name}${select.Name}.class );
+ public String getTitle()
+ {
+ return "${table.Name}, select";
+ }
+
@Inject
private ComponentResources resources;
@@ -82,9 +87,6 @@
#foreach( $sel in $select.SelectionsTestAndParameterDeep )
- public ${sel.Field.JavaFieldType} get${sel.CamelName}() { return getPageState().${sel.Name}; }
- public void set${sel.CamelName}( ${sel.Field.JavaFieldType} obj ) { getPageState().${sel.Name} = obj; }
-
#set( $field = $sel.Field )
#if( $field.isLink() )
public SelectedSetter<${ejbPackage}.client.$field.FieldTypeName> get${field.Name}Setter()
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -48,9 +48,10 @@
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
+import org.equanda.t5gui.services.LoginInfoService;
+import org.equanda.t5nav.services.NavigationManager;
import org.equanda.tapestry5.base.EquandaOptionModel;
import org.equanda.tapestry5.base.EquandaSelectModel;
-import org.equanda.t5gui.services.LoginInfoService;
import java.util.*;
@@ -64,7 +65,10 @@
@Inject
private ComponentResources resources;
-
+
+ @Inject
+ private NavigationManager navigationManager;
+
@InjectPage
private AuthAndConfigTables tablePage;
@@ -138,12 +142,13 @@
public void onSelectedFromOk()
throws EquandaException
{
- if( getIsGuiAdmin() )
+ if ( getIsGuiAdmin() )
+ {
+ navigationManager.beginNavigation( resources );
nextPage = tablePage;
-
- tablePage.initPage( getRoleName(), getIsGuiAdmin() );
- tablePage.refreshBoxes();
- tablePage.setReturnPage( resources.getPage() );
+ tablePage.initPage( getRoleName(), getIsGuiAdmin() );
+ tablePage.refreshBoxes();
+ }
}
public Object onSuccess()
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-02-10 19:48:51 UTC (rev 1016)
@@ -55,8 +55,8 @@
import org.equanda.client.LoginInfo;
import org.equanda.persistence.*;
import org.equanda.t5gui.services.LoginInfoService;
+import org.equanda.t5nav.services.NavigationManager;
-
$!{engine.getTemplateConfig("page-class-annotation" )}
@IncludeJavaScriptLibrary( { "classpath:/org/equanda/tapestry5/resources/authandconfig.js" } )
public class AuthAndConfig
@@ -73,20 +73,12 @@
@Inject
private ComponentResources resources;
+ @Inject
+ private NavigationManager navigationManager;
+
@InjectPage
private AuthAndConfigTables tablesPage;
- @Persist
- private Object returnPage;
- public Object getReturnPage()
- {
- return returnPage;
- }
- public void setReturnPage( Object returnPage )
- {
- this.returnPage = returnPage;
- }
-
private Object nextPage;
@Persist
@@ -282,7 +274,7 @@
setAuths( "action.${table.Name}.${action.Name}", $actionBox, false, false, false, false );
#end
commitAuths();
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
catch ( EquandaException epe )
{
@@ -304,7 +296,7 @@
}
public void onSelectedFromCancel(){
- nextPage = returnPage;
+ nextPage = navigationManager.endNavigation();
}
public Object onSubmit(){
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-02-10 19:48:51 UTC (rev 1016)
@@ -88,6 +88,10 @@
</dependency>
<dependency>
<groupId>org.equanda</groupId>
+ <artifactId>equanda-t5navigation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
</dependency>
<dependency>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/pages/Start.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/pages/Start.java 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/pages/Start.java 2009-02-10 19:48:51 UTC (rev 1016)
@@ -20,21 +20,16 @@
public class Start
implements EquandaMessagesGroup
{
-
@Inject
- private EquandaMessages messages1;
+ private EquandaMessages messages;
@Inject
- private EquandaMessages messages2;
-
- @Inject
private Logger logger;
@BeginRender
public void beginRender()
{
- logger.info( "Value for key Add-Continue from messages1 is: " + messages1.get( "Add-Continue" ) );
- logger.info( "Value for key Add-Continue from messages2 is: " + messages2.get( "Add-Continue" ) );
+ logger.info( "Value for key Add-Continue from messages1 is: " + messages.get( "Add-Continue" ) );
}
public Date getCurrentTime()
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-10 19:48:51 UTC (rev 1016)
@@ -115,6 +115,11 @@
return tracker;
}
+ public Object endNavigation()
+ {
+ return endNavigation( null );
+ }
+
/**
* Removes the NavigationContext from the NavigationTracker and
* invalidates it.
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationPersistentFieldStrategy.java 2009-02-10 19:48:51 UTC (rev 1016)
@@ -78,7 +78,7 @@
}
context.addPersistentField( pageName,
- new NavigationPersistentFieldChange( componentId, fieldName, newValue ) );
+ new NavigationPersistentFieldChange( componentId, fieldName, newValue ) );
}
private NavigationContext getContextFromASO()
@@ -93,6 +93,7 @@
public void discardChanges( String pageName )
{
- getContextFromASO().removeAllFields( pageName );
+ NavigationContext context = getContextFromASO();
+ if ( null != context ) context.removeAllFields( pageName );
}
}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java 2009-02-10 19:48:51 UTC (rev 1016)
@@ -76,6 +76,13 @@
NavigationContext beginNavigation( ComponentResources resources );
/**
+ * ends a mini-conversation, invalidating the current navigation context
+ *
+ * @return redirect target if there was one
+ */
+ Object endNavigation();
+
+ /**
* ends a mini-conversation
*
* @param navigation to invalidate
Modified: trunk/equanda-t5navigation/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-09 17:55:50 UTC (rev 1015)
+++ trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-10 19:48:51 UTC (rev 1016)
@@ -83,7 +83,7 @@
Object onActionFromReturn()
{
- return navigationManager.endNavigation( null );
+ return navigationManager.endNavigation();
}
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-09 17:55:55
|
Revision: 1015
http://equanda.svn.sourceforge.net/equanda/?rev=1015&view=rev
Author: triathlon98
Date: 2009-02-09 17:55:50 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
EQ-297 test new NavigationManager methods
Modified Paths:
--------------
t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java 2009-02-09 16:49:37 UTC (rev 1014)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/pages/PageA.java 2009-02-09 17:55:50 UTC (rev 1015)
@@ -29,6 +29,7 @@
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.example.t5.data.MsgGenerator;
+import org.equanda.t5nav.PageWithTitle;
import org.equanda.t5nav.services.NavigationManager;
/**
@@ -37,6 +38,7 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class PageA
+ implements PageWithTitle
{
@Inject
private ComponentResources resources;
@@ -53,6 +55,14 @@
@InjectPage
private PageC pageC;
+ private String title;
+
+ public String getTitle()
+ {
+ if ( null == title ) title = "A, " + MsgGenerator.get() + " persisted=" + getPersistedValue();
+ return title;
+ }
+
public String getPersistedValue()
{
return persistedValue;
@@ -65,10 +75,8 @@
Object onActionFromPageBNavigation()
{
- String msg = "A, " + MsgGenerator.get();
- navigationManager.beginNavigation( resources.createPageLink( resources.getPageName(), false ),
- msg + " persisted=" + getPersistedValue() );
- pageB.setPersistedValue( "from " + msg );
+ navigationManager.beginNavigation( resources );
+ pageB.setPersistedValue( "from " + getTitle().substring( 0, getTitle().indexOf( " persisted" ) ) );
return pageB;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-09 16:49:40
|
Revision: 1014
http://equanda.svn.sourceforge.net/equanda/?rev=1014&view=rev
Author: triathlon98
Date: 2009-02-09 16:49:37 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
EQ-297 navigation module, PageWithTitle interface, extra NavigationManager options
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java
trunk/equanda-t5navigation/src/site/wiki/index.wiki
Added Paths:
-----------
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-02-09 11:39:37 UTC (rev 1013)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-02-09 16:49:37 UTC (rev 1014)
@@ -290,6 +290,11 @@
</dependency>
<dependency>
<groupId>org.equanda</groupId>
+ <artifactId>equanda-t5navigation</artifactId>
+ <version>#literal()${equanda-version}#end</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<version>#literal()${equanda-version}#end</version>
</dependency>
Added: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java (rev 0)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/PageWithTitle.java 2009-02-09 16:49:37 UTC (rev 1014)
@@ -0,0 +1,40 @@
+/**
+ * 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.t5nav;
+
+/**
+ * Marker interface which indicates that the page title can be queried.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface PageWithTitle
+{
+ /**
+ * Get the title for this page. This title will typically be used to refer to this page in a breadcrumbs component.
+ *
+ * @return page title
+ */
+ String getTitle();
+}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-09 11:39:37 UTC (rev 1013)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/internal/NavigationManagerImpl.java 2009-02-09 16:49:37 UTC (rev 1014)
@@ -24,7 +24,10 @@
package org.equanda.t5nav.internal;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.ApplicationStateManager;
+import org.equanda.t5nav.PageWithTitle;
import org.equanda.t5nav.services.*;
/**
@@ -68,6 +71,26 @@
return context;
}
+
+ public NavigationContext beginNavigation( NavigationTarget returnTarget )
+ {
+ NavigationContext context = beginNavigation( true );
+ context.setReturnTarget( returnTarget );
+ return context;
+ }
+
+ public NavigationContext beginNavigation( ComponentResources resources )
+ {
+ NavigationContext context = beginNavigation( true );
+ String pageName = resources.getPageName();
+ String title = pageName;
+ Component page = resources.getPage();
+ if ( page instanceof PageWithTitle ) title = ( (PageWithTitle) page ).getTitle();
+ context.setReturnTarget(
+ new NavigationTargetImpl( resources.createPageLink( pageName, false ), title ) );
+ return context;
+ }
+
/**
* creates a NavigationTracker if it does not already exist within
* the session. The ApplicationStateManager is used to persist the
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java 2009-02-09 11:39:37 UTC (rev 1013)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationManager.java 2009-02-09 16:49:37 UTC (rev 1014)
@@ -24,6 +24,8 @@
package org.equanda.t5nav.services;
+import org.apache.tapestry5.ComponentResources;
+
/**
* The navigation manager is used to start and end navigation contexts (like conversations)
*
@@ -37,7 +39,7 @@
*
* @return newly created navigation context
*/
- public NavigationContext beginNavigation();
+ NavigationContext beginNavigation();
/**
* creates a new navigation. You can choose whether navigations are "chained", that is whether you can get back
@@ -46,7 +48,7 @@
* @param chain should the current mini-conversation be restored when the new one is invalidated
* @return newly created navigation context
*/
- public NavigationContext beginNavigation( boolean chain );
+ NavigationContext beginNavigation( boolean chain );
/**
* Creates a new "chained" navigation, specifying the link and title of the return page.
@@ -55,13 +57,29 @@
* @param title title for the link page, to display in breadcrumbs components
* @return newly created navigation context
*/
- public NavigationContext beginNavigation( Object link, String title );
+ NavigationContext beginNavigation( Object link, String title );
/**
+ * Creates a new "chained" navigation, specifying the link and title of the return page.
+ *
+ * @param returnTarget intended return target
+ * @return newly created navigation context
+ */
+ NavigationContext beginNavigation( NavigationTarget returnTarget );
+
+ /**
+ * Creates a new "chained" navigation, specifying the link and title of the return page.
+ *
+ * @param resources ComponentResources used for obtaining return link and page name
+ * @return newly created navigation context
+ */
+ NavigationContext beginNavigation( ComponentResources resources );
+
+ /**
* ends a mini-conversation
*
* @param navigation to invalidate
* @return redirect target if there was one
*/
- public Object endNavigation( NavigationContext navigation );
+ Object endNavigation( NavigationContext navigation );
}
\ No newline at end of file
Modified: trunk/equanda-t5navigation/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-09 11:39:37 UTC (rev 1013)
+++ trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-09 16:49:37 UTC (rev 1014)
@@ -18,6 +18,9 @@
{code}
@Inject
+private ComponentResources resources;
+
+@Inject
private NavigationManager navigationManager;
@InjectPage
@@ -31,7 +34,30 @@
}
{code}
+This can also be done shorter if your page class implements "PageWithTitle".
+{code}
+@Inject
+private ComponentResources resources;
+
+@Inject
+private NavigationManager navigationManager;
+
+@InjectPage
+private PageB pageB;
+
+public String getTitle() {
+ return "title for return link";
+}
+
+Object onActionFromPageBNavigation()
+{
+ navigationManager.beginNavigation( resources );
+ return pageB;
+}
+{code}
+
+
h3. Go to another page, creating a new navigation context, not chained
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-09 12:22:26
|
Revision: 1013
http://equanda.svn.sourceforge.net/equanda/?rev=1013&view=rev
Author: triathlon98
Date: 2009-02-09 11:39:37 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
EQ-297 base demo of navigation support, docs
Modified Paths:
--------------
t5-equanda-example/src/main/java/org/equanda/example/t5/components/Breadcrumbs.java
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/components/Breadcrumbs.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/components/Breadcrumbs.java 2009-02-09 11:38:40 UTC (rev 1012)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/components/Breadcrumbs.java 2009-02-09 11:39:37 UTC (rev 1013)
@@ -48,19 +48,15 @@
public NavigationTarget[] getBreadcrumbs()
{
- System.out.println( "getBreadcrumbs" );
if ( !asoManager.exists( NavigationContext.class ) ) return null;
NavigationContext currNav = asoManager.get( NavigationContext.class );
- System.out.println( "getBreadcrumbs " + currNav.getRecentReturnTargets() );
return currNav.getRecentReturnTargets();
}
public Object onActionFromBreadcrumb( int index )
{
NavigationContext currNav = asoManager.get( NavigationContext.class );
- System.out.println( "onActionFromBreadcrumb "+index+" "+currNav );
if ( null == currNav ) return null;
return currNav.getRecentReturnTargets()[index].getLink();
}
-
}
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml 2009-02-09 11:38:40 UTC (rev 1012)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml 2009-02-09 11:39:37 UTC (rev 1013)
@@ -2,6 +2,11 @@
<h1>Page A</h1>
+ <p>Demonstration of the <a href="http://equanda.org/equanda-t5navigation/">equanda-t5navigation module</a>.</p>
+ <p>Use the links below to switch between three demo pages. A breadcrumbs component shows the last couple of links,
+ and allows you to return to any page. Each page has it's own state. Explicit return to the previous page is also
+ possible (again reverting persistent state).</p>
+
<p>Persisted value is : <b>${persistedValue}</b></p>
<t:breadcrumbs/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-09 12:22:23
|
Revision: 1012
http://equanda.svn.sourceforge.net/equanda/?rev=1012&view=rev
Author: triathlon98
Date: 2009-02-09 11:38:40 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
EQ-297 navigation module, docs
Modified Paths:
--------------
trunk/equanda-t5navigation/src/site/site.xml
Added Paths:
-----------
trunk/equanda-t5navigation/src/site/
trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki
trunk/equanda-t5navigation/src/site/wiki/index.wiki
trunk/equanda-t5navigation/src/site/wiki/pagelink.wiki
Removed Paths:
-------------
trunk/equanda-t5navigation/src/main/site/
Modified: trunk/equanda-t5navigation/src/site/site.xml
===================================================================
--- trunk/equanda-t5navigation/src/main/site/site.xml 2009-02-04 10:11:50 UTC (rev 1006)
+++ trunk/equanda-t5navigation/src/site/site.xml 2009-02-09 11:38:40 UTC (rev 1012)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="equanda-tapestry5">
+ <body>
+ <links>
+ <item name="equanda" href="http://www.equanda.org/"/>
+ <item name="staticwiki" href="http://www.staticwiki.org/"/>
+ </links>
+
+ <menu name="t5navigation">
+ <item name="Introduction" href="index.html"/>
+ <item name="Components" collapse="false">
+ <item name="PageLink" href="pagelink.html"/>
+ <item name="Breadcrumbs" href="breadcrumbs.html"/>
+ </item>
+ </menu>
+
+ </body>
+</project>
Added: trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki (rev 0)
+++ trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki 2009-02-09 11:38:40 UTC (rev 1012)
@@ -0,0 +1,71 @@
+h1. Breadcrumbs
+
+No, the library does not actually contain a breadcrumbs component. The layout is too application specific for a general component to be useful.
+However it is very easy to create your own breadcrumbs component, based on the t5navigation services.
+
+You can decide the number of items to be included in the breadcrumbs by including the following in your applicatin module class.
+
+{code}
+public static void contributeApplicationDefaults( MappedConfiguration<String, String> configuration )
+{
+ configuration.add( NavigationConstants.NAVIGATION_RETURN_CACHE_SIZE, "5" );
+}
+{code}
+
+If you don't configure anything, up to five items will be included.
+
+You define a template for your breadcrumbs component. You can go wild and use any layout and style you prefer, but it can be as simple as he following.
+
+{code}
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <fieldset>
+ <legend>breadcrumbs</legend>
+ <ul>
+ <t:loop source="breadcrumbs" value="current" index="index">
+ <li><t:actionlink t:id="breadcrumb" context="index">${current.title}</t:actionlink></li>
+ </t:loop>
+ </ul>
+ </fieldset>
+</div>
+{code}
+
+The code which is needed to make this work, looks like this.
+
+{code}
+package mayapp.components;
+
+import org.equanda.t5nav.services.NavigationTarget;
+import org.equanda.t5nav.services.NavigationContext;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ApplicationStateManager;
+import org.apache.tapestry5.annotations.Property;
+
+/**
+ * Component which displays the breadcrumbs
+ */
+public class Breadcrumbs
+{
+ @Inject
+ private ApplicationStateManager asoManager;
+
+ @Property
+ private NavigationTarget current;
+
+ @Property
+ private int index;
+
+ public NavigationTarget[] getBreadcrumbs()
+ {
+ if ( !asoManager.exists( NavigationContext.class ) ) return null;
+ NavigationContext currNav = asoManager.get( NavigationContext.class );
+ return currNav.getRecentReturnTargets();
+ }
+
+ public Object onActionFromBreadcrumb( int index )
+ {
+ NavigationContext currNav = asoManager.get( NavigationContext.class );
+ if ( null == currNav ) return null;
+ return currNav.getRecentReturnTargets()[index].getLink();
+ }
+}
+{code}
Added: trunk/equanda-t5navigation/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/index.wiki (rev 0)
+++ trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-02-09 11:38:40 UTC (rev 1012)
@@ -0,0 +1,86 @@
+h1. equanda-t5navigation
+
+This is a module which acts as a navigation service, gives conversations support (I would call these mini-conversations) and helps control persisted properties in pages.
+
+Each navigation context is a mini-conversation, which stores for persisted context. These can be chained together to allow starting a new navigation context, or return to a previous page with correct state. The tail of this chain can also be obtained to easily build a breadcrumbs component. When the same page occurs more than once in a navigation chain, the mini conversations assure that each page instance has its own persistent data.
+
+When changing page, you can either stay within the current navigation context (in which case you don't have to do anything), start a new navigation chain or add a link in the current navigation chain.
+
+A demonstration of these features can be found at the [equanda tapestry5 components demo|http://app.spoon-it.be/t5example/pagea].
+
+h2. Interactions
+
+There are three main interactions when using this module.
+The examples here assume you have an actionlink in your template. We show the event code.
+The first two cases don't need any code if you use the [pagelink|pagelink.html] component.
+
+h3. Go to another page, creating a new navigation context, allowing return (chained)
+
+{code}
+@Inject
+private NavigationManager navigationManager;
+
+@InjectPage
+private PageB pageB;
+
+Object onActionFromPageBNavigation()
+{
+ navigationManager.beginNavigation( resources.createPageLink( resources.getPageName(), false ),
+ "title for return link" );
+ return pageB;
+}
+{code}
+
+
+h3. Go to another page, creating a new navigation context, not chained
+
+{code}
+@Inject
+private NavigationManager navigationManager;
+
+@InjectPage
+private PageB pageB;
+
+Object onActionFromPageBNavigation()
+{
+ navigationManager.beginNavigation( false );
+ return pageB;
+}
+{code}
+
+
+h3. Return to the previous navigation context
+
+{code}
+@Inject
+private NavigationManager navigationManager;
+
+Object onActionFromReturn()
+{
+ return navigationManager.endNavigation( null );
+}
+{code}
+
+
+h2. Usage
+
+A list of available versions of the library can be found at [http://maven.progs.be/m2repo/org/equanda/equanda-tapestry5/].
+You should normally use the most recent version.
+
+Or you can include it in your maven build using the following settings
+{code}
+<dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t5navigation</artifactId>
+ <version>0.9.3</version>
+</dependency>
+{code}
+For this to work, you need to also include the [PROGS|http://www.progs.be/] maven repository.
+{code}
+<repositories>
+ <repository>
+ <id>progs</id>
+ <url>http://maven.progs.be/m2repo</url>
+ </repository>
+</repositories>
+{code}
Added: trunk/equanda-t5navigation/src/site/wiki/pagelink.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/pagelink.wiki (rev 0)
+++ trunk/equanda-t5navigation/src/site/wiki/pagelink.wiki 2009-02-09 11:38:40 UTC (rev 1012)
@@ -0,0 +1,22 @@
+h1. PageLink
+
+This component is very similar to tapestry's builtin pagelink component. However this one ties perfectly with the t5navigation services.
+There are two typical usecases for the component.
+
+You can use it to start a new navigation chain. This is the behaviour when the title parameter is not bound.
+
+{code}
+<t:t5nav.pagelink page="PageA">
+ New navigation, to page A
+</t:t5nav.pagelink>
+{code}
+
+Alternatively, you can also jump to the next page in a chain. The return link will be filled in, and the given _title_ can be used by a [breadcrumbs|breadcrumbs.html] component to display the link.
+
+{code}
+<t:t5nav.pagelink page="PageB" title="literal:page A">
+ Continue navigation, to page B
+</t:t5nav.pagelink>
+{code}
+
+If needed, a context parameter can also be applied and this will be included in the link.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-08 17:22:02
|
Revision: 1011
http://equanda.svn.sourceforge.net/equanda/?rev=1011&view=rev
Author: triathlon98
Date: 2009-02-08 17:21:33 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
EQ-297 base demo of navigation support, show pagelink
Modified Paths:
--------------
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml 2009-02-08 17:18:42 UTC (rev 1010)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/PageA.tml 2009-02-08 17:21:33 UTC (rev 1011)
@@ -15,6 +15,13 @@
<li></li>
<li><t:actionlink t:id="return">return to previous</t:actionlink></li>
<li></li>
+ <li><t:t5nav.pagelink page="PageA">New navigation, to page A</t:t5nav.pagelink></li>
+ <li><t:t5nav.pagelink page="PageB">New navigation, to page B</t:t5nav.pagelink></li>
+ <li><t:t5nav.pagelink page="PageC">New navigation, to page C</t:t5nav.pagelink></li>
+ <li></li>
+ <li><t:t5nav.pagelink page="PageA" title="literal:A, moved without data">Continue navigation, to page A, no persisted data</t:t5nav.pagelink></li>
+ <li><t:t5nav.pagelink page="PageB" title="literal:A, moved without data">Continue navigation, to page B, no persisted data</t:t5nav.pagelink></li>
+ <li><t:t5nav.pagelink page="PageC" title="literal:A, moved without data">Continue navigation, to page C, no persisted data</t:t5nav.pagelink></li>
</ul>
</t:layout>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-02-08 17:18:46
|
Revision: 1010
http://equanda.svn.sourceforge.net/equanda/?rev=1010&view=rev
Author: triathlon98
Date: 2009-02-08 17:18:42 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
EQ-297 navigation module, pagelink component
Modified Paths:
--------------
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationModule.java
Added Paths:
-----------
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/components/
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/components/PageLink.java
trunk/equanda-t5navigation/src/main/resources/
trunk/equanda-t5navigation/src/main/resources/org/
trunk/equanda-t5navigation/src/main/resources/org/equanda/
trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/
trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/components/
trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/components/PageLink.tml
Added: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/components/PageLink.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/components/PageLink.java (rev 0)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/components/PageLink.java 2009-02-08 17:18:42 UTC (rev 1010)
@@ -0,0 +1,67 @@
+/**
+ * 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.t5nav.components;
+
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.equanda.t5nav.services.NavigationManager;
+
+/**
+ * Page link which allows linking to a page and either creating a new navigation of starting a new mini-conversation.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class PageLink
+{
+ @Parameter( defaultPrefix = BindingConstants.LITERAL, required = true )
+ private String page;
+
+ @Parameter( defaultPrefix = BindingConstants.PROP )
+ private String title;
+
+ @Parameter( defaultPrefix = BindingConstants.PROP )
+ private Object context;
+
+ @Inject
+ private ComponentResources resources;
+
+ @Inject private NavigationManager navigationManager;
+
+ public Link onActionFromPageLink()
+ {
+ if ( resources.isBound( "title" ) )
+ {
+ navigationManager.beginNavigation( resources.createPageLink( resources.getPageName(), false ), title );
+ }
+ else
+ {
+ navigationManager.beginNavigation( false );
+ }
+ return resources.createPageLink( page, resources.isBound( "context" ), context );
+ }
+}
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationModule.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationModule.java 2009-02-07 16:57:35 UTC (rev 1009)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationModule.java 2009-02-08 17:18:42 UTC (rev 1010)
@@ -26,13 +26,11 @@
import org.apache.tapestry5.internal.services.LinkFactoryListener;
import org.apache.tapestry5.internal.services.PersistentFieldManager;
+import org.apache.tapestry5.ioc.Configuration;
import org.apache.tapestry5.ioc.MappedConfiguration;
import org.apache.tapestry5.ioc.OrderedConfiguration;
import org.apache.tapestry5.ioc.ServiceBinder;
-import org.apache.tapestry5.services.ApplicationStateManager;
-import org.apache.tapestry5.services.Dispatcher;
-import org.apache.tapestry5.services.MarkupRendererFilter;
-import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.*;
import org.equanda.t5nav.internal.*;
/**
@@ -43,6 +41,11 @@
*/
public class NavigationModule
{
+ public static void contributeComponentClassResolver( Configuration<LibraryMapping> configuration )
+ {
+ configuration.add( new LibraryMapping( "t5nav", "org.equanda.t5nav" ) );
+ }
+
public static void bind( ServiceBinder binder )
{
binder.bind( NavigationDispatcher.class );
Added: trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/components/PageLink.tml
===================================================================
--- trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/components/PageLink.tml (rev 0)
+++ trunk/equanda-t5navigation/src/main/resources/org/equanda/t5nav/components/PageLink.tml 2009-02-08 17:18:42 UTC (rev 1010)
@@ -0,0 +1,3 @@
+<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <t:actionlink t:id="pagelink"><t:body/></t:actionlink>
+</t:container>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
