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

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

Revision: 147
          http://equanda.svn.sourceforge.net/equanda/?rev=147&view=rev
Author:   triathlon98
Date:     2007-11-12 12:54:08 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
EQ-80 remove security-role-remove

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
    trunk/equanda-test/src/main/om/om.ini

Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java	2007-11-11 21:52:05 UTC (rev 146)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java	2007-11-12 20:54:08 UTC (rev 147)
@@ -200,16 +200,8 @@
             while ( dbMerge.getChildNodes().getLength() > 0 )
             {
                 OMTable table = (OMTable) dbMerge.getChildNodes().item( 0 );
-                if ( getConfig( "security-role-merge-model" ) == null )
-                {
-                    // if missing, use security-role
-                    table.setDefaultSecurityRole( getConfig( "security-role" ) );
-                }
-                else
-                {
-                    table.setDefaultSecurityRole( getConfig( "security-role-merge-model" ) );
-                }
-                table.setDefaultSecurityRoleRemove( getConfig( "security-role-remove-merge-model" ) );
+                table.setDefaultSecurityRole( getConfig( "security-role" ) );
+                table.setDefaultSecurityRoleRemove( getConfig( "security-role-remove" ) );
                 if ( checkReservedNames )
                 {
                     if ( table.getName().toUpperCase().startsWith( "EQUANDA" ) )

Modified: trunk/equanda-test/src/main/om/om.ini
===================================================================
--- trunk/equanda-test/src/main/om/om.ini	2007-11-11 21:52:05 UTC (rev 146)
+++ trunk/equanda-test/src/main/om/om.ini	2007-11-12 20:54:08 UTC (rev 147)
@@ -16,8 +16,6 @@
 
 [extra]
 security-role=LocalUser,LocalAdmin
-security-role-embedded=LocalUser,LocalAdmin
-security-role-merge-model=LocalUser,LocalAdmin
 security-role-remove=LocalUser,LocalAdmin
 infrastructure=true
 ; following five values are for testing, should be larger for real-world applications


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