Scarab commit: svn commit: r11245 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin feeds om pipeline services/security tools util
[email protected] Fri, 4 May 2012 07:28:43 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss Date: 2012-05-04 07:28:43-0700 New Revision: 11245 Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.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/admin/Approval.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/feeds/QueryFeed.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabUser.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/MITList.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/RModuleUserAttribute.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/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/SecurityAdminTool.java branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/ScarabLocalizedTurbineSecurityException.java Log: CHG - import org.apache.fulcrum.security.util. -> org.apache.turbine.util.security. Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java 2012-05-04 07:28:43-0700 @@ -53,7 +53,7 @@ import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.services.intake.IntakeTool; import org.apache.fulcrum.intake.model.Group; -import org.apache.fulcrum.security.util.PasswordMismatchException; +import org.apache.turbine.util.security.PasswordMismatchException; // Scarab Stuff import org.tigris.scarab.om.ScarabUser; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java 2012-05-04 07:28:43-0700 @@ -54,7 +54,7 @@ import java.util.Map; import org.apache.fulcrum.parser.ParameterParser; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; import org.tigris.scarab.actions.base.RequireLoginFirstAction; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java 2012-05-04 07:28:43-0700 @@ -58,7 +58,7 @@ import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.services.intake.IntakeTool; import org.apache.fulcrum.intake.model.Group; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; // Scarab Stuff import org.tigris.scarab.om.ScarabUser; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -60,7 +60,7 @@ import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.om.security.Role; -import org.apache.fulcrum.security.util.AccessControlList; +import org.apache.turbine.util.security.AccessControlList; // Scarab Stuff import org.tigris.scarab.om.PendingGroupUserRolePeer; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java 2012-05-04 07:28:43-0700 @@ -57,10 +57,10 @@ import org.apache.turbine.modules.Action; import org.apache.turbine.services.intake.IntakeTool; import org.apache.fulcrum.intake.model.Group; -import org.apache.fulcrum.security.util.DataBackendException; -import org.apache.fulcrum.security.util.UnknownEntityException; -import org.apache.fulcrum.security.util.PasswordMismatchException; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.UnknownEntityException; +import org.apache.turbine.util.security.PasswordMismatchException; +import org.apache.turbine.util.security.TurbineSecurityException; // Scarab Stuff import org.tigris.scarab.tools.ScarabRequestTool; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -50,8 +50,8 @@ import org.apache.turbine.modules.actions.AccessController; import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.om.security.User; -import org.apache.fulcrum.security.util.TurbineSecurityException; -import org.apache.fulcrum.security.util.AccessControlList; +import org.apache.turbine.util.security.TurbineSecurityException; +import org.apache.turbine.util.security.AccessControlList; /** * The ScarabAccessController class is a replacement for 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -54,8 +54,8 @@ import org.apache.fulcrum.security.TurbineSecurity; 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.turbine.util.security.AccessControlList; +import org.apache.turbine.util.security.DataBackendException; import org.apache.torque.om.NumberKey; 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/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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -56,7 +56,7 @@ import org.apache.fulcrum.intake.model.Group; import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.om.security.Permission; -import org.apache.fulcrum.security.util.EntityExistsException; +import org.apache.turbine.util.security.EntityExistsException; // Scarab Stuff 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -57,8 +57,8 @@ import org.apache.fulcrum.security.TurbineSecurity; 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; +import org.apache.turbine.util.security.EntityExistsException; +import org.apache.turbine.util.security.PermissionSet; // Scarab Stuff import org.tigris.scarab.om.ScarabUser; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -56,7 +56,7 @@ import org.apache.fulcrum.security.TurbineSecurity; 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.security.AccessControlList; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; import org.apache.turbine.services.intake.IntakeTool; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/feeds/QueryFeed.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/feeds/QueryFeed.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/feeds/QueryFeed.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/feeds/QueryFeed.java 2012-05-04 07:28:43-0700 @@ -6,7 +6,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.torque.TorqueException; import org.tigris.scarab.om.Issue; import org.tigris.scarab.om.IssueManager; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabUser.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabUser.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabUser.java 2012-05-04 07:28:43-0700 @@ -56,7 +56,7 @@ import java.util.HashMap; import java.util.Comparator; import java.sql.Connection; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.torque.TorqueException; import org.apache.torque.util.Criteria; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -57,9 +57,9 @@ 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; -import org.apache.fulcrum.security.util.GroupSet; +import org.apache.turbine.util.security.AccessControlList; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.GroupSet; import org.apache.torque.NoRowsException; import org.apache.torque.TooManyRowsException; import org.apache.torque.TorqueException; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITList.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITList.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITList.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITList.java 2012-05-04 07:28:43-0700 @@ -54,7 +54,7 @@ import java.util.Iterator; import java.util.Collections; import java.sql.Connection; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.torque.om.Persistent; import org.apache.torque.util.Criteria; import org.apache.torque.TorqueException; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/RModuleUserAttribute.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/RModuleUserAttribute.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/RModuleUserAttribute.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/RModuleUserAttribute.java 2012-05-04 07:28:43-0700 @@ -54,7 +54,7 @@ import org.tigris.scarab.tools.localization.L10NKey; import org.tigris.scarab.tools.localization.L10NKeySet; import org.tigris.scarab.tools.localization.L10NMessage; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.tigris.scarab.util.Log; import org.tigris.scarab.util.ScarabConstants; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -70,8 +70,8 @@ import java.sql.Connection; import org.apache.fulcrum.security.TurbineSecurity; -import org.apache.fulcrum.security.util.RoleSet; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.RoleSet; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.turbine.om.security.User; import org.apache.turbine.om.security.Group; import org.apache.turbine.om.security.Role; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -54,7 +54,7 @@ import org.apache.torque.TorqueException; import org.apache.torque.util.BasePeer; import org.apache.torque.util.Criteria; -import org.apache.fulcrum.security.util.DataBackendException; +import org.apache.turbine.util.security.DataBackendException; // Local classes import org.tigris.scarab.om.Module; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -53,10 +53,10 @@ 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; -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.AccessControlList; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.EntityExistsException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.apache.torque.om.ObjectKey; import org.apache.torque.om.Persistent; import org.apache.torque.TorqueException; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -71,12 +71,12 @@ import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer; import org.apache.fulcrum.security.impl.db.entity.TurbineRolePermissionPeer; import org.apache.fulcrum.security.impl.db.entity.TurbineUserGroupRolePeer; -import org.apache.fulcrum.security.util.AccessControlList; -import org.apache.fulcrum.security.util.DataBackendException; -import org.apache.fulcrum.security.util.EntityExistsException; -import org.apache.fulcrum.security.util.GroupSet; -import org.apache.fulcrum.security.util.TurbineSecurityException; -import org.apache.fulcrum.security.util.UnknownEntityException; +import org.apache.turbine.util.security.AccessControlList; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.EntityExistsException; +import org.apache.turbine.util.security.GroupSet; +import org.apache.turbine.util.security.TurbineSecurityException; +import org.apache.turbine.util.security.UnknownEntityException; import org.apache.torque.TorqueException; import org.apache.torque.util.Criteria; import org.apache.turbine.Turbine; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -9,8 +9,8 @@ import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.om.security.User; -import org.apache.fulcrum.security.util.DataBackendException; -import org.apache.fulcrum.security.util.UnknownEntityException; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.UnknownEntityException; import org.apache.log4j.Logger; import org.apache.torque.TorqueException; import org.apache.turbine.util.RunData; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -54,10 +54,10 @@ import org.apache.turbine.om.security.Group; -import org.apache.fulcrum.security.util.GroupSet; -import org.apache.fulcrum.security.util.DataBackendException; -import org.apache.fulcrum.security.util.EntityExistsException; -import org.apache.fulcrum.security.util.UnknownEntityException; +import org.apache.turbine.util.security.GroupSet; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.EntityExistsException; +import org.apache.turbine.util.security.UnknownEntityException; import org.apache.torque.om.Persistent; import org.apache.torque.util.Criteria; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -32,10 +32,10 @@ import org.apache.fulcrum.InitializationException; import org.apache.fulcrum.security.TurbineSecurity; 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; -import org.apache.fulcrum.security.util.UnknownEntityException; +import org.apache.turbine.util.security.DataBackendException; +import org.apache.turbine.util.security.EntityExistsException; +import org.apache.turbine.util.security.PasswordMismatchException; +import org.apache.turbine.util.security.UnknownEntityException; import org.apache.log4j.Logger; 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=11245&r1=11244&r2=11245 ============================================================================== --- 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:28:43-0700 @@ -55,9 +55,9 @@ import org.apache.fulcrum.security.TurbineSecurity; import org.apache.turbine.om.security.Group; import org.apache.turbine.om.security.Permission; -import org.apache.fulcrum.security.util.RoleSet; +import org.apache.turbine.util.security.RoleSet; import org.apache.turbine.om.security.Role; -import org.apache.fulcrum.security.util.AccessControlList; +import org.apache.turbine.util.security.AccessControlList; import org.apache.torque.util.Criteria; import org.apache.torque.TorqueException; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/ScarabLocalizedTurbineSecurityException.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/ScarabLocalizedTurbineSecurityException.java?view=diff&pathrev=11245&r1=11244&r2=11245 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/ScarabLocalizedTurbineSecurityException.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/ScarabLocalizedTurbineSecurityException.java 2012-05-04 07:28:43-0700 @@ -46,7 +46,7 @@ * individuals on behalf of Collab.Net. */ -import org.apache.fulcrum.security.util.TurbineSecurityException; +import org.apache.turbine.util.security.TurbineSecurityException; import org.tigris.scarab.tools.ScarabLocalizationTool; import org.tigris.scarab.tools.localization.Localizable; ------------------------------------------------------ http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957667