quintonm 2003/03/08 18:41:47
Modified: src/java/org/apache/turbine/modules Action.java
ActionEvent.java ActionLoader.java Assembler.java
GenericLoader.java Layout.java LayoutLoader.java
Loader.java Navigation.java NavigationLoader.java
Page.java PageLoader.java ScheduledJob.java
ScheduledJobLoader.java Screen.java
ScreenLoader.java
src/java/org/apache/turbine/modules/navigations
BaseJspNavigation.java DefaultBottomNavigation.java
DefaultTopNavigation.java TemplateNavigation.java
VelocityNavigation.java
src/java/org/apache/turbine/modules/pages DefaultPage.java
JspPage.java TemplatePage.java VelocityPage.java
src/java/org/apache/turbine/modules/screens
BaseJspScreen.java Error.java JspErrorScreen.java
RawScreen.java TemplateScreen.java
VelocityDirectScreen.java VelocityErrorScreen.java
VelocityScreen.java VelocitySecureScreen.java
src/java/org/apache/turbine/modules/screens/error
InvalidState.java
Log:
Updated the copyright years
Revision Changes Path
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Action.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Action.java 12 Feb 2003 17:52:15 -0000 1.2
+++ Action.java 9 Mar 2003 02:41:45 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.5 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionEvent.java
Index: ActionEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionEvent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionEvent.java 28 Feb 2003 12:55:09 -0000 1.4
+++ ActionEvent.java 9 Mar 2003 02:41:45 -0000 1.5
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.8 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java
Index: ActionLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ActionLoader.java 7 Mar 2003 17:11:33 -0000 1.7
+++ ActionLoader.java 9 Mar 2003 02:41:45 -0000 1.8
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,7 @@
/** The single instance of this class. */
private static ActionLoader instance = new ActionLoader(
- Turbine.getConfiguration().getInt(TurbineConstants.ACTION_CACHE_SIZE_KEY,
+ Turbine.getConfiguration().getInt(TurbineConstants.ACTION_CACHE_SIZE_KEY,
TurbineConstants.ACTION_CACHE_SIZE_DEFAULT));
/** The Assembler Broker Service */
1.5 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java
Index: Assembler.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Assembler.java 28 Feb 2003 13:17:10 -0000 1.4
+++ Assembler.java 9 Mar 2003 02:41:45 -0000 1.5
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.7 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java
Index: GenericLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GenericLoader.java 7 Mar 2003 16:51:32 -0000 1.6
+++ GenericLoader.java 9 Mar 2003 02:41:45 -0000 1.7
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Layout.java
Index: Layout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Layout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Layout.java 12 Feb 2003 17:52:15 -0000 1.2
+++ Layout.java 9 Mar 2003 02:41:45 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.8 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java
Index: LayoutLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LayoutLoader.java 7 Mar 2003 17:11:33 -0000 1.7
+++ LayoutLoader.java 9 Mar 2003 02:41:45 -0000 1.8
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -86,9 +86,9 @@
private static Log log = LogFactory.getLog(LayoutLoader.class);
/** The single instance of this class. */
- private static LayoutLoader instance =
+ private static LayoutLoader instance =
new LayoutLoader(Turbine.getConfiguration()
- .getInt(TurbineConstants.LAYOUT_CACHE_SIZE_KEY,
+ .getInt(TurbineConstants.LAYOUT_CACHE_SIZE_KEY,
TurbineConstants.LAYOUT_CACHE_SIZE_DEFAULT));
/** The Assembler Broker Service */
1.2 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Loader.java
Index: Loader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Loader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Loader.java 7 Mar 2003 11:25:50 -0000 1.1
+++ Loader.java 9 Mar 2003 02:41:45 -0000 1.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Navigation.java
Index: Navigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Navigation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Navigation.java 8 Mar 2003 12:26:45 -0000 1.3
+++ Navigation.java 9 Mar 2003 02:41:45 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.8 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java
Index: NavigationLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NavigationLoader.java 7 Mar 2003 17:11:33 -0000 1.7
+++ NavigationLoader.java 9 Mar 2003 02:41:45 -0000 1.8
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,7 +90,7 @@
/** The single instance of this class. */
private static NavigationLoader instance =
new NavigationLoader(Turbine.getConfiguration()
- .getInt(TurbineConstants.NAVIGATION_CACHE_SIZE_KEY,
+ .getInt(TurbineConstants.NAVIGATION_CACHE_SIZE_KEY,
TurbineConstants.NAVIGATION_CACHE_SIZE_DEFAULT));
/** The Assembler Broker Service */
@@ -228,7 +228,7 @@
GenericLoader.getBasePackage());
throw new ClassNotFoundException(
- "\n\n\tRequested Navigation not found: " + name +
+ "\n\n\tRequested Navigation not found: " + name +
"\n\tTurbine looked in the following " +
"modules.packages path: \n\t" + packages.toString() + "\n");
}
1.5 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/modules/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Page.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Page.java 8 Mar 2003 13:25:48 -0000 1.4
+++ Page.java 9 Mar 2003 02:41:45 -0000 1.5
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.6 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageLoader.java 7 Mar 2003 17:11:33 -0000 1.5
+++ PageLoader.java 9 Mar 2003 02:41:45 -0000 1.6
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@
/** The single instance of this class. */
private static PageLoader instance =
new PageLoader(Turbine.getConfiguration()
- .getInt(TurbineConstants.PAGE_CACHE_SIZE_KEY,
+ .getInt(TurbineConstants.PAGE_CACHE_SIZE_KEY,
TurbineConstants.PAGE_CACHE_SIZE_DEFAULT));
/** The Assembler Broker Service */
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJob.java
Index: ScheduledJob.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScheduledJob.java 12 Feb 2003 17:52:15 -0000 1.2
+++ ScheduledJob.java 9 Mar 2003 02:41:45 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.6 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Index: ScheduledJobLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScheduledJobLoader.java 7 Mar 2003 17:11:33 -0000 1.5
+++ ScheduledJobLoader.java 9 Mar 2003 02:41:45 -0000 1.6
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@
/** The single instance of this class. */
private static ScheduledJobLoader instance =
new ScheduledJobLoader(Turbine.getConfiguration()
- .getInt(TurbineConstants.SCHEDULED_JOB_CACHE_SIZE_KEY,
+ .getInt(TurbineConstants.SCHEDULED_JOB_CACHE_SIZE_KEY,
TurbineConstants.SCHEDULED_JOB_CACHE_SIZE_DEFAULT));
/** The Assembler Broker Service */
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/Screen.java
Index: Screen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Screen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Screen.java 8 Mar 2003 12:26:45 -0000 1.3
+++ Screen.java 9 Mar 2003 02:41:45 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.9 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java
Index: ScreenLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScreenLoader.java 7 Mar 2003 17:11:33 -0000 1.8
+++ ScreenLoader.java 9 Mar 2003 02:41:45 -0000 1.9
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,9 +90,9 @@
/** The single instance of this class. */
private static ScreenLoader instance =
new ScreenLoader(Turbine.getConfiguration()
- .getInt(TurbineConstants.SCREEN_CACHE_SIZE_KEY,
+ .getInt(TurbineConstants.SCREEN_CACHE_SIZE_KEY,
TurbineConstants.SCREEN_CACHE_SIZE_DEFAULT));
-
+
/** The Assembler Broker Service */
private static AssemblerBrokerService ab = TurbineAssemblerBroker.getService();
1.3 +1 -1
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
Index: BaseJspNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseJspNavigation.java 12 Feb 2003 17:52:18 -0000 1.2
+++ BaseJspNavigation.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.7 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultBottomNavigation.java 28 Feb 2003 15:22:19 -0000 1.6
+++ DefaultBottomNavigation.java 9 Mar 2003 02:41:46 -0000 1.7
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@
{
Form form;
form = new Form(
- new DynamicURI(data,
+ new DynamicURI(data,
TurbineConstants.SCREEN_DEFAULT_DEFAULT,
TurbineConstants.ACTION_LOGOUT_DEFAULT,
true).toString(),
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultTopNavigation.java
Index: DefaultTopNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultTopNavigation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTopNavigation.java 17 Feb 2003 22:55:56 -0000 1.3
+++ DefaultTopNavigation.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
Index: TemplateNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateNavigation.java 12 Feb 2003 17:52:18 -0000 1.2
+++ TemplateNavigation.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Index: VelocityNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityNavigation.java 12 Feb 2003 17:52:18 -0000 1.2
+++ VelocityNavigation.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.7 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Index: DefaultPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/DefaultPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultPage.java 8 Mar 2003 13:25:48 -0000 1.6
+++ DefaultPage.java 9 Mar 2003 02:41:46 -0000 1.7
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -248,7 +248,7 @@
{
String errMsg =
"default.doctype property not set properly in
TurbineResources.properties!";
- Vector doctypeProperty =
+ Vector doctypeProperty =
Turbine.getConfiguration().getVector(TurbineConstants.DEFAULT_DOCUMENT_TYPE_KEY);
if (doctypeProperty != null)
@@ -285,7 +285,7 @@
break;
}
default:
- {
+ {
throw new TurbineException(errMsg);
}
}
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/JspPage.java
Index: JspPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/JspPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspPage.java 8 Mar 2003 13:25:48 -0000 1.3
+++ JspPage.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplatePage.java 8 Mar 2003 13:25:48 -0000 1.3
+++ TemplatePage.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,7 @@
// from the parameter parser in rundata. This is coming
// from the request for a template.
String template = data.getTemplateInfo().getScreenTemplate();
-
+
// Get the layout template and the correct Screen.
String layoutTemplate =
TurbineTemplate.getLayoutTemplateName(template);
@@ -149,7 +149,7 @@
if (screen == null)
{
- String errMsg = "Couldn't map Template "
+ String errMsg = "Couldn't map Template "
+ template + " to any Screen class!";
log.error(errMsg);
throw new TurbineException(errMsg);
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/VelocityPage.java
Index: VelocityPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/VelocityPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocityPage.java 8 Mar 2003 13:25:48 -0000 1.3
+++ VelocityPage.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
Index: BaseJspScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseJspScreen.java 7 Mar 2003 11:32:25 -0000 1.3
+++ BaseJspScreen.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -96,7 +96,7 @@
String screenTemplate = data.getTemplateInfo().getScreenTemplate();
// get the name of the JSP we want to use
- String templateName
+ String templateName
= TurbineTemplate.getScreenTemplateName(screenTemplate);
// The Template Service could not find the Screen
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java
Index: Error.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Error.java 12 Feb 2003 17:52:19 -0000 1.2
+++ Error.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.5 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
Index: JspErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspErrorScreen.java 28 Feb 2003 15:39:05 -0000 1.4
+++ JspErrorScreen.java 9 Mar 2003 02:41:46 -0000 1.5
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
String errorTemplate = Turbine.getConfiguration()
.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
TurbineConstants.TEMPLATE_ERROR_JSP);
-
+
setTemplate(data, errorTemplate);
}
}
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/RawScreen.java
Index: RawScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/RawScreen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RawScreen.java 12 Feb 2003 17:52:19 -0000 1.2
+++ RawScreen.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Index: TemplateScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateScreen.java 28 Feb 2003 15:39:05 -0000 1.3
+++ TemplateScreen.java 9 Mar 2003 02:41:46 -0000 1.4
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.8 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
Index: VelocityDirectScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityDirectScreen.java 7 Mar 2003 11:32:25 -0000 1.7
+++ VelocityDirectScreen.java 9 Mar 2003 02:41:46 -0000 1.8
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -110,7 +110,7 @@
Context context = TurbineVelocity.getContext(data);
String screenTemplate = data.getTemplateInfo().getScreenTemplate();
- String templateName
+ String templateName
= TurbineTemplate.getScreenTemplateName(screenTemplate);
// The Template Service could not find the Screen
@@ -150,7 +150,7 @@
// directory.
context.put ("processingException", e.toString());
context.put ("stackTrace", ExceptionUtils.getStackTrace(e));
-
+
templateName = Turbine.getConfiguration()
.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
TurbineConstants.TEMPLATE_ERROR_VM);
1.7 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
Index: VelocityErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityErrorScreen.java 28 Feb 2003 15:39:05 -0000 1.6
+++ VelocityErrorScreen.java 9 Mar 2003 02:41:46 -0000 1.7
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.7 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
Index: VelocityScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityScreen.java 7 Mar 2003 11:32:25 -0000 1.6
+++ VelocityScreen.java 9 Mar 2003 02:41:46 -0000 1.7
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,7 @@
Context context = TurbineVelocity.getContext(data);
String screenTemplate = data.getTemplateInfo().getScreenTemplate();
- String templateName
+ String templateName
= TurbineTemplate.getScreenTemplateName(screenTemplate);
// The Template Service could not find the Screen
1.3 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
Index: VelocitySecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocitySecureScreen.java 12 Feb 2003 17:52:19 -0000 1.2
+++ VelocitySecureScreen.java 9 Mar 2003 02:41:46 -0000 1.3
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.5 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Index: InvalidState.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/error/InvalidState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InvalidState.java 28 Feb 2003 15:39:05 -0000 1.4
+++ InvalidState.java 9 Mar 2003 02:41:46 -0000 1.5
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
