Scarab commit: svn commit: r11230 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin actions/base om pipeline screens screens/admin screens/entry screens/home screens/notifications services/email tools util
[email protected] Fri, 4 May 2012 05:59:44 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 05:59:43-0700
New Revision: 11230
Modified:
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/AssignIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangeNotificationStatus.java
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/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/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/Logout.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/Redirect.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/ScarabSessionValidator.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/SetHomePage.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/ViewIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AppConfigurationSettings.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/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/GlobalEmailSettings.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/admin/SetInfoMessage.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/BaseModifyIssue.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/om/AbstractScarabModule.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/IssueTemplateInfo.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Query.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/AssignIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ConfigureIssueList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueListExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueTypeList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SaveTemplate.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ScarabDefault.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SelectModule.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ActivityList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ArtifactTypeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeGroupEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeOptionSelect.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ConditionEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalArtifactTypeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalAttributeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ManageArtifactTypes.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/UserAttributeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/entry/Wizard1.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/home/XModuleList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/notifications/NotificationList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/TemplateHtmlEmail.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/VelocityEmailService.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/SnippetRenderer.java
Log:
CHG - import org.apache.turbine.TemplateContext -> org.apache.velocity.context.Context
CHG - class name TemplateContext -> Context
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/AssignIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/AssignIssue.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/AssignIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/AssignIssue.java 2012-05-04 05:59:43-0700
@@ -59,7 +59,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.TorqueException;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.actions.base.BaseModifyIssue;
import org.tigris.scarab.notification.NotificationManagerFactory;
import org.tigris.scarab.om.ActivitySet;
@@ -95,7 +95,7 @@
/**
* Adds users to temporary working list.
*/
- public void doAdd(RunData data, TemplateContext context)
+ public void doAdd(RunData data, Context context)
throws Exception
{
int returnCode = 0;
@@ -151,7 +151,7 @@
* @param context
* @throws Exception
*/
- public void doAddmyself(RunData data, TemplateContext context)
+ public void doAddmyself(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -207,7 +207,7 @@
* @param context
* @throws Exception
*/
- public void doRemovemyself(RunData data, TemplateContext context)
+ public void doRemovemyself(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = this.getScarabRequestTool(context);
@@ -420,7 +420,7 @@
/**
* Removes users from temporary working list.
*/
- private void remove(RunData data, TemplateContext context, Long issueId)
+ private void remove(RunData data, Context context, Long issueId)
throws Exception
{
ScarabUser user = (ScarabUser)data.getUser();
@@ -452,7 +452,7 @@
/**
* Changes the user attribute a user is associated with.
*/
- private void update(RunData data, TemplateContext context, Long issueId)
+ private void update(RunData data, Context context, Long issueId)
throws Exception
{
ScarabUser user = (ScarabUser)data.getUser();
@@ -495,7 +495,7 @@
}
}
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
ScarabUser user = (ScarabUser)data.getUser();
@@ -663,7 +663,7 @@
}
}
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangeNotificationStatus.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangeNotificationStatus.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangeNotificationStatus.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangeNotificationStatus.java 2012-05-04 05:59:43-0700
@@ -8,7 +8,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.om.ObjectKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.actions.base.ScarabTemplateAction;
import org.tigris.scarab.notification.NotificationManagerFactory;
import org.tigris.scarab.om.Module;
@@ -91,7 +91,7 @@
* @param context
* @throws Exception
*/
- public void doDeletenotifications( RunData data, TemplateContext context)
+ public void doDeletenotifications( RunData data, Context context)
throws Exception
{
deleteMarkedEntries(data, context);
@@ -104,7 +104,7 @@
* @param context
* @throws Exception
*/
- private void deleteMarkedEntries(RunData data, TemplateContext context)
+ private void deleteMarkedEntries(RunData data, Context context)
throws Exception
{
Object[] keys = data.getParameters().getKeys();
@@ -170,7 +170,7 @@
// The following methods are primary for customization issues
// ===============================================================
- public void doCustomize( RunData data, TemplateContext context)
+ public void doCustomize( RunData data, Context context)
throws Exception
{
customize(data, context);
@@ -182,7 +182,7 @@
* @param context
* @throws TorqueException
*/
- private void customize(RunData data, TemplateContext context)
+ private void customize(RunData data, Context context)
throws Exception
{
String key;
@@ -323,7 +323,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public ScarabGlobalTool getScarabGlobalTool(TemplateContext context)
+ public ScarabGlobalTool getScarabGlobalTool(Context context)
{
return (ScarabGlobalTool)context
.get(ScarabConstants.SCARAB_GLOBAL_TOOL);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.fulcrum.security.TurbineSecurity;
@@ -76,7 +76,7 @@
/**
* This manages clicking the Change Password button
*/
- public void doChangepassword(RunData data, TemplateContext context)
+ public void doChangepassword(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -56,7 +56,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.security.util.TurbineSecurityException;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
import org.tigris.scarab.om.AttributeManager;
@@ -76,7 +76,7 @@
*/
public class ConfigureIssueList extends RequireLoginFirstAction
{
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -195,7 +195,7 @@
/**
* Resets back to default values for module.
*/
- public void doUsedefaults(RunData data, TemplateContext context)
+ public void doUsedefaults(RunData data, Context context)
throws Exception
{
data.getParameters().add("usedefaults", "true");
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -59,7 +59,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.AttributeValue;
import org.tigris.scarab.om.Report;
@@ -111,7 +111,7 @@
ParameterParser params;
ScarabUser user;
- private void setup(RunData data, TemplateContext context) throws Exception{
+ private void setup(RunData data, Context context) throws Exception{
l10n = getLocalizationTool(context);
scarabR = getScarabRequestTool(context);
report = scarabR.getReport();
@@ -120,7 +120,7 @@
user = (ScarabUser)data.getUser();
}
- public void doSaveinfo(RunData data, TemplateContext context)
+ public void doSaveinfo(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -171,7 +171,7 @@
}
}
- public void doSelectheading(RunData data, TemplateContext context)
+ public void doSelectheading(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -192,7 +192,7 @@
}
}
- public void doSettype(RunData data, TemplateContext context)
+ public void doSettype(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -234,7 +234,7 @@
}
}
- public void doAddoptions(RunData data, TemplateContext context)
+ public void doAddoptions(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -364,7 +364,7 @@
/**
* Adds users to the current header.
*/
- public void doAddusers(RunData data, TemplateContext context)
+ public void doAddusers(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -424,7 +424,7 @@
/**
* Removes users from temporary working list.
*/
- public void doRemoveusers(RunData data, TemplateContext context)
+ public void doRemoveusers(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -481,7 +481,7 @@
/**
* Changes the user attribute a user is associated with.
*/
- public void doUpdateusers(RunData data, TemplateContext context)
+ public void doUpdateusers(RunData data, Context context)
throws Exception
{
@@ -555,7 +555,7 @@
/**
* Changes the user attribute a user is associated with.
*/
- public void doRemoveheading(RunData data, TemplateContext context)
+ public void doRemoveheading(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -587,7 +587,7 @@
* Redirects to screen to group the options/users in the selected
* heading.
*/
- public void doGotoeditgroups(RunData data, TemplateContext context)
+ public void doGotoeditgroups(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -619,7 +619,7 @@
/**
*
*/
- public void doAddheading(RunData data, TemplateContext context)
+ public void doAddheading(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -641,7 +641,7 @@
scarabR.setConfirmMessage(L10NKeySet.HeadingAddedNowAddContent);
}
- public void doAddgroup(RunData data, TemplateContext context)
+ public void doAddgroup(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -707,7 +707,7 @@
}
}
- public void doDeletegroup(RunData data, TemplateContext context)
+ public void doDeletegroup(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -756,7 +756,7 @@
}
}
- public void doEditgroupname(RunData data, TemplateContext context)
+ public void doEditgroupname(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -797,7 +797,7 @@
}
- public void doSavegroups(RunData data, TemplateContext context)
+ public void doSavegroups(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -888,7 +888,7 @@
}
- public void doAdddate(RunData data, TemplateContext context)
+ public void doAdddate(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -933,7 +933,7 @@
scarabR.setConfirmMessage(L10NKeySet.DateAdded);
}
- public void doAdddaterange(RunData data, TemplateContext context)
+ public void doAdddaterange(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1033,7 +1033,7 @@
}
- public void doDeletedate(RunData data, TemplateContext context)
+ public void doDeletedate(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1065,7 +1065,7 @@
}
}
- public void doDeletedaterange(RunData data, TemplateContext context)
+ public void doDeletedaterange(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1100,7 +1100,7 @@
}
- public void doRedirecttocrossmodulelist(RunData data, TemplateContext context)
+ public void doRedirecttocrossmodulelist(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1111,7 +1111,7 @@
setTarget(data, "reports,XModuleList.vm");
}
- public void doConfinedataset(RunData data, TemplateContext context)
+ public void doConfinedataset(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1144,7 +1144,7 @@
}
- public void doSwaprowcol(RunData data, TemplateContext context)
+ public void doSwaprowcol(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1174,7 +1174,7 @@
// FIXME: do we need a confirmation message? -jon
}
- public void doVerifyreport(RunData data, TemplateContext context)
+ public void doVerifyreport(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1184,7 +1184,7 @@
}
}
- public void doGeneratereport(RunData data, TemplateContext context)
+ public void doGeneratereport(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1238,7 +1238,7 @@
}
}
- public void doCreatenew(RunData data, TemplateContext context)
+ public void doCreatenew(RunData data, Context context)
throws Exception
{
String key = data.getParameters()
@@ -1261,7 +1261,7 @@
}
- public void doSavereport(RunData data, TemplateContext context)
+ public void doSavereport(RunData data, Context context)
throws Exception
{
setup(data,context);
@@ -1317,7 +1317,7 @@
}
}
- public void doDeletestoredreport(RunData data, TemplateContext context)
+ public void doDeletestoredreport(RunData data, Context context)
throws Exception
{
setup(data,context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -50,7 +50,7 @@
import java.util.ArrayList;
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.tool.IntakeTool;
@@ -85,7 +85,7 @@
public class DefineXModuleList extends RequireLoginFirstAction
{
public void doGotoquerywithinternallist(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -126,7 +126,7 @@
}
}
- public void doFinished(RunData data, TemplateContext context)
+ public void doFinished(RunData data, Context context)
throws Exception
{
// add any last minute additions
@@ -149,7 +149,7 @@
}
}
- public void doFinishedreportlist(RunData data, TemplateContext context)
+ public void doFinishedreportlist(RunData data, Context context)
throws Exception
{
doFinished(data, context);
@@ -186,7 +186,7 @@
}
- public void doRemoveSavedlist(RunData data, TemplateContext context)
+ public void doRemoveSavedlist(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -202,7 +202,7 @@
}
}
- public void doRemoveitemsfromlist(RunData data, TemplateContext context)
+ public void doRemoveitemsfromlist(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -221,7 +221,7 @@
}
}
- public void doGotosavelist(RunData data, TemplateContext context)
+ public void doGotosavelist(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -250,13 +250,13 @@
}
}
- public void doStartover(RunData data, TemplateContext context)
+ public void doStartover(RunData data, Context context)
throws Exception
{
((ScarabUser)data.getUser()).setCurrentMITList(null);
}
- public void doSavelist(RunData data, TemplateContext context)
+ public void doSavelist(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -296,7 +296,7 @@
}
}
- public void doAddselectedrmits(RunData data, TemplateContext context)
+ public void doAddselectedrmits(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -329,7 +329,7 @@
currentList.addAll(list);
}
- private void addSelectedRMITs(RunData data, TemplateContext context)
+ private void addSelectedRMITs(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -404,7 +404,7 @@
}
private void setAndGetCurrentList(String listId, RunData data,
- TemplateContext context)
+ Context context)
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -429,7 +429,7 @@
}
}
- public void doToggleothermodules(RunData data, TemplateContext context)
+ public void doToggleothermodules(RunData data, Context context)
throws Exception
{
String flag = data.getParameters()
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -51,7 +51,7 @@
// Turbine Stuff
import org.apache.turbine.Turbine;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.ContextAdapter;
@@ -83,7 +83,7 @@
/**
* This manages clicking the Forgot Password button
*/
- public void doForgotpassword(RunData data, TemplateContext context)
+ public void doForgotpassword(RunData data, Context context)
throws Exception
{
data.setACL(null);
@@ -98,7 +98,7 @@
* This takes care of looking the user up, setting the password to an arbitrary
* value and sending the user an email
*/
- public boolean forgotPassword(RunData data, TemplateContext context)
+ public boolean forgotPassword(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -149,7 +149,7 @@
* @param tempPassword
* @throws Exception
*/
- public static void sendNotificationEmail(TemplateContext context, ScarabUser user, String tempPassword) throws Exception
+ public static void sendNotificationEmail(Context context, ScarabUser user, String tempPassword) throws Exception
{
// place the password
// in the context for use in the email template.
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -55,7 +55,7 @@
// Turbine Stuff
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.fulcrum.security.TurbineSecurity;
@@ -88,7 +88,7 @@
*/
public class HandleRoleRequests extends RequireLoginFirstAction
{
- public void doRequestroles(RunData data, TemplateContext context)
+ public void doRequestroles(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
@@ -211,7 +211,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- private SecurityAdminTool getSecurityAdminTool(TemplateContext context)
+ private SecurityAdminTool getSecurityAdminTool(Context context)
{
return (SecurityAdminTool)context
.get(ScarabConstants.SECURITY_ADMIN_TOOL);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -49,7 +49,7 @@
import java.util.List;
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.fulcrum.parser.ParameterParser;
@@ -129,7 +129,7 @@
/**
* This manages clicking the Login button
*/
- public void doLogin(RunData data, TemplateContext context)
+ public void doLogin(RunData data, Context context)
throws Exception
{
data.setACL(null);
@@ -216,7 +216,7 @@
* If checks fail, the user is not logged in, but a failure action has been
* prepared for further activity (return to login page, not confirmed page, password renew page, etc..)
*/
- public boolean checkUser(RunData data, TemplateContext context)
+ public boolean checkUser(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -384,7 +384,7 @@
/**
* calls doLogin()
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doLogin(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.tigris.scarab.om.ScarabUser;
@@ -70,7 +70,7 @@
* Logs out the currently logged-in user. Only sets the confirmation
* message if there was a user previously logged in.
*/
- public void doLogout(RunData data, TemplateContext context)
+ public void doLogout(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -93,9 +93,9 @@
}
/**
- * @see #doLogout(RunData, TemplateContext)
+ * @see #doLogout(RunData, Context)
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doLogout(data, context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -62,7 +62,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.BaseModifyIssue;
@@ -122,12 +122,12 @@
* AssignIssue action, assigning the given list of users to the issue with
* the specified userattribute.
*
- * @see AssignIssue#doAddmyself(RunData, TemplateContext)
+ * @see AssignIssue#doAddmyself(RunData, Context)
* @param data
* @param context
* @throws Exception
*/
- public void doAddwatchers(RunData data, TemplateContext context)
+ public void doAddwatchers(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = this.getScarabRequestTool(context);
@@ -160,7 +160,7 @@
- public void doSubmitattributes(RunData data, TemplateContext context)
+ public void doSubmitattributes(RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -444,7 +444,7 @@
* once all pre-conditions have been checked.
**/
private void submitattributesPerform(
- final TemplateContext context,
+ final Context context,
final ScarabUser user,
RunData runData,
REASON_SAVE_MODE saveMode)
@@ -626,7 +626,7 @@
/**
* Modifies attachments of type "url".
*/
- public void doSaveurl (RunData data, TemplateContext context)
+ public void doSaveurl (RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -733,7 +733,7 @@
/**
* Enable edition mode for the comment page.
*/
- public void doEditcommentpage(RunData data, TemplateContext context)
+ public void doEditcommentpage(RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -763,7 +763,7 @@
/**
* Enable edition mode for the attributes page.
*/
- public void doEditattributespage(RunData data, TemplateContext context)
+ public void doEditattributespage(RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -793,7 +793,7 @@
/**
* Adds an attachment of type "comment".
*/
- public void doSubmitcomment (RunData data, TemplateContext context)
+ public void doSubmitcomment (RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -850,7 +850,7 @@
/**
* Add an attachment of type "file"
*/
- public void doSubmitfile (RunData data, TemplateContext context)
+ public void doSubmitfile (RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -997,7 +997,7 @@
/**
* Edits a comment.
*/
- public void doEditcomment (RunData data, TemplateContext context)
+ public void doEditcomment (RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -1059,7 +1059,7 @@
/**
* Deletes a url.
*/
- public void doDeleteurl (RunData data, TemplateContext context)
+ public void doDeleteurl (RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -1113,7 +1113,7 @@
/**
* Deletes a file.
*/
- public void doDeletefile (RunData data, TemplateContext context)
+ public void doDeletefile (RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -1191,7 +1191,7 @@
* Modifies the dependency type between the current issue
* And its parent or child issue.
*/
- /*public void doDeletedependencies(RunData data, TemplateContext context)
+ /*public void doDeletedependencies(RunData data, Context context)
throws Exception
{
saveDependencyDeletions(data, context);
@@ -1203,7 +1203,7 @@
* Modifies the dependency type between the current issue
* And its parent or child issue.
*/
- public void doSavedependencychanges(RunData data, TemplateContext context)
+ public void doSavedependencychanges(RunData data, Context context)
throws Exception
{
saveDependencyChanges(data, context, false);
@@ -1213,7 +1213,7 @@
* Modifies the dependency type between the current issue
* And its parent or child issue.
*/
- public void doSavenewdependencies(RunData data, TemplateContext context)
+ public void doSavenewdependencies(RunData data, Context context)
throws Exception
{
saveNewDependencies(data, context, false);
@@ -1223,7 +1223,7 @@
* Modifies the dependency type between the current issue
* And its parent or child issue.
*/
- private void saveDependencyChanges(RunData data, TemplateContext context,
+ private void saveDependencyChanges(RunData data, Context context,
boolean doDelete)
throws Exception
{
@@ -1291,7 +1291,7 @@
* Modifies the dependency type between the current issue
* And its parent or child issue.
*/
- private void saveNewDependencies(RunData data, TemplateContext context,
+ private void saveNewDependencies(RunData data, Context context,
boolean doDelete)
throws Exception
{
@@ -1339,7 +1339,7 @@
* And its parent or child issue.
*/
/*
- private void saveDependencyDeletions(RunData data, TemplateContext context)
+ private void saveDependencyDeletions(RunData data, Context context)
throws Exception
{
if (isCollision(data, context))
@@ -1398,7 +1398,7 @@
*/
private boolean doAdddependency(Issue issue, IntakeTool intake,
Group group, ScarabRequestTool scarabR,
- TemplateContext context,
+ Context context,
ScarabLocalizationTool l10n,
ScarabUser user)
throws Exception
@@ -1536,7 +1536,7 @@
*/
private boolean doUpdatedependencies(Issue issue, IntakeTool intake,
ScarabRequestTool scarabR,
- TemplateContext context,
+ Context context,
ScarabUser user,
DependType newDependType,
boolean setAsPrerequisite)
@@ -1623,7 +1623,7 @@
*/
private boolean doRemoveSelectedDependencies(Issue issue, IntakeTool intake,
ScarabRequestTool scarabR,
- TemplateContext context,
+ Context context,
ScarabLocalizationTool l10n,
ScarabUser user)
throws Exception
@@ -1697,7 +1697,7 @@
/**
* Redirects to AssignIssue page.
*/
- public void doEditassignees(RunData data, TemplateContext context)
+ public void doEditassignees(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -1730,7 +1730,7 @@
/**
* Redirects to MoveIssue page with move action selected.
*/
- public void doMove(RunData data, TemplateContext context)
+ public void doMove(RunData data, Context context)
throws Exception
{
boolean collisionOccurred = isCollision(data, context);
@@ -1767,7 +1767,7 @@
/**
* Redirects to MoveIssue page with copy action selected.
*/
- public void doCopy(RunData data, TemplateContext context)
+ public void doCopy(RunData data, Context context)
throws Exception
{
boolean collisionOccurred = isCollision(data, context);
@@ -1794,7 +1794,7 @@
* does not actually modify an issue, but sets the preferred view
* of an issue for the current session
*/
- public void doSetissueview(RunData data, TemplateContext context)
+ public void doSetissueview(RunData data, Context context)
throws Exception
{
String tab = data.getParameters().getString("tab",
@@ -1806,12 +1806,12 @@
* This action method delegates on the doAddmyself method from AssignIssue
* action, assigning the current user to the issue in the specified userattribute.
*
- * @see AssignIssue#doAddmyself(RunData, TemplateContext)
+ * @see AssignIssue#doAddmyself(RunData, Context)
* @param data
* @param context
* @throws Exception
*/
- public void doAddmyself(RunData data, TemplateContext context)
+ public void doAddmyself(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = this.getScarabRequestTool(context);
@@ -1839,7 +1839,7 @@
}
}
- public void doDeleteissue(RunData data, TemplateContext context)
+ public void doDeleteissue(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = this.getScarabRequestTool(context);
@@ -1854,7 +1854,7 @@
}
- public void doRemovemyself(RunData data, TemplateContext context)
+ public void doRemovemyself(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = this.getScarabRequestTool(context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.torque.oid.IDBroker;
import org.apache.torque.util.BasePeer;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.GlobalParameter;
@@ -88,7 +88,7 @@
/**
* Process Update button which updates a Module
*/
- public void doUpdate(RunData data, TemplateContext context)
+ public void doUpdate(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
@@ -256,7 +256,7 @@
/**
* Process Create button which creates a new Module
*/
- public void doCreate(RunData data, TemplateContext context)
+ public void doCreate(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.BaseModifyIssue;
@@ -95,7 +95,7 @@
* From MoveIssue.vm -> MoveIssue2.vm, we only need to validate the inputs.
* Intake + Pull is so friggen cool.
*/
- public void doValidate(RunData data, TemplateContext context)
+ public void doValidate(RunData data, Context context)
throws Exception
{
boolean collisionOccurred = isCollision(data, context);
@@ -229,7 +229,7 @@
* Deals with moving or copying an issue from one module to
* another module.
*/
- public void doSaveissue(RunData data, TemplateContext context)
+ public void doSaveissue(RunData data, Context context)
throws Exception
{
//Clear cache for stability reasons, to avoid missing, cached values
@@ -377,7 +377,7 @@
/**
* This manages clicking the Back button on MoveIssue2.vm
*/
- public void doBacktoone(RunData data, TemplateContext context) throws Exception
+ public void doBacktoone(RunData data, Context context) throws Exception
{
setTarget(data, data.getParameters()
.getString(ScarabConstants.CANCEL_TEMPLATE, "MoveIssue.vm"));
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Query;
@@ -78,7 +78,7 @@
/**
* This method is not used until subscribed queries is working
*/
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -125,7 +125,7 @@
}
- public void doDeletequeries(RunData data, TemplateContext context)
+ public void doDeletequeries(RunData data, Context context)
throws Exception
{
Object[] keys = data.getParameters().getKeys();
@@ -156,7 +156,7 @@
}
}
- public void doCopyquery(RunData data, TemplateContext context)
+ public void doCopyquery(RunData data, Context context)
throws Exception
{
ParameterParser pp = data.getParameters();
@@ -183,7 +183,7 @@
* page. Since it is a 'create new' option, several of the session persistent
* options are reset.
*/
- public void doGotoadvancedquery(RunData data, TemplateContext context)
+ public void doGotoadvancedquery(RunData data, Context context)
throws Exception
{
// reset the MITList
@@ -205,7 +205,7 @@
* @param context
* @throws Exception
*/
- public void doSetstartpage(RunData data, TemplateContext context) throws Exception
+ public void doSetstartpage(RunData data, Context context) throws Exception
{
ParameterParser pp = data.getParameters();
String queryId = pp.get("startpage");
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
// Scarab Stuff
@@ -68,7 +68,7 @@
* This will redirect to whatever NEXT_TEMPLATE is
* set to be. If that isn't set, it goes to the user's homepage
*/
- public void doRedirect(RunData data, TemplateContext context)
+ public void doRedirect(RunData data, Context context)
throws Exception
{
// set the next template
@@ -82,7 +82,7 @@
/**
* calls doRedirect().
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doRedirect(data, context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -50,7 +50,7 @@
import java.util.Locale;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.ContextAdapter;
import org.apache.turbine.tool.IntakeTool;
@@ -84,7 +84,7 @@
* template. As a result, the user will go to the
* RegisterConfirm.vm screen.
*/
- public void doRegister(RunData data, TemplateContext context)
+ public void doRegister(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
@@ -130,7 +130,7 @@
setTarget(data, nextTemplate);
}
- public void doConfirmregistration(RunData data, TemplateContext context)
+ public void doConfirmregistration(RunData data, Context context)
throws Exception
{
String nextTemplate = getNextTemplate(data);
@@ -178,14 +178,14 @@
/**
* returns you to Register.vm
*/
- public void doBack(RunData data, TemplateContext context)
+ public void doBack(RunData data, Context context)
throws Exception
{
setTarget(data, data.getParameters().getString(
ScarabConstants.CANCEL_TEMPLATE, "Register.vm"));
}
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doConfirmregistration(data, context);
@@ -196,7 +196,7 @@
* template. As a result, this will end up sending
* the user to the Confirm screen.
*/
- public void doConfirm(RunData data, TemplateContext context)
+ public void doConfirm(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
@@ -243,7 +243,7 @@
* This manages clicking the "Resend code" button
* in the Confirm.vm template.
*/
- public void doResendconfirmationcode(RunData data, TemplateContext context)
+ public void doResendconfirmationcode(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -279,7 +279,7 @@
/**
* Send the confirmation code to the given user.
*/
- private void sendConfirmationEmail(ScarabUser su, TemplateContext context)
+ private void sendConfirmationEmail(ScarabUser su, Context context)
throws Exception
{
Email te = new Email();
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -60,7 +60,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.attribute.DateAttribute;
@@ -107,13 +107,13 @@
/**
* Calls do check for duplicates by default.
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doCheckforduplicates(data, context);
}
- private boolean checkIssueTypeStatus(RunData data, TemplateContext context)
+ private boolean checkIssueTypeStatus(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -137,7 +137,7 @@
return isValid;
}
- public void doCheckforduplicates(RunData data, TemplateContext context)
+ public void doCheckforduplicates(RunData data, Context context)
throws Exception
{
if (checkIssueTypeStatus(data, context))
@@ -146,7 +146,7 @@
}
}
- public void checkForDuplicates(RunData data, TemplateContext context)
+ public void checkForDuplicates(RunData data, Context context)
throws Exception
{
ScarabLocalizationTool l10n = getLocalizationTool(context);
@@ -189,7 +189,7 @@
* the screen is set to entry,Wizard2.vm so that they can be viewed.
*
* @param data a <code>RunData</code> value
- * @param context a <code>TemplateContext</code> value
+ * @param context a <code>Context</code> value
* @param threshold an <code>int</code> number of issues that determines
* whether "entry,Wizard2.vm" screen or the screen given by
* nextTemplate is shown
@@ -202,7 +202,7 @@
* @exception Exception if an error occurs
*/
private boolean searchAndSetTemplate(RunData data,
- TemplateContext context,
+ Context context,
int threshold,
int maxResults,
Issue issue,
@@ -264,7 +264,7 @@
* @exception Exception if an error occurs
*/
private void setRequiredFlags(Issue issue, IntakeTool intake,
- LinkedMap avMap, TemplateContext context)
+ LinkedMap avMap, Context context)
throws Exception
{
if (issue == null)
@@ -374,7 +374,7 @@
* @exception Exception pass thru
*/
private boolean setAttributeValues(Issue issue, IntakeTool intake,
- TemplateContext context,
+ Context context,
LinkedMap avMap)
throws Exception
{
@@ -422,7 +422,7 @@
/**
* handles entering an issue
*/
- public void doEnterissue(RunData data, TemplateContext context)
+ public void doEnterissue(RunData data, Context context)
throws Exception
{
if (checkIssueTypeStatus(data, context))
@@ -434,7 +434,7 @@
/**
* handles entering an issue
*/
- private void enterIssue(RunData data, TemplateContext context)
+ private void enterIssue(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -650,7 +650,7 @@
/**
* Add attachment file
*/
- public void doAddfile(RunData data, TemplateContext context)
+ public void doAddfile(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -677,7 +677,7 @@
/**
* Remove an attachment file
*/
- public void doRemovefile(RunData data, TemplateContext context)
+ public void doRemovefile(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -716,7 +716,7 @@
* Handles adding a comment to one or more issues. This is an option
* which is available on Wizard2 during the dedupe process.
*/
- public void doAddcomment(RunData data, TemplateContext context)
+ public void doAddcomment(RunData data, Context context)
throws Exception
{
ScarabLocalizationTool l10n = getLocalizationTool(context);
@@ -792,7 +792,7 @@
/**
* The button for this action is commented out on Wizard2, so it
* will not be called
- public void doAddvote(RunData data, TemplateContext context)
+ public void doAddvote(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -836,13 +836,13 @@
}
*/
- public void doGotowizard3(RunData data, TemplateContext context)
+ public void doGotowizard3(RunData data, Context context)
throws Exception
{
setTarget(data, "entry,Wizard3.vm");
}
- public void doUsetemplates(RunData data, TemplateContext context)
+ public void doUsetemplates(RunData data, Context context)
throws Exception
{
getIntakeTool(context).removeAll();
@@ -853,7 +853,7 @@
}
}
- private void cleanup(RunData data, TemplateContext context)
+ private void cleanup(RunData data, Context context)
{
data.getParameters().remove(ScarabConstants.HISTORY_SCREEN);
String issueKey = data.getParameters()
@@ -868,7 +868,7 @@
/**
* User selects page to redirect to after entering issue.
*/
- private void doRedirect(RunData data, TemplateContext context,
+ private void doRedirect(RunData data, Context context,
int templateCode, Issue issue)
throws Exception
{
@@ -956,7 +956,7 @@
setTarget(data, template);
}
- public void doStart(RunData data, TemplateContext context)
+ public void doStart(RunData data, Context context)
throws Exception
{
cleanOutStaleIssue(data, context);
@@ -965,7 +965,7 @@
/**
* for easy access by TemplateList action
*/
- static void cleanOutStaleIssue(RunData data, TemplateContext context)
+ static void cleanOutStaleIssue(RunData data, Context context)
throws Exception
{
String key = data.getParameters()
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
import org.apache.fulcrum.security.entity.User;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.actions.TemplateSessionValidator;
@@ -81,7 +81,7 @@
}
}
- TemplateContext context = getTemplateContext(data);
+ Context context = getContext(data);
ScarabLocalizationTool l10n =
(ScarabLocalizationTool) context.get(ScarabConstants.LOCALIZATION_TOOL);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -63,7 +63,7 @@
import org.apache.fulcrum.parser.StringValueParser;
import org.apache.torque.TorqueException;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -123,7 +123,7 @@
/**
*
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -275,7 +275,7 @@
* Saves the query string for the logged-in user, and performs the
* default action of {@link #doPerform}.
*/
- public void doSearch(RunData data, TemplateContext context)
+ public void doSearch(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -289,7 +289,7 @@
/**
Redirects to form to save the query. May redirect to Login page.
*/
- public void doRedirecttosavequery(RunData data, TemplateContext context)
+ public void doRedirecttosavequery(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -308,7 +308,7 @@
}
}
- public void doRedirecttocrossmodulelist(RunData data, TemplateContext context)
+ public void doRedirecttocrossmodulelist(RunData data, Context context)
throws Exception
{
data.getParameters().setString("queryString", getQueryString(data));
@@ -318,7 +318,7 @@
/**
Saves query.
*/
- public void doSavequery(RunData data, TemplateContext context)
+ public void doSavequery(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -451,7 +451,7 @@
}
}
- public boolean doEditqueryinfo(RunData data, TemplateContext context)
+ public boolean doEditqueryinfo(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -497,7 +497,7 @@
return success;
}
- public void doPreparequery(RunData data, TemplateContext context)
+ public void doPreparequery(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -516,7 +516,7 @@
/**
Edits the stored query.
*/
- public void doEditstoredquery(RunData data, TemplateContext context)
+ public void doEditstoredquery(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -534,7 +534,7 @@
Runs the stored story.
[HD: As this method is only called internally, i made it private and removed the setup() call]
*/
- private void doRunstoredquery(RunData data, TemplateContext context)
+ private void doRunstoredquery(RunData data, Context context)
throws Exception
{
//setup(data, context);
@@ -591,7 +591,7 @@
* assuming the number is the query id. Else, we assume it is a
* string and that is our template to redirect to.
*/
- public void doSelectquery(RunData data, TemplateContext context)
+ public void doSelectquery(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -768,7 +768,7 @@
/**
redirects to AdvancedQuery.
*/
- public void doRefinequery(RunData data, TemplateContext context)
+ public void doRefinequery(RunData data, Context context)
throws Exception
{
context.put("refine", "true");
@@ -779,7 +779,7 @@
/**
Overrides base class.
*/
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
boolean success = doEditqueryinfo(data, context);
@@ -902,7 +902,7 @@
return newIssueIdList;
}
- public void doGetissues(RunData data, TemplateContext context) throws TorqueException
+ public void doGetissues(RunData data, Context context) throws TorqueException
{
try
{
@@ -978,7 +978,7 @@
return newIssueIdList;
}
- public void doGotoeditlist(RunData data, TemplateContext context)
+ public void doGotoeditlist(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1001,7 +1001,7 @@
/**
* Adds users from temporary working list.
*/
- public void doAddusers(RunData data, TemplateContext context)
+ public void doAddusers(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1039,7 +1039,7 @@
/**
Adds user to the search form.
*/
- public void doAdduserbyusername(RunData data, TemplateContext context)
+ public void doAdduserbyusername(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1082,7 +1082,7 @@
}
private void addAttributeToMap(Map userMap, String userId, String attrId,
- TemplateContext context)
+ Context context)
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
Set attrIds = (Set)userMap.get(userId);
@@ -1121,7 +1121,7 @@
/**
* Removes users from temporary working list.
*/
- public void doRemoveusers(RunData data, TemplateContext context)
+ public void doRemoveusers(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1163,7 +1163,7 @@
/**
* Changes the user attribute a user is associated with.
*/
- public void doUpdateusers(RunData data, TemplateContext context)
+ public void doUpdateusers(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1231,7 +1231,7 @@
for (int j=0; j<attrIds.length; j++)
{
addAttributeToMap(userMap, userId, attrIds[j],
- getTemplateContext(data));
+ getContext(data));
}
}
}
@@ -1239,7 +1239,7 @@
}
}
- public void doSetquerytarget(RunData data, TemplateContext context)
+ public void doSetquerytarget(RunData data, Context context)
throws Exception
{
setup(data, context);
@@ -1267,7 +1267,7 @@
"Issue type list did not contain one and only one element.");
}
}
- private void setup(RunData data, TemplateContext context) throws Exception{
+ private void setup(RunData data, Context context) throws Exception{
l10n = getLocalizationTool(context);
scarabR = getScarabRequestTool(context);
intake = getIntakeTool(context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/SetHomePage.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/SetHomePage.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/SetHomePage.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/SetHomePage.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.tigris.scarab.om.ScarabUser;
@@ -65,7 +65,7 @@
/**
* Sets the home page to the current target
*/
- public void doPerform(RunData data, TemplateContext context) throws Exception
+ public void doPerform(RunData data, Context context) throws Exception
{
String target = data.getTarget();
//TODO [HD] Maybe this hard coded reference shall be
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -56,7 +56,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.attribute.OptionAttribute;
@@ -93,7 +93,7 @@
/**
* Creates new template.
*/
- public void doCreatenew(RunData data, TemplateContext context)
+ public void doCreatenew(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -205,7 +205,7 @@
/**
* Edits template's attribute values.
*/
- public void doEditvalues(RunData data, TemplateContext context)
+ public void doEditvalues(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -302,7 +302,7 @@
/**
* Edits templates's basic information.
*/
- public boolean doEdittemplateinfo(RunData data, TemplateContext context)
+ public boolean doEdittemplateinfo(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -352,7 +352,7 @@
return success;
}
- public void doDeletetemplates(RunData data, TemplateContext context)
+ public void doDeletetemplates(RunData data, Context context)
throws Exception
{
ScarabLocalizationTool l10n = getLocalizationTool(context);
@@ -404,7 +404,7 @@
}
}
- public void doUsetemplate(RunData data, TemplateContext context)
+ public void doUsetemplate(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -421,7 +421,7 @@
}
}
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
doEditvalues(data, context);
@@ -459,7 +459,7 @@
/**
Overrides base class.
*/
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
boolean success = doEdittemplateinfo(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ViewIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ViewIssue.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ViewIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ViewIssue.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.Turbine;
@@ -64,7 +64,7 @@
public class ViewIssue extends RequireLoginFirstAction
{
- public void doSetissueview(RunData data, TemplateContext context)
+ public void doSetissueview(RunData data, Context context)
throws Exception
{
// fetch property here so it can be changed at runtime
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AppConfigurationSettings.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AppConfigurationSettings.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AppConfigurationSettings.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AppConfigurationSettings.java 2012-05-04 05:59:43-0700
@@ -57,7 +57,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.log4j.Logger;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.tools.localization.L10NKeySet;
@@ -75,7 +75,7 @@
{
public static Logger log = Log.get(AppConfigurationSettings.class.getName());
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
boolean customSettingsChanged = false;
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -58,7 +58,7 @@
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.IssueTemplateInfo;
@@ -101,7 +101,7 @@
private static final Integer REJECTED = QUERY;
private static final Integer APPROVED = ISSUE_ENTRY_TEMPLATE;
- public void doSubmit(RunData data, TemplateContext context)
+ public void doSubmit(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = (ScarabRequestTool)context
@@ -270,7 +270,7 @@
}
}
- public void doApproveroles(RunData data, TemplateContext context)
+ public void doApproveroles(RunData data, Context context)
throws Exception
{
String template = getCurrentTemplate(data, null);
@@ -359,7 +359,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- private SecurityAdminTool getSecurityAdminTool(TemplateContext context)
+ private SecurityAdminTool getSecurityAdminTool(Context context)
{
return (SecurityAdminTool)context
.get(ScarabConstants.SECURITY_ADMIN_TOOL);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -54,7 +54,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -82,7 +82,7 @@
/**
* Adds or modifies an issue type's properties.
*/
- public boolean doSaveinfo (RunData data, TemplateContext context)
+ public boolean doSaveinfo (RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -160,7 +160,7 @@
/**
* Adds or modifies an issue type's attribute groups.
*/
- public boolean doSavegroups (RunData data, TemplateContext context)
+ public boolean doSavegroups (RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -265,7 +265,7 @@
/**
* Adds or modifies user attributes' properties
*/
- public boolean doSaveuserattributes (RunData data, TemplateContext context)
+ public boolean doSaveuserattributes (RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -328,7 +328,7 @@
* Creates new attribute group.
*/
public AttributeGroup doCreatenewgroup (RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -347,7 +347,7 @@
/**
* Deletes an attribute group.
*/
- public void doDeletegroup (RunData data, TemplateContext context)
+ public void doDeletegroup (RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -412,7 +412,7 @@
/**
* Unmaps attributes to modules.
*/
- public void doDeleteuserattribute(RunData data, TemplateContext context)
+ public void doDeleteuserattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -467,7 +467,7 @@
public void doCreatenewuserattribute(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -487,7 +487,7 @@
/**
* Selects attribute to add to issue type.
*/
- public void doSelectuserattribute(RunData data, TemplateContext context)
+ public void doSelectuserattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -532,7 +532,7 @@
/**
* Manages clicking of the AllDone button
*/
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
boolean success = doSaveinfo(data, context) &&
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -56,7 +56,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -94,7 +94,7 @@
/**
* Updates attribute group info.
*/
- public boolean doSaveinfo (RunData data, TemplateContext context)
+ public boolean doSaveinfo (RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -135,7 +135,7 @@
/**
* Changes the properties of existing AttributeGroups and their attributes.
*/
- public boolean doSaveattributes (RunData data, TemplateContext context)
+ public boolean doSaveattributes (RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -312,7 +312,7 @@
/**
* Changes the properties of global AttributeGroups and their attributes.
*/
- public boolean doSaveglobal (RunData data, TemplateContext context)
+ public boolean doSaveglobal (RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -417,7 +417,7 @@
/**
* Unmaps attributes to modules.
*/
- public void doDeleteattributes(RunData data, TemplateContext context)
+ public void doDeleteattributes(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -531,7 +531,7 @@
* This manages clicking the create new button on AttributeSelect.vm
*/
public void doCreatenewglobalattribute(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -552,7 +552,7 @@
/**
* Selects attribute to add to issue type and attribute group.
*/
- public void doSelectattribute(RunData data, TemplateContext context)
+ public void doSelectattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -606,7 +606,7 @@
/**
* Saves all data when Done is clicked.
*/
- public void doDone (RunData data, TemplateContext context)
+ public void doDone (RunData data, Context context)
throws Exception
{
String groupId = data.getParameters().getString("groupId");
@@ -632,7 +632,7 @@
/**
* If user attempts to modify locked attributes, gives message.
*/
- private void setLockedMessage (List lockedAttrs, TemplateContext context)
+ private void setLockedMessage (List lockedAttrs, Context context)
throws Exception
{
StringBuffer buf = new StringBuffer();
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -78,7 +78,7 @@
public class BaseConditionEdit extends RequireLoginFirstAction
{
- public void doDelete(RunData data, TemplateContext context) throws TorqueException, Exception
+ public void doDelete(RunData data, Context context) throws TorqueException, Exception
{
IntakeTool intake = getIntakeTool(context);
Group attrGroup = intake.get("ConditionEdit", IntakeTool.DEFAULT_KEY);
@@ -86,7 +86,7 @@
updateObject(data, context, null);
}
- private void delete(RunData data, TemplateContext context) throws TorqueException, Exception
+ private void delete(RunData data, Context context) throws TorqueException, Exception
{
int nObjectType = data.getParameters().getInt("obj_type");
Criteria crit = new Criteria();
@@ -127,7 +127,7 @@
TransitionManager.clear();
}
- private void updateObject(RunData data, TemplateContext context, Integer aConditions[]) throws Exception
+ private void updateObject(RunData data, Context context, Integer aConditions[]) throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
Integer operator = data.getParameters().getInteger("combineWith");
@@ -178,7 +178,7 @@
}
}
- public void doSave(RunData data, TemplateContext context) throws Exception
+ public void doSave(RunData data, Context context) throws Exception
{
this.delete(data, context);
IntakeTool intake = getIntakeTool(context);
@@ -188,7 +188,7 @@
}
- public void doCancel(RunData data, TemplateContext context) throws Exception
+ public void doCancel(RunData data, Context context) throws Exception
{
String lastTemplate = getCancelTemplate(data);
if (lastTemplate != null)
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -80,7 +80,7 @@
/**
* creates or edits global artifact type
*/
- public boolean doSaveinfo(RunData data, TemplateContext context)
+ public boolean doSaveinfo(RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -164,7 +164,7 @@
/**
* Adds or modifies an issue type's attribute groups.
*/
- public boolean doSavegroups (RunData data, TemplateContext context)
+ public boolean doSavegroups (RunData data, Context context)
throws Exception
{
boolean success = true;
@@ -247,7 +247,7 @@
* Redirects to create new user attribute screen.
*/
public void doCreatenewuserattribute(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -269,7 +269,7 @@
* Creates new attribute group.
*/
public AttributeGroup doCreatenewgroup (RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -287,7 +287,7 @@
/**
* Deletes an attribute group.
*/
- public void doDeletegroup (RunData data, TemplateContext context)
+ public void doDeletegroup (RunData data, Context context)
throws Exception
{
ParameterParser params = data.getParameters();
@@ -344,7 +344,7 @@
/**
* Selects attribute to add to issue type.
*/
- public void doSelectuserattribute(RunData data, TemplateContext context)
+ public void doSelectuserattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -383,7 +383,7 @@
/**
* Unmaps attributes to issue types.
*/
- public void doDeleteuserattribute(RunData data, TemplateContext context)
+ public void doDeleteuserattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -435,7 +435,7 @@
/**
* Adds or modifies user attributes' properties
*/
- public boolean doSaveuserattributes (RunData data, TemplateContext context)
+ public boolean doSaveuserattributes (RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -475,7 +475,7 @@
/**
* Manages clicking of the AllDone button
*/
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
boolean success = doSaveinfo(data, context) &&
@@ -498,7 +498,7 @@
*/
public void doGotoothertemplate(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -49,7 +49,7 @@
import java.util.List;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.intake.model.Field;
@@ -75,7 +75,7 @@
* Used on GlobalAttributeEdit.vm to modify Attribute Name/Description/Type
* Use doAddormodifyattributeoptions to modify the options.
*/
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -124,7 +124,7 @@
}
}
- public void doCopy(RunData data, TemplateContext context)
+ public void doCopy(RunData data, Context context)
throws Exception
{
Object[] keys = data.getParameters().getKeys();
@@ -158,7 +158,7 @@
}
}
- public void doDelete(RunData data, TemplateContext context)
+ public void doDelete(RunData data, Context context)
throws Exception
{
String key = null;
@@ -219,7 +219,7 @@
}
}
- public void doUndelete(RunData data, TemplateContext context)
+ public void doUndelete(RunData data, Context context)
throws Exception
{
Object[] keys = data.getParameters().getKeys();
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -52,7 +52,7 @@
import java.util.Date;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.torque.TorqueException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.tool.IntakeTool;
@@ -93,7 +93,7 @@
* Used on GlobalAttributeEdit.vm to modify Attribute Name/Description/Type
* Use doSaveoptions to modify the options.
*/
- public boolean doSaveattributedata(RunData data, TemplateContext context)
+ public boolean doSaveattributedata(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -186,7 +186,7 @@
/**
* Deletes attribute and its mappings after confirmation.
*/
- public void doDeleteattribute(RunData data, TemplateContext context)
+ public void doDeleteattribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -213,7 +213,7 @@
* AttributeOption or create a new one if the name doesn't already exist.
*/
public synchronized boolean
- doSaveoptions(RunData data, TemplateContext context)
+ doSaveoptions(RunData data, Context context)
throws Exception
{
IntakeTool intake = (IntakeTool)context
@@ -469,7 +469,7 @@
/*
* Manages clicking of the AllDone button
*/
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
log().debug("called doDone");
@@ -499,7 +499,7 @@
* manages attribute to module/issue type mapping.
*/
- private void mapAttribute(RunData data, TemplateContext context)
+ private void mapAttribute(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -577,7 +577,7 @@
* FIXME! document that the doCancel method alters the database
* Why does it do this?!!
*/
- public void doCancel(RunData data, TemplateContext context)
+ public void doCancel(RunData data, Context context)
throws Exception
{
String lastTemplate = getCancelTemplate(data);
@@ -599,7 +599,7 @@
* @return true if the operation gets done successfuly, false otherwise
* @throws Exception
*/
- public boolean doSavetransitiondata(RunData data, TemplateContext context)
+ public boolean doSavetransitiondata(RunData data, Context context)
throws Exception
{
boolean bRdo = false;
@@ -651,7 +651,7 @@
* @return true if the operation gets done successfuly, false otherwise
* @throws Exception
*/
- public boolean doDeletetransitiondata(RunData data, TemplateContext context)
+ public boolean doDeletetransitiondata(RunData data, Context context)
throws Exception
{
boolean bRdo = false;
@@ -706,7 +706,7 @@
* @param context
* @return
*/
- private void updatetransitiondata(RunData data, TemplateContext context) throws Exception
+ private void updatetransitiondata(RunData data, Context context) throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
ScarabLocalizationTool l10n = getLocalizationTool(context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -49,7 +49,7 @@
import java.util.List;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
@@ -75,7 +75,7 @@
/**
* Manages clicking of the create new button
*/
- public void doCreatenew(RunData data, TemplateContext context)
+ public void doCreatenew(RunData data, Context context)
throws Exception
{
String nextTemplate = data.getParameters().getString(
@@ -86,7 +86,7 @@
scarabR.setAttribute(AttributeManager.getInstance());
}
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -105,7 +105,7 @@
getScarabRequestTool(context).setConfirmMessage(getLocalizationTool(context).get(DEFAULT_MSG));
}
- public synchronized void doCopy(RunData data, TemplateContext context)
+ public synchronized void doCopy(RunData data, Context context)
throws Exception
{
Object[] keys = data.getParameters().getKeys();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalEmailSettings.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalEmailSettings.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalEmailSettings.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalEmailSettings.java 2012-05-04 05:59:43-0700
@@ -49,7 +49,7 @@
// Turbine Stuff
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.GlobalParameter;
import org.tigris.scarab.om.GlobalParameterManager;
@@ -69,7 +69,7 @@
GlobalParameter.EMAIL_INCLUDE_ISSUE_DETAILS,
GlobalParameter.EMAIL_ALLOW_MODULE_OVERRIDE};
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
ParameterParser pp = data.getParameters();
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -51,7 +51,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -75,7 +75,7 @@
/**
* Changes the properties of existing AttributeOptions.
*/
- public synchronized void doSave(RunData data, TemplateContext context)
+ public synchronized void doSave(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -135,7 +135,7 @@
* Unmaps attribute options to issueTypes.
*/
public void doDeleteissuetypeoptions(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -199,7 +199,7 @@
* Selects option to add to attribute.
*/
public void doSelectissuetypeoption(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -242,7 +242,7 @@
*/
public void doGotoothertemplate(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -259,7 +259,7 @@
/**
* Manages clicking of the Done button
*/
- public void doDone( RunData data, TemplateContext context )
+ public void doDone( RunData data, Context context )
throws Exception
{
doSave(data, 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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -52,7 +52,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.IssueType;
@@ -78,7 +78,7 @@
/**
* Changes the properties of existing IssueTypes.
*/
- public synchronized void doSave (RunData data, TemplateContext context)
+ public synchronized void doSave (RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -136,7 +136,7 @@
/**
* Selects issue type to add to module.
*/
- public void doSelectissuetype(RunData data, TemplateContext context)
+ public void doSelectissuetype(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -165,7 +165,7 @@
/**
* This manages clicking the cancel button
*/
- public void doCreateartifacttype(RunData data, TemplateContext context)
+ public void doCreateartifacttype(RunData data, Context context)
throws Exception
{
data.getParameters().remove("issueTypeId");
@@ -176,7 +176,7 @@
* Deletes an issue type from a module.
*/
public void doDeletemoduleissuetype (RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -50,7 +50,7 @@
// JDK classes
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.tool.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
@@ -79,7 +79,7 @@
/**
*
*/
- public void doGotoaddpermission(RunData data, TemplateContext context)
+ public void doGotoaddpermission(RunData data, Context context)
throws Exception
{
setTarget(data, "admin,AddPermission.vm");
@@ -88,7 +88,7 @@
/**
*
*/
- public void doGotodeletepermission(RunData data, TemplateContext context)
+ public void doGotodeletepermission(RunData data, Context context)
throws Exception
{
setTarget(data, "admin,DeletePermission.vm");
@@ -97,7 +97,7 @@
/**
* Manages the adding of a new role when the 'Add Role' button is pressed.
*/
- public void doAddpermission(RunData data, TemplateContext context)
+ public void doAddpermission(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -141,7 +141,7 @@
* This manages the clicking of the 'Confirm Delete' button and actually
* deletes the Permission.
*/
- public void doDeletepermission(RunData data, TemplateContext context)
+ public void doDeletepermission(RunData data, Context context)
throws Exception
{
String name = data.getParameters().getString("name");
@@ -163,7 +163,7 @@
/**
* This manages clicking the Cancel button
*/
- public void doCancel(RunData data, TemplateContext context) throws Exception
+ public void doCancel(RunData data, Context context) throws Exception
{
setTarget(data, data.getParameters()
.getString(ScarabConstants.CANCEL_TEMPLATE, "admin,AdminIndex.vm"));
@@ -172,7 +172,7 @@
/**
* calls doCancel()
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doCancel(data,context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -50,7 +50,7 @@
// JDK classes
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
import org.apache.turbine.tool.IntakeTool;
import org.apache.fulcrum.intake.model.Group;
@@ -80,7 +80,7 @@
/**
* Go to the Add Role page
*/
- public void doGotoaddrole(RunData data, TemplateContext context)
+ public void doGotoaddrole(RunData data, Context context)
throws Exception
{
setTarget(data, "admin,AddRole.vm");
@@ -89,7 +89,7 @@
/**
* Go to the Edit Role page
*/
- public void doGotoeditrole(RunData data, TemplateContext context)
+ public void doGotoeditrole(RunData data, Context context)
throws Exception
{
checkParamValidity(data, context, "admin,EditRole.vm");
@@ -98,7 +98,7 @@
/**
* Go to the Delete Role page
*/
- public void doGotodeleterole(RunData data, TemplateContext context)
+ public void doGotodeleterole(RunData data, Context context)
throws Exception
{
checkParamValidity(data, context, "admin,DeleteRole.vm");
@@ -107,7 +107,7 @@
/**
* Manages the adding of a new role when the 'Add Role' button is pressed.
*/
- public void doAddrole(RunData data, TemplateContext context)
+ public void doAddrole(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -152,7 +152,7 @@
/**
* Manages the editing of an existing role when the 'Update Role' button is pressed.
*/
- public void doEditrole(RunData data, TemplateContext context)
+ public void doEditrole(RunData data, Context context)
throws Exception
{
/*
@@ -213,7 +213,7 @@
* This manages the clicking of the 'Confirm Delete' button and actually
* deletes the Role.
*/
- public void doDeleterole(RunData data, TemplateContext context)
+ public void doDeleterole(RunData data, Context context)
throws Exception
{
/*
@@ -234,7 +234,7 @@
/**
calls doCancel()
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doCancel(data,context);
@@ -247,7 +247,7 @@
* @param target Page to go to if "name" parameter is present. If
* null then don't go anywhere.
*/
- protected void checkParamValidity(RunData data, TemplateContext context,
+ protected void checkParamValidity(RunData data, Context context,
String target)
{
String name = data.getParameters().getString("name");
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -58,7 +58,7 @@
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.ForgotPassword;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
@@ -89,7 +89,7 @@
/**
* This manages clicking the Add User button
*/
- public void doAdduser(RunData data, TemplateContext context)
+ public void doAdduser(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -172,7 +172,7 @@
}
- public void doEdituser(RunData data, TemplateContext context) throws Exception
+ public void doEdituser(RunData data, Context context) throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
String template = getCurrentTemplate(data, null);
@@ -326,7 +326,7 @@
}
}
- public void doDeleteuser(RunData data, TemplateContext context)
+ public void doDeleteuser(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -380,7 +380,7 @@
/**
* This manages clicking the 'Update Roles' button
*/
- public void doRoles(RunData data, TemplateContext context)
+ public void doRoles(RunData data, Context context)
throws Exception
{
String username = data.getParameters().getString("username");
@@ -429,7 +429,7 @@
/**
*
*/
- public void doGotoedituser(RunData data, TemplateContext context)
+ public void doGotoedituser(RunData data, Context context)
throws Exception
{
String userName = data.getParameters().getString("username");
@@ -447,7 +447,7 @@
/**
*
*/
- public void doGotoeditroles(RunData data, TemplateContext context)
+ public void doGotoeditroles(RunData data, Context context)
throws Exception
{
String userName = data.getParameters().getString("username");
@@ -464,7 +464,7 @@
/**
*
*/
- public void doGotodeleteuser(RunData data, TemplateContext context)
+ public void doGotodeleteuser(RunData data, Context context)
throws Exception
{
setTarget(data, "admin,DeleteUser.vm");
@@ -473,7 +473,7 @@
/**
*
*/
- public void doGotoadduser(RunData data, TemplateContext context)
+ public void doGotoadduser(RunData data, Context context)
throws Exception
{
setTarget(data, "admin,AddUser.vm");
@@ -483,7 +483,7 @@
* This manages clicking the 'Search' button. Sets some data in context and delegates
* to the page (that will make the real search).
*/
- public void doSearch(RunData data, TemplateContext context)
+ public void doSearch(RunData data, Context context)
throws Exception
{
String searchField = data.getParameters().getString("searchField");
@@ -505,7 +505,7 @@
/**
* calls doSearch()
*/
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
doSearch(data, context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -51,7 +51,7 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.om.Attribute;
@@ -76,7 +76,7 @@
/**
* Changes the properties of existing AttributeOptions.
*/
- public synchronized void doSave (RunData data, TemplateContext context)
+ public synchronized void doSave (RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -156,7 +156,7 @@
* Unmaps attribute options to modules.
*/
public void doDeleteattributeoptions(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -223,7 +223,7 @@
* Selects option to add to attribute.
*/
public void doSelectattributeoption(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -273,7 +273,7 @@
/**
* Manages clicking of the Done button
*/
- public void doDone( RunData data, TemplateContext context )
+ public void doDone( RunData data, Context context )
throws Exception
{
doSave(data, 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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
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/SetInfoMessage.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/SetInfoMessage.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/SetInfoMessage.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/SetInfoMessage.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
// Scarab Stuff
@@ -64,7 +64,7 @@
*/
public class SetInfoMessage extends RequireLoginFirstAction
{
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
String msg = data.getParameters().getString("msg");
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
// Scarab Stuff
@@ -75,7 +75,7 @@
//TODO static should work, because there is only one SearchIndex, but its not a clean solution
private static boolean isRunning;
- public void doPerform(RunData data, TemplateContext context)
+ public void doPerform(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -105,7 +105,7 @@
setTarget(data, nextTemplate);
}
- public void doCancel(RunData data, TemplateContext context)
+ public void doCancel(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/BaseModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/BaseModifyIssue.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/BaseModifyIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/BaseModifyIssue.java 2012-05-04 05:59:43-0700
@@ -51,7 +51,7 @@
import java.util.ArrayList;
// Turbine Stuff
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.RunData;
// Scarab Stuff
@@ -70,7 +70,7 @@
*/
public class BaseModifyIssue extends RequireLoginFirstAction
{
- protected boolean isCollision(RunData data, TemplateContext context)
+ protected boolean isCollision(RunData data, Context context)
throws Exception
{
boolean isCollision = false;
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.log4j.Logger;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.TemplateSecureAction;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.om.Module;
@@ -96,7 +96,7 @@
{
boolean auth = false;
String perm = getRequiredPermission(data);
- TemplateContext context = getTemplateContext(data);
+ Context context = getContext(data);
ScarabRequestTool scarabR = getScarabRequestTool(context);
ScarabLocalizationTool l10n = getLocalizationTool(context);
Module currentModule = scarabR.getCurrentModule();
@@ -145,7 +145,7 @@
/**
* Helper method to retrieve the IntakeTool from the Context
*/
- public IntakeTool getIntakeTool(TemplateContext context)
+ public IntakeTool getIntakeTool(Context context)
{
return (IntakeTool)context.get(ScarabConstants.INTAKE_TOOL);
}
@@ -154,7 +154,7 @@
* Helper method to retrieve the ScarabLocalizationTool from the Context
*/
protected final ScarabLocalizationTool
- getLocalizationTool(TemplateContext context)
+ getLocalizationTool(Context context)
{
return (ScarabLocalizationTool)
context.get(ScarabConstants.LOCALIZATION_TOOL);
@@ -163,7 +163,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public ScarabRequestTool getScarabRequestTool(TemplateContext context)
+ public ScarabRequestTool getScarabRequestTool(Context context)
{
return (ScarabRequestTool)context
.get(ScarabConstants.SCARAB_REQUEST_TOOL);
@@ -172,7 +172,7 @@
/**
* Helper method to retrieve the ScarabGlobalTool from the Context
*/
- public ScarabGlobalTool getScarabGlobalTool(TemplateContext context)
+ public ScarabGlobalTool getScarabGlobalTool(Context context)
{
return (ScarabGlobalTool)context
.get(ScarabConstants.SCARAB_GLOBAL_TOOL);
@@ -274,19 +274,19 @@
.getString(ScarabConstants.OTHER_TEMPLATE);
}
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
}
- public void doGonext(RunData data, TemplateContext context)
+ public void doGonext(RunData data, Context context)
throws Exception
{
setTarget(data, getNextTemplate(data));
}
public void doGotoothertemplate(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE,
@@ -294,13 +294,13 @@
setTarget(data, getOtherTemplate(data));
}
- public void doRefresh(RunData data, TemplateContext context)
+ public void doRefresh(RunData data, Context context)
throws Exception
{
setTarget(data, getCurrentTemplate(data));
}
- public void doRefreshresultsperpage(RunData data, TemplateContext context)
+ public void doRefreshresultsperpage(RunData data, Context context)
throws Exception
{
ParameterParser params = data.getParameters();
@@ -321,7 +321,7 @@
}
- public void doReset(RunData data, TemplateContext context)
+ public void doReset(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -329,13 +329,13 @@
setTarget(data, getCurrentTemplate(data));
}
- public void doCancel(RunData data, TemplateContext context)
+ public void doCancel(RunData data, Context context)
throws Exception
{
setTarget(data, getCancelTemplate(data));
}
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
doSave(data, context);
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.log4j.Logger;
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateAction;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.tools.ScarabLocalizationTool;
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -81,7 +81,7 @@
/**
* Helper method to retrieve the IntakeTool from the Context
*/
- public IntakeTool getIntakeTool(TemplateContext context)
+ public IntakeTool getIntakeTool(Context context)
{
return (IntakeTool) getTool(context,
ScarabConstants.INTAKE_TOOL);
@@ -90,7 +90,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public static ScarabRequestTool getScarabRequestTool(TemplateContext context)
+ public static ScarabRequestTool getScarabRequestTool(Context context)
{
return (ScarabRequestTool)context
.get(ScarabConstants.SCARAB_REQUEST_TOOL);
@@ -99,7 +99,7 @@
/**
* Helper method to retrieve the ScarabUserTool from the Context
*/
- public ScarabUserTool getScarabUserTool(TemplateContext context)
+ public ScarabUserTool getScarabUserTool(Context context)
{
return (ScarabUserTool)context
.get(ScarabConstants.SCARAB_USER_TOOL);
@@ -109,7 +109,7 @@
* Helper method to retrieve the ScarabLocalizationTool from the Context
*/
protected final ScarabLocalizationTool
- getLocalizationTool(TemplateContext context)
+ getLocalizationTool(Context context)
{
return (ScarabLocalizationTool)
context.get(ScarabConstants.LOCALIZATION_TOOL);
@@ -211,19 +211,19 @@
.getString(ScarabConstants.OTHER_TEMPLATE);
}
- public void doSave(RunData data, TemplateContext context)
+ public void doSave(RunData data, Context context)
throws Exception
{
}
- public void doGonext(RunData data, TemplateContext context)
+ public void doGonext(RunData data, Context context)
throws Exception
{
setTarget(data, getNextTemplate(data));
}
public void doGotoothertemplate(RunData data,
- TemplateContext context)
+ Context context)
throws Exception
{
data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE,
@@ -231,13 +231,13 @@
setTarget(data, getOtherTemplate(data));
}
- public void doRefresh(RunData data, TemplateContext context)
+ public void doRefresh(RunData data, Context context)
throws Exception
{
setTarget(data, getCurrentTemplate(data));
}
- public void doReset(RunData data, TemplateContext context)
+ public void doReset(RunData data, Context context)
throws Exception
{
IntakeTool intake = getIntakeTool(context);
@@ -245,13 +245,13 @@
setTarget(data, getCurrentTemplate(data));
}
- public void doCancel(RunData data, TemplateContext context)
+ public void doCancel(RunData data, Context context)
throws Exception
{
setTarget(data, getCancelTemplate(data));
}
- public void doDone(RunData data, TemplateContext context)
+ public void doDone(RunData data, Context context)
throws Exception
{
doSave(data, context);
@@ -263,7 +263,7 @@
return LOG;
}
- public void doRefreshresultsperpage(RunData data, TemplateContext context)
+ public void doRefreshresultsperpage(RunData data, Context context)
throws Exception
{
ParameterParser params = data.getParameters();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AbstractScarabModule.java 2012-05-04 05:59:43-0700
@@ -71,7 +71,7 @@
import org.apache.torque.om.SimpleKey;
import org.apache.torque.util.Criteria;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.tigris.scarab.reports.ReportBridge;
import org.tigris.scarab.services.cache.ScarabCache;
@@ -1640,7 +1640,7 @@
* @return
*/
private static boolean canMakeTransitionForOption(RunData data, String fromValue, RModuleOption option, Issue issue, boolean multiple) {
- TemplateContext context = org.apache.turbine.modules.Module.getTemplateContext(data);
+ Context context = org.apache.turbine.modules.Module.getContext(data);
ScarabRequestTool scarabR = (ScarabRequestTool) context.get(ScarabConstants.SCARAB_REQUEST_TOOL);
boolean selected = false;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/IssueTemplateInfo.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/IssueTemplateInfo.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/IssueTemplateInfo.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/IssueTemplateInfo.java 2012-05-04 05:59:43-0700
@@ -49,7 +49,7 @@
import java.util.Arrays;
import org.apache.torque.TorqueException;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.torque.om.Persistent;
@@ -100,7 +100,7 @@
public void saveAndSendEmail(final ScarabUser user,
final Module module,
- final TemplateContext context)
+ final Context context)
throws TorqueException, ScarabException
{
// If it's a module scoped template, user must have Item | Approve
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Query.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Query.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Query.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Query.java 2012-05-04 05:59:43-0700
@@ -50,7 +50,7 @@
import java.util.Arrays;
import java.util.Date;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.torque.TorqueException;
@@ -212,7 +212,7 @@
*/
public boolean saveAndSendEmail(final ScarabUser user,
final Module module,
- final TemplateContext context)
+ final Context context)
throws TorqueException, ScarabException
{
// If it's a module scoped query, user must have Item | Approve
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -6,7 +6,7 @@
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.TurbineException;
import org.apache.turbine.ValveContext;
import org.apache.turbine.pipeline.AbstractValve;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/AssignIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/AssignIssue.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/AssignIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/AssignIssue.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -64,7 +64,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String[] issueIdList = data.getParameters().getStrings("issue_ids");
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ConfigureIssueList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ConfigureIssueList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ConfigureIssueList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ConfigureIssueList.java 2012-05-04 05:59:43-0700
@@ -50,7 +50,7 @@
import java.util.List;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.om.RModuleUserAttribute;
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -64,7 +64,7 @@
public class ConfigureIssueList extends Default
{
- protected void doBuildTemplate(RunData data, TemplateContext context) throws Exception
+ protected void doBuildTemplate(RunData data, Context context) throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
List attributes = scarabR.getAllValidIssueListAttributes();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java 2012-05-04 05:59:43-0700
@@ -57,7 +57,7 @@
import org.apache.log4j.Logger;
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.util.ScarabUtil;
import org.tigris.scarab.util.export.ExportFormat;
@@ -101,7 +101,7 @@
* Since this assumes we're writing the reponse ourself, indicates
* no target to render by setting it to <code>null</code>.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java 2012-05-04 05:59:43-0700
@@ -51,7 +51,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.TemplateSecureScreen;
import org.apache.turbine.Turbine;
@@ -93,7 +93,7 @@
/**
* builds up the context for display of variables on the page.
*/
- protected void doBuildTemplate(RunData data, TemplateContext context)
+ protected void doBuildTemplate(RunData data, Context context)
throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -188,7 +188,7 @@
{
template = template.replace(',', '.');
String perm = ScarabSecurity.getScreenPermission(template);
- TemplateContext context = getTemplateContext(data);
+ Context context = getContext(data);
ScarabRequestTool scarabR = getScarabRequestTool(context);
ScarabLocalizationTool l10n = getLocalizationTool(context);
Module currentModule = scarabR.getCurrentModule();
@@ -265,7 +265,7 @@
public static void setTargetSelectModule(RunData data)
{
- getTemplateContext(data).put(
+ getContext(data).put(
ScarabConstants.NEXT_TEMPLATE,
data.getParameters().getString(ScarabConstants.NEXT_TEMPLATE));
@@ -278,7 +278,7 @@
public static void setTargetLogin(RunData data)
{
- getTemplateContext(data).put(
+ getContext(data).put(
ScarabConstants.NEXT_TEMPLATE,
data.getParameters().getString("template"));
setTarget(data, "Login.vm");
@@ -287,7 +287,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public static ScarabRequestTool getScarabRequestTool(TemplateContext context)
+ public static ScarabRequestTool getScarabRequestTool(Context context)
{
return (ScarabRequestTool) context.get(
ScarabConstants.SCARAB_REQUEST_TOOL);
@@ -296,7 +296,7 @@
/**
* Helper method to retrieve the ScarabLocalizationTool from the Context
*/
- public static ScarabLocalizationTool getLocalizationTool(TemplateContext context)
+ public static ScarabLocalizationTool getLocalizationTool(Context context)
{
return (ScarabLocalizationTool) context.get(
ScarabConstants.LOCALIZATION_TOOL);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueList.java 2012-05-04 05:59:43-0700
@@ -50,7 +50,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.tools.ScarabLocalizationTool;
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -64,7 +64,7 @@
*/
public class IssueList extends Default {
- protected void doBuildTemplate(RunData data, TemplateContext context)
+ protected void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
@@ -72,7 +72,7 @@
}
- private void populateContextWithQueryResults(RunData data, TemplateContext context)
+ private void populateContextWithQueryResults(RunData data, Context context)
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueListExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueListExport.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueListExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueListExport.java 2012-05-04 05:59:43-0700
@@ -52,7 +52,7 @@
import java.util.Map;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.attribute.DateAttribute;
import org.tigris.scarab.om.Module;
@@ -79,12 +79,12 @@
public class IssueListExport extends DataExport
{
Map attributeTypes = new HashMap();
- TemplateContext ctx = null;
+ Context ctx = null;
/**
* Writes the response.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueTypeList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueTypeList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueTypeList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/IssueTypeList.java 2012-05-04 05:59:43-0700
@@ -47,7 +47,7 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.om.Module;
import org.tigris.scarab.tools.ScarabRequestTool;
import org.tigris.scarab.tools.localization.L10NKeySet;
@@ -65,7 +65,7 @@
* Checks if makes any sense displaying the issuetype list, depending on current module
* existing and really having associated issuetypes.
*/
- protected void doBuildTemplate(RunData data, TemplateContext context) throws Exception
+ protected void doBuildTemplate(RunData data, Context context) throws Exception
{
ScarabRequestTool scarabR = getScarabRequestTool(context);
Module module = scarabR.getCurrentModule();
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.tool.IntakeTool;
// Scarab Stuff
@@ -70,7 +70,7 @@
private static final Integer COPY_CHOICE = new Integer(1);
private static final String KEY = "MoveIssueTitle1";
- private TemplateContext context;
+ private Context context;
private RunData data;
protected String getTitle(ScarabRequestTool scarabR,
@@ -82,7 +82,7 @@
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String title = null;
@@ -118,7 +118,7 @@
return KEY;
}
- protected void doBuildTemplate(RunData data, TemplateContext context)
+ protected void doBuildTemplate(RunData data, Context context)
throws Exception
{
this.data = data;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java 2012-05-04 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.TorqueException;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.TemplateScreen;
import org.tigris.scarab.feeds.Feed;
import org.tigris.scarab.feeds.IssueFeed;
@@ -100,7 +100,7 @@
* assumes we're writing the reponse ourself, indicates no target to render
* by setting it to <code>null</code>.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception {
super.doBuildTemplate(data, context);
@@ -177,7 +177,7 @@
* Helper method to retrieve the ScarabLocalizationTool from the Context
*/
protected final ScarabLocalizationTool
- getLocalizationTool(TemplateContext context)
+ getLocalizationTool(Context context)
{
return (ScarabLocalizationTool)
context.get(ScarabConstants.LOCALIZATION_TOOL);
@@ -186,7 +186,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public ScarabRequestTool getScarabRequestTool(TemplateContext context)
+ public ScarabRequestTool getScarabRequestTool(Context context)
{
return (ScarabRequestTool)context
.get(ScarabConstants.SCARAB_REQUEST_TOOL);
@@ -195,7 +195,7 @@
/**
* Helper method to retrieve the ScarabRequestTool from the Context
*/
- public ScarabLink getScarabLinkTool(TemplateContext context)
+ public ScarabLink getScarabLinkTool(Context context)
{
return (ScarabLink)context
.get(ScarabConstants.SCARAB_LINK_TOOL);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java 2012-05-04 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.om.ScarabUser;
import org.tigris.scarab.reports.ReportBridge;
@@ -90,7 +90,7 @@
*
* Modelled after the <code>#reportTable()</code> Velocimacro.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SaveTemplate.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SaveTemplate.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SaveTemplate.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SaveTemplate.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -65,7 +65,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String title = null;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ScarabDefault.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ScarabDefault.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ScarabDefault.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ScarabDefault.java 2012-05-04 05:59:43-0700
@@ -49,7 +49,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
/**
* This class adds a special link tool that should only be used
@@ -63,7 +63,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SelectModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SelectModule.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SelectModule.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/SelectModule.java 2012-05-04 05:59:43-0700
@@ -49,7 +49,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
/**
* This class adds a special link tool that should only be used
@@ -63,7 +63,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java 2012-05-04 05:59:43-0700
@@ -53,7 +53,7 @@
import java.io.OutputStream;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.torque.om.NumberKey;
// Scarab Stuff
@@ -75,7 +75,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewIssue.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewIssue.java 2012-05-04 05:59:43-0700
@@ -51,7 +51,7 @@
import java.util.List;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.services.security.ScarabSecurity;
@@ -81,7 +81,7 @@
* Checks the validity of the issue before displaying the ViewIssue page, and
* sets the proper alert messages for the cases of invalid, moved or deleted issues.
*/
- protected void doBuildTemplate(RunData data, TemplateContext context) throws Exception
+ protected void doBuildTemplate(RunData data, Context context) throws Exception
{
super.doBuildTemplate(data, context);
ScarabRequestTool scarabR = getScarabRequestTool(context);
@@ -165,7 +165,7 @@
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String title = (new L10NMessage(L10NKeySet.ViewIssue).getMessage(l10n));
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ActivityList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ActivityList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ActivityList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ActivityList.java 2012-05-04 05:59:43-0700
@@ -55,7 +55,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.util.Criteria;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.om.ActivitySetPeer;
import org.tigris.scarab.screens.Default;
import org.tigris.scarab.services.cache.ScarabCache;
@@ -76,7 +76,7 @@
/**
* builds up the context for display of variables on the page.
*/
- protected void doBuildTemplate(RunData data, TemplateContext context)
+ protected void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ArtifactTypeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ArtifactTypeEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ArtifactTypeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ArtifactTypeEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -65,7 +65,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String name = scarabR.getCurrentModule().getRModuleIssueType(scarabR.getIssueType()).getDisplayName();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeGroupEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeGroupEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeGroupEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeGroupEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -66,7 +66,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String groupId = data.getParameters().getString("groupid");
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeOptionSelect.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeOptionSelect.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeOptionSelect.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/AttributeOptionSelect.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -65,7 +65,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String name = scarabR.getAttribute().getName();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ConditionEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ConditionEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ConditionEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ConditionEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -64,7 +64,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
String name = scarabR.getCurrentModule().getRModuleIssueType(scarabR.getIssueType()).getDisplayName();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalArtifactTypeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalArtifactTypeEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalArtifactTypeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalArtifactTypeEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -66,7 +66,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
IssueType issueType = scarabR.getIssueType();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalAttributeEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalAttributeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/GlobalAttributeEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -66,7 +66,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
Attribute attribute = scarabR.getAttribute();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ManageArtifactTypes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ManageArtifactTypes.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ManageArtifactTypes.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ManageArtifactTypes.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -65,7 +65,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
return l10n.format("ManageIssueTypes",
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -71,7 +71,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
Attribute attribute = scarabR.getAttribute();
@@ -117,7 +117,7 @@
return l10n.format("EditModuleAttribute", title);
}
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/UserAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/UserAttributeEdit.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/UserAttributeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/UserAttributeEdit.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -66,7 +66,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
Attribute attribute = scarabR.getAttribute();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java 2012-05-04 05:59:43-0700
@@ -54,7 +54,7 @@
import org.apache.velocity.VelocityContext;
import org.apache.fulcrum.velocity.TurbineVelocity;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.tigris.scarab.actions.Search;
import org.tigris.scarab.om.Module;
@@ -80,7 +80,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java 2012-05-04 05:59:43-0700
@@ -51,7 +51,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.modules.Module;
// Scarab Stuff
@@ -69,7 +69,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java 2012-05-04 05:59:43-0700
@@ -52,7 +52,7 @@
// Turbine & Apache Commons Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.commons.fileupload.FileItem;
// Scarab Stuff
@@ -91,7 +91,7 @@
* @param context Velocity template context
*/
public void doBuildTemplate(final RunData data,
- final TemplateContext context)
+ final Context context)
throws Exception
{
@@ -202,7 +202,7 @@
{
String perm = ScarabSecurity.getScreenPermission
("admin.XMLImportIssuesResults.vm");
- TemplateContext context = getTemplateContext(data);
+ Context context = getContext(data);
ScarabRequestTool scarabR = getScarabRequestTool(context);
Module currentModule = scarabR.getCurrentModule();
ScarabUser user = (ScarabUser) data.getUser();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/entry/Wizard1.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/entry/Wizard1.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/entry/Wizard1.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/entry/Wizard1.java 2012-05-04 05:59:43-0700
@@ -48,7 +48,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.tools.ScarabRequestTool;
@@ -69,7 +69,7 @@
{
protected String getTitle(ScarabRequestTool scarabR,
ScarabLocalizationTool l10n,
- RunData data, TemplateContext context)
+ RunData data, Context context)
throws Exception
{
Issue newIssue = scarabR.getReportingIssue();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/home/XModuleList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/home/XModuleList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/home/XModuleList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/home/XModuleList.java 2012-05-04 05:59:43-0700
@@ -49,7 +49,7 @@
// Turbine Stuff
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
// Scarab Stuff
import org.tigris.scarab.screens.Default;
@@ -69,7 +69,7 @@
/**
* builds up the context for display of variables on the page.
*/
- public void doBuildTemplate(RunData data, TemplateContext context)
+ public void doBuildTemplate(RunData data, Context context)
throws Exception
{
super.doBuildTemplate(data, context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/notifications/NotificationList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/notifications/NotificationList.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/notifications/NotificationList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/notifications/NotificationList.java 2012-05-04 05:59:43-0700
@@ -53,7 +53,7 @@
import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.map.ListOrderedMap;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.tigris.scarab.om.Activity;
import org.tigris.scarab.om.ActivitySet;
import org.tigris.scarab.om.Issue;
@@ -77,7 +77,7 @@
public class NotificationList extends Default
{
- protected void doBuildTemplate(RunData data, TemplateContext context) throws Exception
+ protected void doBuildTemplate(RunData data, Context context) throws Exception
{
List notifs = NotificationStatusManager
.getNotificationsFor((ScarabUser) data.getUser());
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/TemplateHtmlEmail.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/TemplateHtmlEmail.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/TemplateHtmlEmail.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/TemplateHtmlEmail.java 2012-05-04 05:59:43-0700
@@ -68,7 +68,7 @@
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.velocity.ContextAdapter;
-import org.apache.fulcrum.template.TemplateContext;
+import org.apache.fulcrum.template.Context;
import org.apache.fulcrum.template.TurbineTemplate;
import org.apache.log4j.Logger;
@@ -83,7 +83,7 @@
/**
* This is a simple class for sending html email from within the TemplateService.
* Essentially, the bodies (text and html) of the email are a TemplateService
- * TemplateContext objects. The beauty of this is that you can send email
+ * Context objects. The beauty of this is that you can send email
* from within your TemplateService template or from your business logic in
* your Java code. The body of the email is just a TemplateService template
* so you can use all the template functionality of your TemplateService within
@@ -132,7 +132,7 @@
* A Context object which stores the information
* needed to construct the email.
*/
- private TemplateContext context = null;
+ private Context context = null;
/**
* The text template to process, relative to VM's template
@@ -147,9 +147,9 @@
private static Logger emailLog = Log.get("email.log");
/**
- * Constructor, sets the TemplateContext object.
+ * Constructor, sets the Context object.
*
- * @param data A TemplateContext object.
+ * @param data A Context object.
* @exception MessagingException.
*/
public TemplateHtmlEmail()
@@ -176,10 +176,10 @@
/**
* Set the template's context
*
- * @param TemplateContext context
+ * @param Context context
* @return A TemplateHtmlEmail (self)
*/
- public TemplateHtmlEmail setContext(TemplateContext context)
+ public TemplateHtmlEmail setContext(Context context)
{
this.context = context;
return this;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/VelocityEmailService.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/VelocityEmailService.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/VelocityEmailService.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/services/email/VelocityEmailService.java 2012-05-04 05:59:43-0700
@@ -68,7 +68,7 @@
import org.apache.fulcrum.InitializationException;
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.template.BaseTemplateEngineService;
-import org.apache.fulcrum.template.TemplateContext;
+import org.apache.fulcrum.template.Context;
import org.apache.fulcrum.velocity.ContextAdapter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
@@ -161,7 +161,7 @@
/**
* @see org.apache.fulcrum.velocity.VelocityService
*/
- public String handleRequest(TemplateContext context, String template)
+ public String handleRequest(Context context, String template)
throws ServiceException
{
return handleRequest(new ContextAdapter(context), template);
@@ -246,7 +246,7 @@
/**
* @see org.apache.fulcrum.template.TemplateEngineService
*/
- public void handleRequest(TemplateContext context, String template,
+ public void handleRequest(Context context, String template,
OutputStream outputStream)
throws ServiceException
{
@@ -275,9 +275,9 @@
}
/**
- * @see BaseTemplateEngineService#handleRequest(TemplateContext, String, Writer)
+ * @see BaseTemplateEngineService#handleRequest(Context, String, Writer)
*/
- public void handleRequest(TemplateContext context,
+ public void handleRequest(Context context,
String template, Writer writer)
throws ServiceException
{
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=11230&r1=11229&r2=11230
==============================================================================
--- 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 05:59:43-0700
@@ -77,7 +77,7 @@
import org.apache.torque.om.SimpleKey;
import org.apache.torque.util.Criteria;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
+import org.apache.velocity.context.Context;
import org.apache.turbine.Turbine;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.tool.IntakeTool;
@@ -364,7 +364,7 @@
*/
private IntakeTool getIntakeTool()
{
- return (IntakeTool)org.apache.turbine.modules.Module.getTemplateContext(data)
+ return (IntakeTool)org.apache.turbine.modules.Module.getContext(data)
.get(ScarabConstants.INTAKE_TOOL);
}
@@ -852,8 +852,8 @@
// DEP: Not sure about this initial list stuff, or if we need it..
if (initialIssueListColumnsSize > issueListColumns.size())
{
- TemplateContext context =
- (TemplateContext) data.getTemp(Turbine.CONTEXT);
+ Context context =
+ (Context) data.getTemp(Turbine.CONTEXT);
context.put("columnLimitExceeded", Boolean.TRUE);
}
return issueListColumns;
@@ -2982,7 +2982,7 @@
{
try
{
- SecurityAdminTool sat = (SecurityAdminTool)org.apache.turbine.modules.Module.getTemplateContext(data)
+ SecurityAdminTool sat = (SecurityAdminTool)org.apache.turbine.modules.Module.getContext(data)
.get(ScarabConstants.SECURITY_ADMIN_TOOL);
if (getCurrentModule().getUnapprovedQueries().isEmpty() &&
getCurrentModule().getUnapprovedTemplates().isEmpty() &&
@@ -3101,7 +3101,7 @@
private ScarabLocalizationTool getLocalizationTool()
{
return (ScarabLocalizationTool)org.apache.turbine.modules.Module
- .getTemplateContext(data).get(ScarabConstants.LOCALIZATION_TOOL);
+ .getContext(data).get(ScarabConstants.LOCALIZATION_TOOL);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java 2012-05-04 05:59:43-0700
@@ -65,7 +65,7 @@
import org.apache.commons.mail.EmailException;
import org.apache.commons.lang.StringUtils;
import org.apache.fulcrum.ServiceException;
-import org.apache.fulcrum.template.TemplateContext;
+import org.apache.fulcrum.template.Context;
import org.apache.fulcrum.velocity.ContextAdapter;
import org.apache.log4j.Logger;
import org.apache.torque.TorqueException;
@@ -120,7 +120,7 @@
public static Logger log = Log.get(Email.class.getName());
- private TemplateContext context = null;
+ private Context context = null;
private String template = null;
@@ -573,7 +573,7 @@
return nameAndAddr;
}
- private static String getSubject(TemplateContext context, String template)
+ private static String getSubject(Context context, String template)
{
template = prependDir(template);
String result = null;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/SnippetRenderer.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/SnippetRenderer.java?view=diff&pathrev=11230&r1=11229&r2=11230
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/SnippetRenderer.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/SnippetRenderer.java 2012-05-04 05:59:43-0700
@@ -82,7 +82,7 @@
}
/**
- * Render the given template. TemplateContext to use will be extracted from
+ * Render the given template. Context to use will be extracted from
* the RunData with which this SnippetRenderer was constructer.
*
* @param template name/path of template in the format expected by the
@@ -96,7 +96,7 @@
try
{
result = Module.handleRequest(
- Module.getTemplateContext(data),
+ Module.getContext(data),
Turbine.getResolver().getTemplate(SNIPPETS, template));
}
catch (Exception e)
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957638