Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[1197] trunk
|
From: <tri...@us...> - 2010-02-08 07:59:18
|
Revision: 1197
http://equanda.svn.sourceforge.net/equanda/?rev=1197&view=rev
Author: triathlon98
Date: 2010-02-08 07:59:11 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
EQ-371 allow replacing the EquandaUser and EquandaRole tables by something else
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.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/src/site/wiki/templates/login.wiki
Modified: trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -35,7 +35,11 @@
package ${package}.server;
-import ${package}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${package}.client.$userTable;
import ${package}.server.pm.*;
import org.equanda.client.EquandaException;
import org.equanda.client.ExceptionCodes;
@@ -89,13 +93,13 @@
#set( $loginPackage="" )
#set( $loginPackage=$!{engine.getLoginConfig("package")} )
#if( "x" != "$loginPackage" )
- #if( "EquandaUser" == $table.Name )
+ #if( "$userTable" == $table.Name )
${loginPackage}.LoginCache.setUser( entity.getUserName() );
#end
- #if( "EquandaRole" == $table.Name )
+ #if( "$roleTable" == $table.Name )
${loginPackage}.LoginCache.setRoleAuths( entity.getRoleName(),
new org.equanda.auth.ParsedAuthAndConfigProvider( entity.getAuthAndConfig() ) );
- for ( EquandaUser user : EquandaUser.selectRole( entity.getId() ) )
+ for ( $userTable user : ${userTable}.selectRole( entity.getId() ) )
{
try
{
Modified: trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -32,12 +32,17 @@
package ${package};
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+
import org.equanda.client.LoginInfo;
-#set( $ejbPackage=${engine.getConfig("ejb-package")} )
-import ${ejbPackage}.server.pm.DMEquandaUser;
-import ${ejbPackage}.server.pm.DMEquandaRole;
-import ${ejbPackage}.client.HREquandaRole;
-import ${ejbPackage}.client.HREquandaUser;
+#set( $ejbPackage = ${engine.getConfig("ejb-package")} )
+import ${ejbPackage}.server.pm.DM$roleTable;
+import ${ejbPackage}.server.pm.DM$userTable;
+import ${ejbPackage}.client.HR$roleTable;
+import ${ejbPackage}.client.HR$userTable;
import org.apache.log4j.Logger;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
@@ -70,11 +75,11 @@
public LoginInfo getLoginInfo( String username )
throws EquandaException
{
- List<DMEquandaUser> users =
- HREquandaUser.equandaRunQuery( em, HREquandaUser.getUserNameQuery( null, username ) );
+ List<DM$userTable> users =
+ HR${userTable}.equandaRunQuery( em, HR${userTable}.getUserNameQuery( null, username ) );
if ( users.size() != 0 )
{
- DMEquandaUser dmUser = users.get( 0 );
+ DM$userTable dmUser = users.get( 0 );
boolean isAdmin = false;
boolean isNotGui = false;
@@ -82,7 +87,7 @@
List<String> roles = new ArrayList<String>();
List<String> aacRoles = new ArrayList<String>();
- for ( DMEquandaRole role : dmUser.getRoles() )
+ for ( DM$roleTable role : dmUser.getRoles() )
{
aacRoles.add( role.getRoleName() );
isAdmin |= role.getGuiAdministrator();
@@ -100,7 +105,7 @@
roles.add( "${engine.getConfig("default-role")}" );
}
- LoginInfo info = new LoginInfo( HREquandaUser.get( dmUser ) );
+ LoginInfo info = new LoginInfo( HR${userTable}.get( dmUser ) );
info.setGuiAdministrator( isAdmin );
info.setGuiAccessProhibited( isNotGui );
info.setRoles( roles );
@@ -115,11 +120,11 @@
public String getRoleAuthAndConfig( String role )
{
- List<DMEquandaRole> roles =
- HREquandaRole.equandaRunQuery( em, HREquandaRole.getRoleQuery( null, role ) );
+ List<DM$roleTable> roles =
+ HR${roleTable}.equandaRunQuery( em, HR${roleTable}.getRoleQuery( null, role ) );
if ( roles.size() != 0 )
{
- DMEquandaRole dmRole = roles.get( 0 );
+ DM${roleTable} dmRole = roles.get( 0 );
return dmRole.getAuthAndConfig();
}
return null;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -37,8 +37,12 @@
#set( $ejbPackage=${engine.getConfig("ejb-package")} )
#set( $loginPackage=${engine.getLoginConfig("package")} )
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import ${loginPackage}.LoginCache;
import org.apache.log4j.Logger;
@@ -226,13 +230,13 @@
if( this.roleName != null )
{
- EquandaRole thisRole = EquandaRole.selectRole( this.roleName );
+ ${roleTable} thisRole = ${roleTable}.selectRole( this.roleName );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
else
{
- EquandaUser thisUser = (EquandaUser)loginInfoService.getLoginInfo().getUser();
+ $userTable thisUser = ($userTable)loginInfoService.getLoginInfo().getUser();
thisUser.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisUser.equandaUpdate();
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -36,8 +36,12 @@
package ${package}.pages;
#set( $ejbPackage=${engine.getConfig("ejb-package")} )
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import org.apache.log4j.Logger;
import org.apache.tapestry5.ComponentResources;
@@ -102,9 +106,9 @@
List<OptionModel> list = new ArrayList<OptionModel>();
try{
- Collection<EquandaRole> coll = EquandaRole.selectEquandaAll();
+ Collection<${roleTable}> coll = ${roleTable}.selectEquandaAll();
- for ( EquandaRole role : coll )
+ for ( ${roleTable} role : coll )
{
list.add( new EquandaOptionModel (role.getRoleName(), role.getRoleName() ) );
}
@@ -124,9 +128,9 @@
try
{
LoginInfo li = loginInfoService.getLoginInfo();
- EquandaUser theUser = (EquandaUser)li.getUser();
+ $userTable theUser = ($userTable)li.getUser();
- for( EquandaRole thisRole : theUser.getRoles() )
+ for( $roleTable thisRole : theUser.getRoles() )
{
if( thisRole.isGuiAdministrator() )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -35,8 +35,12 @@
package ${package}.pages.${table.VarName};
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import ${package}.pages.AuthAndConfigTables;
import ${loginPackage}.LoginCache;
@@ -438,13 +442,13 @@
if( getRoleName() != null )
{
- EquandaRole thisRole = EquandaRole.selectRole( getRoleName() );
+ ${roleTable} thisRole = ${roleTable}.selectRole( getRoleName() );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
else
{
- EquandaUser thisUser = (EquandaUser)loginInfoService.getLoginInfo().getUser();
+ $userTable thisUser = ($userTable)loginInfoService.getLoginInfo().getUser();
thisUser.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisUser.equandaUpdate();
}
Modified: trunk/src/site/wiki/templates/login.wiki
===================================================================
--- trunk/src/site/wiki/templates/login.wiki 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/src/site/wiki/templates/login.wiki 2010-02-08 07:59:11 UTC (rev 1197)
@@ -82,7 +82,7 @@
h3. AppModule
In your tapestry application module, the following needs to be included
{code}
- /* include this forwhen putting your app behind SSL/https
+ /* include this when putting your app behind SSL/https
public void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
{
configuration.add( MetaDataConstants.SECURE_PAGE, "true" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
