Scarab commit: svn commit: r11232 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin actions/base screens tools

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

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/DefineXModuleList.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/Login.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.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/GlobalArtifactTypeCreate.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypes.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/IssueTypeAttributeEdit.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.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/ModuleAttributeEdit.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/actions/base/RequireLoginFirstAction.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Log:
CHG - import org.apache.turbine.tool.IntakeTool -> org.apache.turbine.services.intake.IntakeTool

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -51,7 +51,7 @@
 import org.apache.turbine.util.RunData;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.security.util.PasswordMismatchException;
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java	2012-05-04 06:05:05-0700
@@ -53,7 +53,7 @@
 import org.apache.velocity.context.Context;
 import org.apache.turbine.util.RunData;
 
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.torque.TorqueException;
 

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -56,7 +56,7 @@
 import org.apache.turbine.modules.ContextAdapter;
 
 import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.security.util.TurbineSecurityException;
 

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -55,7 +55,7 @@
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.fulcrum.security.TurbineSecurity;
 import org.apache.turbine.modules.Action;
-import org.apache.turbine.tool.IntakeTool;
+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;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java	2012-05-04 06:05:05-0700
@@ -64,7 +64,7 @@
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
 import org.apache.turbine.Turbine;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.BaseModifyIssue;
 import org.tigris.scarab.attribute.DateAttribute;
 import org.tigris.scarab.attribute.IntegerAttribute;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java	2012-05-04 06:05:05-0700
@@ -56,7 +56,7 @@
 import org.apache.torque.util.BasePeer;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.GlobalParameter;
 import org.tigris.scarab.om.GlobalParameterManager;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java	2012-05-04 06:05:05-0700
@@ -57,7 +57,7 @@
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
 import org.apache.turbine.Turbine;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.BaseModifyIssue;
 import org.tigris.scarab.notification.NotificationManager;
 import org.tigris.scarab.notification.NotificationManagerFactory;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java	2012-05-04 06:05:05-0700
@@ -56,7 +56,7 @@
 import org.apache.torque.om.NumberKey;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Query;
 import org.tigris.scarab.om.QueryManager;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java	2012-05-04 06:05:05-0700
@@ -53,7 +53,7 @@
 import org.apache.velocity.context.Context;
 import org.apache.turbine.Turbine;
 import org.apache.turbine.modules.ContextAdapter;
-import org.apache.turbine.tool.IntakeTool;
+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/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java	2012-05-04 06:05:05-0700
@@ -61,7 +61,7 @@
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.attribute.DateAttribute;
 import org.tigris.scarab.attribute.IntegerAttribute;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java	2012-05-04 06:05:05-0700
@@ -57,7 +57,7 @@
 import org.apache.torque.om.NumberKey;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.attribute.OptionAttribute;
 import org.tigris.scarab.om.ActivitySet;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java	2012-05-04 06:05:05-0700
@@ -55,7 +55,7 @@
 import org.apache.torque.om.NumberKey;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeGroup;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java	2012-05-04 06:05:05-0700
@@ -57,7 +57,7 @@
 import org.apache.torque.om.NumberKey;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeGroup;

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -54,7 +54,7 @@
 import org.apache.torque.util.Criteria;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeManager;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java	2012-05-04 06:05:05-0700
@@ -54,7 +54,7 @@
 import org.apache.torque.om.NumberKey;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeGroup;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypes.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypes.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypes.java	2012-05-04 06:05:05-0700
@@ -50,7 +50,7 @@
 
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.intake.model.Field;
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java	2012-05-04 06:05:05-0700
@@ -55,7 +55,7 @@
 import org.apache.velocity.context.Context;
 import org.apache.torque.TorqueException;
 import org.apache.torque.om.NumberKey;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 import org.apache.fulcrum.intake.model.Field;
 

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java	2012-05-04 06:05:05-0700
@@ -50,7 +50,7 @@
 
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.apache.fulcrum.intake.model.Group;
 
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/IssueTypeAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/IssueTypeAttributeEdit.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/IssueTypeAttributeEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/IssueTypeAttributeEdit.java	2012-05-04 06:05:05-0700
@@ -52,7 +52,7 @@
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeOption;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java	2012-05-04 06:05:05-0700
@@ -53,7 +53,7 @@
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.IssueType;
 import org.tigris.scarab.om.Module;

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -52,7 +52,7 @@
 // Turbine Stuff
 import org.apache.velocity.context.Context;
 import org.apache.turbine.util.RunData;
-import org.apache.turbine.tool.IntakeTool;
+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;

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -52,7 +52,7 @@
 // Turbine Stuff
 import org.apache.velocity.context.Context;
 import org.apache.turbine.util.RunData;
-import org.apache.turbine.tool.IntakeTool;
+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;

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -59,7 +59,7 @@
 import org.apache.fulcrum.security.util.AccessControlList;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.ForgotPassword;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Module;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ModuleAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ModuleAttributeEdit.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ModuleAttributeEdit.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ModuleAttributeEdit.java	2012-05-04 06:05:05-0700
@@ -52,7 +52,7 @@
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeOption;

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=11232&r1=11231&r2=11232
==============================================================================
--- 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 06:05:05-0700
@@ -54,7 +54,7 @@
 import org.apache.torque.util.Criteria;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.actions.base.RequireLoginFirstAction;
 import org.tigris.scarab.om.Attribute;
 import org.tigris.scarab.om.AttributeManager;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java	2012-05-04 06:05:05-0700
@@ -57,7 +57,7 @@
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
 import org.apache.turbine.TemplateSecureAction;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.om.Module;
 import org.tigris.scarab.om.ModuleManager;
 import org.tigris.scarab.om.ScarabUser;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java	2012-05-04 06:05:05-0700
@@ -54,7 +54,7 @@
 import org.apache.turbine.util.RunData;
 import org.apache.turbine.TemplateAction;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.tigris.scarab.tools.ScarabLocalizationTool;
 import org.tigris.scarab.tools.ScarabRequestTool;
 import org.tigris.scarab.tools.ScarabUserTool;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java	2012-05-04 06:05:05-0700
@@ -49,7 +49,7 @@
 // Turbine Stuff 
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 
 // Scarab Stuff
 import org.tigris.scarab.tools.ScarabRequestTool;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=11232&r1=11231&r2=11232
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2012-05-04 06:05:05-0700
@@ -80,7 +80,7 @@
 import org.apache.velocity.context.Context;
 import org.apache.turbine.Turbine;
 import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.tool.IntakeTool;
+import org.apache.turbine.services.intake.IntakeTool;
 import org.radeox.util.logging.Logger;
 import org.tigris.scarab.attribute.DateAttribute;
 import org.tigris.scarab.om.Attachment;

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