Scarab commit: svn commit: r11257 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin actions/base tools
[email protected] Fri, 4 May 2012 08:35:21 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss Date: 2012-05-04 08:35:20-0700 New Revision: 11257 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/ConfigureReport.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/Search.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/tools/ScarabRequestTool.java Log: CHG - import org.apache.fulcrum.intake.model.Group -> org.apache.turbine.services.intake.model.Group 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -52,7 +52,7 @@ 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.services.intake.model.Group; import org.apache.turbine.util.security.PasswordMismatchException; // Scarab Stuff Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java?view=diff&pathrev=11257&r1=11256&r2=11257 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java 2012-05-04 08:35:20-0700 @@ -55,7 +55,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.fulcrum.intake.Intake; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.om.NumberKey; import org.apache.turbine.util.RunData; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-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.turbine.services.intake.model.Group; import org.apache.torque.TorqueException; // Scarab Stuff 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -57,7 +57,7 @@ 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.services.intake.model.Group; import org.apache.turbine.util.security.TurbineSecurityException; // Scarab Stuff 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -56,7 +56,7 @@ 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; +import org.apache.turbine.services.intake.model.Group; import org.apache.turbine.util.security.DataBackendException; import org.apache.turbine.util.security.UnknownEntityException; import org.apache.turbine.util.security.PasswordMismatchException; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -58,7 +58,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.fulcrum.ServiceException; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.om.NumberKey; import org.apache.turbine.util.RunData; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -49,7 +49,7 @@ // Turbine Stuff import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.TorqueException; import org.apache.torque.oid.IDBroker; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -52,7 +52,7 @@ import java.util.List; import java.util.Set; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -50,7 +50,7 @@ import java.util.List; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.TorqueException; import org.apache.torque.om.NumberKey; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -55,7 +55,7 @@ import org.apache.turbine.modules.ContextAdapter; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.tigris.scarab.om.ScarabUser; import org.tigris.scarab.om.ScarabUserManager; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -57,7 +57,7 @@ import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.map.LinkedMap; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java?view=diff&pathrev=11257&r1=11256&r2=11257 ============================================================================== --- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java (original) +++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java 2012-05-04 08:35:20-0700 @@ -58,7 +58,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.fulcrum.intake.Intake; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.fulcrum.parser.StringValueParser; import org.apache.torque.TorqueException; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -53,7 +53,7 @@ import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.map.LinkedMap; import org.apache.commons.lang.StringUtils; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; 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/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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -50,7 +50,7 @@ import java.util.List; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.om.NumberKey; import org.apache.turbine.util.RunData; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -51,7 +51,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.TorqueException; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -48,7 +48,7 @@ import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.turbine.om.security.User; import org.apache.torque.TorqueException; import org.apache.torque.util.Criteria; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -49,7 +49,7 @@ import java.util.List; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.torque.om.NumberKey; import org.apache.turbine.util.RunData; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -51,7 +51,7 @@ import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.intake.model.Field; import org.tigris.scarab.actions.base.RequireLoginFirstAction; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -56,7 +56,7 @@ import org.apache.torque.TorqueException; import org.apache.torque.om.NumberKey; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.intake.model.Field; import org.tigris.scarab.actions.base.RequireLoginFirstAction; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -51,7 +51,7 @@ import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.tigris.scarab.actions.base.RequireLoginFirstAction; import org.tigris.scarab.om.Attribute; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -48,7 +48,7 @@ import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; 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/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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -49,7 +49,7 @@ import java.util.List; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -53,7 +53,7 @@ import org.apache.velocity.context.Context; import org.apache.turbine.util.RunData; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -53,7 +53,7 @@ import org.apache.velocity.context.Context; import org.apache.turbine.util.RunData; import org.apache.turbine.services.intake.IntakeTool; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.turbine.services.security.TurbineSecurity; import org.apache.turbine.om.security.Role; import org.apache.turbine.om.security.Permission; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -52,7 +52,7 @@ import java.util.Calendar; import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.turbine.services.security.TurbineSecurity; import org.apache.turbine.om.security.Role; import org.apache.turbine.om.security.User; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -48,7 +48,7 @@ import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -48,7 +48,7 @@ import java.util.List; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.turbine.om.security.User; import org.apache.torque.TorqueException; import org.apache.torque.util.Criteria; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -51,7 +51,7 @@ import org.apache.fulcrum.intake.Retrievable; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.parser.ParameterParser; import org.apache.log4j.Logger; import org.apache.turbine.util.RunData; 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=11257&r1=11256&r2=11257 ============================================================================== --- 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 08:35:20-0700 @@ -66,7 +66,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.fulcrum.intake.Intake; import org.apache.fulcrum.intake.model.Field; -import org.apache.fulcrum.intake.model.Group; +import org.apache.turbine.services.intake.model.Group; import org.apache.fulcrum.localization.Localization; import org.apache.fulcrum.parser.ParameterParser; import org.apache.fulcrum.parser.StringValueParser; ------------------------------------------------------ http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957682