Scarab commit: svn commit: r11246 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin om pipeline services/security tools
[email protected] Fri, 4 May 2012 07:37:41 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 07:37:41-0700
New Revision: 11246
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/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/om/AttributeGroup.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/ScarabUserImpl.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.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/AnonymousLoginValve.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
Log:
CHG - import org.apache.fulcrum.security. -> org.apache.turbine.services.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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -50,7 +50,7 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.intake.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
import org.apache.turbine.util.security.PasswordMismatchException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -55,7 +55,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.modules.ContextAdapter;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.intake.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
import org.apache.turbine.util.security.TurbineSecurityException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -58,7 +58,7 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.util.security.AccessControlList;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -53,7 +53,7 @@
import org.apache.turbine.util.RunData;
import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.modules.Action;
import org.apache.turbine.services.intake.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -48,7 +48,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.modules.actions.AccessController;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.User;
import org.apache.turbine.util.security.TurbineSecurityException;
import org.apache.turbine.util.security.AccessControlList;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -51,7 +51,7 @@
import java.util.List;
import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.util.security.AccessControlList;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -54,7 +54,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.intake.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.util.security.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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -54,7 +54,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.intake.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.util.security.EntityExistsException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -53,7 +53,7 @@
import java.util.List;
import org.apache.fulcrum.intake.model.Group;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
import org.apache.turbine.util.security.AccessControlList;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -53,10 +53,10 @@
import java.util.LinkedList;
import java.util.Iterator;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
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.turbine.services.security.impl.db.entity.TurbineRolePeer;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.GroupSet;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -69,7 +69,7 @@
import org.apache.torque.util.SqlEnum;
import java.sql.Connection;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.RoleSet;
import org.apache.turbine.util.security.TurbineSecurityException;
import org.apache.turbine.om.security.User;
@@ -94,13 +94,13 @@
// FIXME! do not like referencing servlet inside of business objects
// though I have forgotten how I might avoid it
import org.apache.turbine.Turbine;
-import org.apache.fulcrum.security.impl.db.entity
+import org.apache.turbine.services.security.impl.db.entity
.TurbinePermissionPeer;
-import org.apache.fulcrum.security.impl.db.entity
+import org.apache.turbine.services.security.impl.db.entity
.TurbineUserGroupRolePeer;
-import org.apache.fulcrum.security.impl.db.entity
+import org.apache.turbine.services.security.impl.db.entity
.TurbineRolePermissionPeer;
-import org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer;
import org.tigris.scarab.util.ScarabRuntimeException;
/**
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -63,14 +63,14 @@
import javax.mail.internet.InternetAddress;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
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;
-import org.apache.fulcrum.security.impl.db.entity.TurbineUserGroupRolePeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbinePermissionPeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbineRolePeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbineRolePermissionPeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbineUserGroupRolePeer;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java?view=diff&pathrev=11246&r1=11245&r2=11246
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java 2012-05-04 07:37:41-0700
@@ -54,7 +54,7 @@
import org.tigris.scarab.tools.localization.L10NKeySet;
import org.tigris.scarab.util.ScarabException;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
/**
* This class manages ScarabUser objects.
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -51,7 +51,7 @@
import java.util.List;
import org.apache.turbine.om.security.Role;
-import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer;
+import org.apache.turbine.services.security.impl.db.entity.TurbineRolePeer;
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/pipeline/AnonymousLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java?view=diff&pathrev=11246&r1=11245&r2=11246
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java 2012-05-04 07:37:41-0700
@@ -4,7 +4,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.apache.turbine.util.TurbineException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -7,7 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.User;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.UnknownEntityException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -50,7 +50,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.fulcrum.security.impl.db.DBSecurityService;
+import org.apache.turbine.services.security.impl.db.DBSecurityService;
import org.apache.turbine.om.security.Group;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -30,7 +30,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.fulcrum.InitializationException;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.User;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -63,7 +63,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.fulcrum.TurbineServices;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.User;
import org.apache.fulcrum.velocity.TurbineVelocityService;
import org.apache.fulcrum.velocity.VelocityService;
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=11246&r1=11245&r2=11246
==============================================================================
--- 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:37:41-0700
@@ -52,7 +52,7 @@
import java.util.Iterator;
import java.io.Serializable;
-import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.util.security.RoleSet;
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957668