Scarab commit: svn commit: r11252 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions pipeline screens tools
[email protected] Fri, 4 May 2012 08:10:56 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 08:10:56-0700
New Revision: 11252
Modified:
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/pipeline/AnonymousLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabLocalizationTool.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Log:
CHG - Method .RunData.getTarget() -> .RunData.getScreenTemplate()
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=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java 2012-05-04 08:10:56-0700
@@ -1248,7 +1248,7 @@
if (mitlist != null && mitlist.isSingleModuleIssueType())
{
user.setSingleIssueTypeQueryTarget(
- mitlist.getIssueType(), data.getTarget());
+ mitlist.getIssueType(), data.getScreenTemplate());
}
else
{
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=11252&r1=11251&r2=11252
==============================================================================
--- 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 08:10:56-0700
@@ -67,7 +67,7 @@
*/
public void doPerform(RunData data, Context context) throws Exception
{
- String target = data.getTarget();
+ String target = data.getScreenTemplate();
//TODO [HD] Maybe this hard coded reference shall be
// parametrized at some day. (refactoring candidate).
if ("ModuleNotReady.vm".equals(target))
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=11252&r1=11251&r2=11252
==============================================================================
--- 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 08:10:56-0700
@@ -53,7 +53,7 @@
*/
public void invoke(RunData data, ValveContext context) throws IOException, TurbineException
{
- String target = data.getTarget();
+ String target = data.getScreenTemplate();
// Only try this if accessing an authenticated page:
if (!nonAnonymousTargets.contains(target) && target.indexOf("help,") == -1)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java?view=diff&pathrev=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java 2012-05-04 08:10:56-0700
@@ -149,7 +149,7 @@
if (Log.get().isDebugEnabled())
{
- Log.get().debug("Target is now: " + data.getTarget());
+ Log.get().debug("Target is now: " + data.getScreenTemplate());
}
// Pass control to the next Valve in the Pipeline
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java?view=diff&pathrev=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java 2012-05-04 08:10:56-0700
@@ -157,7 +157,7 @@
// remove the current module/issuetype list, if needed
String removeMitKey =
parameters.getString(ScarabConstants.REMOVE_CURRENT_MITLIST_QKEY);
- String target = data.getTarget();
+ String target = data.getScreenTemplate();
boolean xmitScreen =XMIT_SCREENS.containsKey(target);
if (removeMitKey != null
|| !xmitScreen)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&pathrev=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java 2012-05-04 08:10:56-0700
@@ -65,8 +65,8 @@
)
&& ( !data.getAction().equals("Logout")
&& !data.getAction().equals("Login")
- && !data.getTarget().equals("Register.vm")
- && !data.getTarget().equals("ForgotPassword.vm")
+ && !data.getScreenTemplate().equals("Register.vm")
+ && !data.getScreenTemplate().equals("ForgotPassword.vm")
))
{
authenticateNtlm(data);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java?view=diff&pathrev=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java 2012-05-04 08:10:56-0700
@@ -112,7 +112,7 @@
else
{
String s = "Action=" + data.getAction() + " and template=" +
- data.getTarget() + " took: " +
+ data.getScreenTemplate() + " took: " +
(System.currentTimeMillis() - start.longValue()) + " ms";
LOG.debug(s);
try
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=11252&r1=11251&r2=11252
==============================================================================
--- 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 08:10:56-0700
@@ -138,7 +138,7 @@
catch (Exception e)
{
Log.get().info(
- "Error getting page title for Screen: " + data.getTarget());
+ "Error getting page title for Screen: " + data.getScreenTemplate());
}
if (title == null)
{
@@ -164,7 +164,7 @@
{
String property =
"template."
- + data.getTarget().replace(',', '/')
+ + data.getScreenTemplate().replace(',', '/')
+ ".noIssueTypesForwardsTo";
return Turbine.getConfiguration().getString(property, null);
}
@@ -184,7 +184,7 @@
*/
public static boolean checkAuthorized(RunData data) throws Exception
{
- String template = data.getTarget();
+ String template = data.getScreenTemplate();
{
template = template.replace(',', '.');
String perm = ScarabSecurity.getScreenPermission(template);
@@ -203,7 +203,7 @@
// particular issue. Until a more general formula for
// deciding which requests might be ok to continue after
// a login, we will at least allow this one.
- if ("ViewIssue.vm".equals(data.getTarget()))
+ if ("ViewIssue.vm".equals(data.getScreenTemplate()))
{
data.getParameters().setString(
"viewIssueId",
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabLocalizationTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabLocalizationTool.java?view=diff&pathrev=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabLocalizationTool.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabLocalizationTool.java 2012-05-04 08:10:56-0700
@@ -415,7 +415,7 @@
{
String value = null;
- String templateName = data.getTarget().replace(',', '/');
+ String templateName = data.getScreenTemplate().replace(',', '/');
String l10nKey = property;
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=11252&r1=11251&r2=11252
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2012-05-04 08:10:56-0700
@@ -1432,7 +1432,7 @@
*/
public String getCurrentTemplate()
{
- String result = data.getTarget().replace('/',',');
+ String result = data.getScreenTemplate().replace('/',',');
return result;
}
@@ -3088,7 +3088,7 @@
public String reportTimer(String mesg)
{
long endTime = System.currentTimeMillis();
- String s = mesg + ". Time for " + data.getTarget() + ": Lap/Split= "
+ String s = mesg + ". Time for " + data.getScreenTemplate() + ": Lap/Split= "
+ (endTime-lapTime) + "ms; Cumulative= " +
(endTime-startTime) + "ms";
lapTime = endTime;
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957676