Scarab commit: svn commit: r11244 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin om pipeline services/security tools workflow

[email protected] Fri, 4 May 2012 07:26:03 -0700 (PDT)
Newsgroups	gmane.comp.java.scarab.cvs
Message-ID	<[email protected]>
Author: mcoss
Date: 2012-05-04 07:26:03-0700
New Revision: 11244

Modified:
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabAccessController.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/NotificationEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Module.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModulePeer.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUser.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabDBSecurityService.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabLDAPDBSecurityService.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/workflow/CheapWorkflow.java

Log:
CHG - import org.apache.fulcrum.security.entity. -> org.apache.turbine.om.security.

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java	2012-05-04 07:26:03-0700
@@ -59,7 +59,7 @@
 import org.apache.turbine.util.RunData;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Role;
 import org.apache.fulcrum.security.util.AccessControlList;
 
 // Scarab Stuff

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabAccessController.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabAccessController.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabAccessController.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabAccessController.java	2012-05-04 07:26:03-0700
@@ -49,7 +49,7 @@
 import org.apache.turbine.util.RunData;
 import org.apache.turbine.modules.actions.AccessController;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.util.TurbineSecurityException;
 import org.apache.fulcrum.security.util.AccessControlList;
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java	2012-05-04 07:26:03-0700
@@ -46,7 +46,7 @@
  * individuals on behalf of Collab.Net.
  */ 
 
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 
 import org.apache.velocity.context.Context;
 import org.apache.turbine.util.RunData;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java	2012-05-04 07:26:03-0700
@@ -52,8 +52,8 @@
 
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Role;
 import org.apache.fulcrum.security.util.AccessControlList;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.torque.om.NumberKey;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java	2012-05-04 07:26:03-0700
@@ -49,7 +49,7 @@
 import java.util.List;
 
 import org.apache.fulcrum.intake.model.Group;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.torque.TorqueException;
 import org.apache.torque.util.Criteria;
 import org.apache.turbine.util.RunData;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java	2012-05-04 07:26:03-0700
@@ -55,7 +55,7 @@
 import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Permission;
+import org.apache.turbine.om.security.Permission;
 import org.apache.fulcrum.security.util.EntityExistsException;
 
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java	2012-05-04 07:26:03-0700
@@ -55,8 +55,8 @@
 import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.Permission;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.Permission;
 import org.apache.fulcrum.security.util.EntityExistsException;
 import org.apache.fulcrum.security.util.PermissionSet;
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java	2012-05-04 07:26:03-0700
@@ -54,8 +54,8 @@
 
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.util.AccessControlList;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/NotificationEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/NotificationEdit.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/NotificationEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/NotificationEdit.java	2012-05-04 07:26:03-0700
@@ -49,7 +49,7 @@
 import java.util.List;
 
 import org.apache.fulcrum.intake.model.Group;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.torque.TorqueException;
 import org.apache.torque.util.Criteria;
 import org.apache.turbine.util.RunData;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2012-05-04 07:26:03-0700
@@ -59,7 +59,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.fulcrum.localization.Localization;
-import org.apache.fulcrum.security.entity.Group;
+import org.apache.turbine.om.security.Group;
 import org.apache.regexp.RECompiler;
 import org.apache.regexp.REProgram;
 import org.apache.regexp.RESyntaxException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java	2012-05-04 07:26:03-0700
@@ -54,8 +54,8 @@
 import java.util.Iterator;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Role;
 import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer;
 import org.apache.fulcrum.security.util.AccessControlList;
 import org.apache.fulcrum.security.util.DataBackendException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Module.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Module.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Module.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Module.java	2012-05-04 07:26:03-0700
@@ -52,7 +52,7 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Role;
 import org.apache.regexp.REProgram;
 
 import org.tigris.scarab.om.Attribute;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java	2012-05-04 07:26:03-0700
@@ -72,9 +72,9 @@
 import org.apache.fulcrum.security.TurbineSecurity;
 import org.apache.fulcrum.security.util.RoleSet;
 import org.apache.fulcrum.security.util.TurbineSecurityException;
-import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Role;
 
 // Scarab classes
 import org.tigris.scarab.om.Module;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModulePeer.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModulePeer.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModulePeer.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModulePeer.java	2012-05-04 07:26:03-0700
@@ -50,7 +50,7 @@
 import java.util.List;
 
 // Turbine classes
-import org.apache.fulcrum.security.entity.Group;
+import org.apache.turbine.om.security.Group;
 import org.apache.torque.TorqueException;
 import org.apache.torque.util.BasePeer;
 import org.apache.torque.util.Criteria;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUser.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUser.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUser.java	2012-05-04 07:26:03-0700
@@ -51,8 +51,8 @@
 import java.util.Map;
 import java.util.Calendar;
 
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.util.AccessControlList;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.EntityExistsException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java	2012-05-04 07:26:03-0700
@@ -64,9 +64,9 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.impl.db.entity.TurbinePermissionPeer;
 import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer;
 import org.apache.fulcrum.security.impl.db.entity.TurbineRolePermissionPeer;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java	2012-05-04 07:26:03-0700
@@ -50,7 +50,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Role;
 import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer;
 import org.apache.torque.NoRowsException;
 import org.apache.torque.TooManyRowsException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java	2012-05-04 07:26:03-0700
@@ -8,7 +8,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.UnknownEntityException;
 import org.apache.log4j.Logger;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabDBSecurityService.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabDBSecurityService.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabDBSecurityService.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabDBSecurityService.java	2012-05-04 07:26:03-0700
@@ -52,7 +52,7 @@
 
 import org.apache.fulcrum.security.impl.db.DBSecurityService;
 
-import org.apache.fulcrum.security.entity.Group;
+import org.apache.turbine.om.security.Group;
 
 import org.apache.fulcrum.security.util.GroupSet;
 import org.apache.fulcrum.security.util.DataBackendException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabLDAPDBSecurityService.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabLDAPDBSecurityService.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabLDAPDBSecurityService.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/security/ScarabLDAPDBSecurityService.java	2012-05-04 07:26:03-0700
@@ -31,7 +31,7 @@
 import org.apache.commons.configuration.Configuration;
 import org.apache.fulcrum.InitializationException;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.EntityExistsException;
 import org.apache.fulcrum.security.util.PasswordMismatchException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java	2012-05-04 07:26:03-0700
@@ -64,7 +64,7 @@
 import org.apache.log4j.Logger;
 import org.apache.fulcrum.TurbineServices;
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.User;
+import org.apache.turbine.om.security.User;
 import org.apache.fulcrum.velocity.TurbineVelocityService;
 import org.apache.fulcrum.velocity.VelocityService;
 import org.apache.oro.text.perl.Perl5Util;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java	2012-05-04 07:26:03-0700
@@ -53,10 +53,10 @@
 import java.io.Serializable;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Permission;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Permission;
 import org.apache.fulcrum.security.util.RoleSet;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Role;
 import org.apache.fulcrum.security.util.AccessControlList;
 
 import org.apache.torque.util.Criteria;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/workflow/CheapWorkflow.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/workflow/CheapWorkflow.java?view=diff&pathrev=11244&r1=11243&r2=11244
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/workflow/CheapWorkflow.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/workflow/CheapWorkflow.java	2012-05-04 07:26:03-0700
@@ -54,7 +54,7 @@
 import org.tigris.scarab.util.ScarabException;
 
 import org.apache.torque.TorqueException;
-import org.apache.fulcrum.security.entity.Role;
+import org.apache.turbine.om.security.Role;
 
 import java.util.ArrayList;
 import java.util.Iterator;

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957666