mpoeschl 01/05/07 07:39:58
Modified: src/java/org/apache/turbine/modules/navigations
BaseFreeMarkerNavigation.java
BaseJspNavigation.java DefaultBottomNavigation.java
DefaultTopNavigation.java TemplateNavigation.java
VelocityNavigation.java WebMacroSiteNavigation.java
src/java/org/apache/turbine/modules/pages DefaultPage.java
FreeMarkerSitePage.java JspPage.java
TemplatePage.java VelocityPage.java
WebMacroSitePage.java
src/java/org/apache/turbine/modules/screens
BaseFreeMarkerScreen.java BaseJspScreen.java
Error.java JspErrorScreen.java RawScreen.java
TemplateScreen.java VelocityErrorScreen.java
VelocityScreen.java VelocitySecureScreen.java
WebMacroSiteErrorScreen.java
WebMacroSiteScreen.java
WebMacroSiteSecureScreen.java
src/java/org/apache/turbine/modules/screens/error
InvalidState.java
Log:
- qualifying imports
Revision Changes Path
1.6 +17 -23
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/BaseFreeMarkerNavigation.java
Index: BaseFreeMarkerNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/BaseFreeMarkerNavigation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseFreeMarkerNavigation.java 2001/03/06 04:50:46 1.5
+++ BaseFreeMarkerNavigation.java 2001/05/07 14:38:11 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,24 +54,19 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-
-// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.freemarker.*;
-import org.apache.turbine.services.*;
+// ECS Classes
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+
+// Turbine Classes
+import org.apache.turbine.services.freemarker.FreeMarkerService;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.util.RunData;
// FreeMarker Stuff
-import freemarker.template.*;
+import freemarker.template.SimpleHash;
+
/**
* Sample FreeMarker Navigation. Navigations which use FreeMarker
* templates can extend this screen and override the doBuild method.
@@ -80,7 +75,7 @@
* doBuildTemplate method to add more data to the context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: BaseFreeMarkerNavigation.java,v 1.5 2001/03/06 04:50:46 chrise Exp
$
+ * @version $Id: BaseFreeMarkerNavigation.java,v 1.6 2001/05/07 14:38:11 mpoeschl
Exp $
*/
public class BaseFreeMarkerNavigation extends TemplateNavigation
{
@@ -92,8 +87,7 @@
* @param context, the context where the extra data is added.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate(RunData data,
- SimpleHash context)
+ protected void doBuildTemplate(RunData data, SimpleHash context)
throws Exception
{
}
@@ -156,7 +150,7 @@
StringElement output = new StringElement();
output.setFilterState(false);
output.addElement(
- fm.handleRequest(context,"navigations/" + templateName, true));
+ fm.handleRequest(context, "navigations/" + templateName, true));
return output;
}
}
1.3 +18 -21
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
Index: BaseJspNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/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 2001/03/06 04:50:46 1.2
+++ BaseJspNavigation.java 2001/05/07 14:38:12 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,18 +54,15 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.util.*;
+// ECS Classes
+import org.apache.ecs.ConcreteElement;
-// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
+// Turbine Classes
import org.apache.turbine.services.jsp.JspService;
-import org.apache.turbine.services.*;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.util.RunData;
+
/**
* Base JSP navigation that should be subclassed by Navigation that want to
* use JSP. Subclasses should override the doBuildTemplate() method.
@@ -74,7 +71,7 @@
*/
public class BaseJspNavigation extends TemplateNavigation
{
- /**
+ /**
* Method that sets up beans and forward the request to the JSP.
*
* @param RunData
@@ -84,7 +81,7 @@
{
// set up any data in beans, etc
doBuildTemplate( data );
-
+
// get the name of the JSP we want to use
String templateName = data.getTemplateInfo().getNavigationTemplate();
@@ -92,17 +89,17 @@
JspService jsp = (JspService)
TurbineServices.getInstance().getService(JspService.SERVICE_NAME);
jsp.handleRequest(data, "/navigations/" + templateName);
-
+
return null;
}
-
+
/**
* Method to be overidden by subclasses to include data in beans, etc.
*
* @param data, the Rundata object
- */
+ */
protected void doBuildTemplate(RunData data) throws Exception
- {
- }
-
+ {
+ }
+
}
1.9 +30 -15
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultBottomNavigation.java 2001/03/06 04:50:46 1.8
+++ DefaultBottomNavigation.java 2001/05/07 14:38:14 1.9
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,25 +55,40 @@
*/
// Java Core Classes
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
-// Turbine Modules
-import org.apache.turbine.modules.*;
+// Turbine Classes
+import org.apache.turbine.modules.Navigation;
+import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.RunData;
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.om.security.*;
-import org.apache.turbine.util.security.*;
-
// ECS Classes
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
+import org.apache.ecs.HtmlColor;
+import org.apache.ecs.AlignType;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.BR;
+import org.apache.ecs.html.Font;
+import org.apache.ecs.html.Form;
+import org.apache.ecs.html.H4;
+import org.apache.ecs.html.HR;
+import org.apache.ecs.html.Input;
+import org.apache.ecs.html.PRE;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TR;
+
/**
* This is a sample navigation module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultBottomNavigation.java,v 1.8 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: DefaultBottomNavigation.java,v 1.9 2001/05/07 14:38:14 mpoeschl
Exp $
*/
public class DefaultBottomNavigation extends Navigation
{
1.4 +13 -14
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/DefaultTopNavigation.java
Index: DefaultTopNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/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 2001/03/06 04:50:46 1.3
+++ DefaultTopNavigation.java 2001/05/07 14:38:16 1.4
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,24 +54,23 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
+// Turbine Classes
+import org.apache.turbine.modules.Navigation;
import org.apache.turbine.util.RunData;
// ECS Classes
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.HtmlColor;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.Font;
+import org.apache.ecs.html.HR;
+
/**
* This is a sample navigation module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultTopNavigation.java,v 1.3 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: DefaultTopNavigation.java,v 1.4 2001/05/07 14:38:16 mpoeschl Exp $
*/
public class DefaultTopNavigation extends Navigation
{
1.5 +9 -15
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
Index: TemplateNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TemplateNavigation.java 2001/03/06 04:50:46 1.4
+++ TemplateNavigation.java 2001/05/07 14:38:19 1.5
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,23 +54,17 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-
// Turbine/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.turbine.modules.Navigation;
+import org.apache.turbine.util.RunData;
+
/**
* Base Template Navigation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateNavigation.java,v 1.4 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: TemplateNavigation.java,v 1.5 2001/05/07 14:38:19 mpoeschl Exp $
*/
public abstract class TemplateNavigation extends Navigation
{
1.6 +10 -16
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Index: VelocityNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityNavigation.java 2001/03/06 22:40:35 1.5
+++ VelocityNavigation.java 2001/05/07 14:38:20 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,22 +54,16 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.util.*;
-
// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.velocity.TurbineVelocity;
// Velocity Stuff
-import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
+
/**
* VelocityNavigation. This screen relies on the VelocityPage
* being set as the default page. The doBuildTemplate() assumes the
@@ -79,7 +73,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: VelocityNavigation.java,v 1.5 2001/03/06 22:40:35 chrise Exp $
+ * @version $Id: VelocityNavigation.java,v 1.6 2001/05/07 14:38:20 mpoeschl Exp $
*/
public class VelocityNavigation extends TemplateNavigation
{
1.7 +17 -22
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java
Index: WebMacroSiteNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebMacroSiteNavigation.java 2001/03/06 22:40:36 1.6
+++ WebMacroSiteNavigation.java 2001/05/07 14:38:23 1.7
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,23 +54,16 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-
// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.webmacro.TurbineWebMacro;
+import org.apache.turbine.services.webmacro.WebMacroService;
// WebMacro Stuff
-import org.apache.turbine.services.webmacro.*;
-import org.webmacro.servlet.*;
+import org.webmacro.servlet.WebContext;
+
/**
* WebMacroSiteNavigation. This screen relies on the WebMacroSitePage
@@ -82,7 +75,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: WebMacroSiteNavigation.java,v 1.6 2001/03/06 22:40:36 chrise Exp $
+ * @version $Id: WebMacroSiteNavigation.java,v 1.7 2001/05/07 14:38:23 mpoeschl Exp
$
*/
public class WebMacroSiteNavigation extends TemplateNavigation
{
@@ -147,11 +140,13 @@
// Attempt to get it from the TemplateInfo first. If it
// doesn't exist, create it and then stuff it into the
// TemplateInfo.
- WebContext wc =
(WebContext)data.getTemplateInfo().getTemplateContext(WebMacroService.WEBMACRO_CONTEXT);
+ WebContext wc = (WebContext)data.getTemplateInfo().getTemplateContext(
+ WebMacroService.WEBMACRO_CONTEXT);
if (wc == null)
{
wc = TurbineWebMacro.getContext(data);
-
data.getTemplateInfo().setTemplateContext(WebMacroService.WEBMACRO_CONTEXT, wc);
+ data.getTemplateInfo().setTemplateContext(
+ WebMacroService.WEBMACRO_CONTEXT, wc);
}
return wc;
}
@@ -168,6 +163,6 @@
String templateFile)
throws Exception
{
- return TurbineWebMacro.handleRequest(context,templateFile);
+ return TurbineWebMacro.handleRequest(context, templateFile);
}
}
1.12 +15 -15
jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Index: DefaultPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultPage.java 2001/04/01 18:28:48 1.11
+++ DefaultPage.java 2001/05/07 14:38:39 1.12
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,21 +54,21 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
+import java.util.Vector;
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.Log;
+// Turbine Classes
+import org.apache.turbine.modules.ActionLoader;
+import org.apache.turbine.modules.LayoutLoader;
+import org.apache.turbine.modules.Page;
+import org.apache.turbine.modules.Screen;
+import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.resources.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.webmacro.*;
// ECS Stuff
import org.apache.ecs.Doctype;
+
/**
* When building sites using templates, Screens need only be defined
* for templates which require dynamic (database or object) data.
@@ -119,7 +119,7 @@
* written by John McNally. I've only modified it for WebMacro use.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultPage.java,v 1.11 2001/04/01 18:28:48 jvanzyl Exp $
+ * @version $Id: DefaultPage.java,v 1.12 2001/05/07 14:38:39 mpoeschl Exp $
*/
public class DefaultPage extends Page
{
@@ -158,7 +158,7 @@
ScreenLoader sl = ScreenLoader.getInstance();
Screen aScreen = sl.getInstance(data.getScreen());
String layout = aScreen.getLayout(data);
-
+
// If the Layout has been set to be null, attempt to execute
// the Screen that has been defined.
if ( layout != null )
1.6 +7 -14
jakarta-turbine/src/java/org/apache/turbine/modules/pages/FreeMarkerSitePage.java
Index: FreeMarkerSitePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/FreeMarkerSitePage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FreeMarkerSitePage.java 2001/03/06 04:50:46 1.5
+++ FreeMarkerSitePage.java 2001/05/07 14:38:42 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,24 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
// Turbine Utility Classes
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.freemarker.*;
-import org.apache.turbine.services.*;
+import org.apache.turbine.services.freemarker.FreeMarkerService;
+import org.apache.turbine.services.TurbineServices;
-// FreeMarker Stuff
-import freemarker.template.*;
/**
* Extends TemplatePage to set the template Context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerSitePage.java,v 1.5 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: FreeMarkerSitePage.java,v 1.6 2001/05/07 14:38:42 mpoeschl Exp $
*/
public class FreeMarkerSitePage extends TemplatePage
{
1.3 +13 -18
jakarta-turbine/src/java/org/apache/turbine/modules/pages/JspPage.java
Index: JspPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/JspPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspPage.java 2001/03/06 04:50:46 1.2
+++ JspPage.java 2001/05/07 14:38:44 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,34 +54,29 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.Log;
+// Turbine Classes
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.jsp.*;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.jsp.JspService;
+
/**
* Extends TemplatePage to add some convenience objects to the request.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JspPage extends TemplatePage
-{
+{
/**
- * Stuffs some useful objects into the request so that
+ * Stuffs some useful objects into the request so that
* it is available to the Action module and the Screen module
- */
+ */
protected void doBuildBeforeAction(RunData data) throws Exception
{
JspService jsp = (JspService)TurbineServices.getInstance()
.getService(JspService.SERVICE_NAME);
-
+
jsp.addDefaultObjects(data);
data.getResponse().setBufferSize(jsp.getDefaultBufferSize());
}
1.14 +10 -17
jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TemplatePage.java 2001/04/08 16:41:10 1.13
+++ TemplatePage.java 2001/05/07 14:38:46 1.14
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,17 +54,10 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.resources.TurbineResources;
+// Turbine Classes
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.turbine.services.*;
+import org.apache.turbine.util.RunData;
+
/**
* When building sites using templates, Screens need only be defined
@@ -114,7 +107,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplatePage.java,v 1.13 2001/04/08 16:41:10 ilkka Exp $
+ * @version $Id: TemplatePage.java,v 1.14 2001/05/07 14:38:46 mpoeschl Exp $
*/
public class TemplatePage extends DefaultPage
{
@@ -127,7 +120,7 @@
*/
protected void doBuildAfterAction(RunData data) throws Exception
{
- /*
+ /*
* Either template or screen should be guaranteed by the SessionValidator
* It is occasionally better to specify the screen instead of template
* in cases where multiple Screens map to one template. The template
@@ -150,7 +143,7 @@
data.getTemplateInfo().setLayoutTemplate(layoutTemplate);
String screen = TurbineTemplate.getScreenName(template);
-
+
if (screen == null)
{
throw new Exception("Screen could not be determined. \n" +
1.6 +10 -15
jakarta-turbine/src/java/org/apache/turbine/modules/pages/VelocityPage.java
Index: VelocityPage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/VelocityPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityPage.java 2001/03/06 04:50:46 1.5
+++ VelocityPage.java 2001/05/07 14:38:48 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,31 +54,26 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.Log;
+// Turbine Classes
+import org.apache.turbine.services.velocity.TurbineVelocity;
+import org.apache.turbine.services.velocity.VelocityService;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.*;
// Velocity Stuff
-import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
+
/**
* Extends TemplatePage to set the template Context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: VelocityPage.java,v 1.5 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: VelocityPage.java,v 1.6 2001/05/07 14:38:48 mpoeschl Exp $
*/
public class VelocityPage extends TemplatePage
{
/**
- * Stuffs the Context into the RunData so that it is available to
+ * Stuffs the Context into the RunData so that it is available to
* the Action module and the Screen module via getContext().
*
* @param data Turbine information.
1.6 +13 -19
jakarta-turbine/src/java/org/apache/turbine/modules/pages/WebMacroSitePage.java
Index: WebMacroSitePage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/WebMacroSitePage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebMacroSitePage.java 2001/03/06 04:50:46 1.5
+++ WebMacroSitePage.java 2001/05/07 14:38:50 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,33 +54,26 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-// Turbine Modules
-import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.Log;
+// Turbine Classes
+import org.apache.turbine.services.webmacro.TurbineWebMacro;
+import org.apache.turbine.services.webmacro.WebMacroService;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.webmacro.*;
// WebMacro Stuff
-import org.apache.turbine.services.webmacro.*;
-import org.webmacro.servlet.*;
-import org.webmacro.*;
+import org.webmacro.servlet.WebContext;
+
/**
* Extends TemplatePage to set the template Context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: WebMacroSitePage.java,v 1.5 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: WebMacroSitePage.java,v 1.6 2001/05/07 14:38:50 mpoeschl Exp $
*/
public class WebMacroSitePage extends TemplatePage
{
/**
- * Stuffs the Context into the RunData so that it is available to
+ * Stuffs the Context into the RunData so that it is available to
* the Action module and the Screen module via getContext().
*
* @param data Turbine information.
@@ -89,6 +82,7 @@
protected void doBuildBeforeAction(RunData data) throws Exception
{
WebContext wc_data = TurbineWebMacro.getContext(data);
- data.getTemplateInfo().setTemplateContext(WebMacroService.WEBMACRO_CONTEXT,
wc_data);
+ data.getTemplateInfo().setTemplateContext(
+ WebMacroService.WEBMACRO_CONTEXT, wc_data);
}
}
1.9 +16 -24
jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseFreeMarkerScreen.java
Index: BaseFreeMarkerScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseFreeMarkerScreen.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BaseFreeMarkerScreen.java 2001/04/08 17:18:36 1.8
+++ BaseFreeMarkerScreen.java 2001/05/07 14:39:04 1.9
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,24 +54,17 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-
// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.freemarker.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+import org.apache.turbine.services.freemarker.FreeMarkerService;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.template.TurbineTemplate;
+import org.apache.turbine.util.RunData;
// FreeMarker Stuff
-import freemarker.template.*;
+import freemarker.template.SimpleHash;
+
/**
* Sample FreeMarker Screen. Screens which use FreeMarker templates
@@ -82,7 +75,7 @@
* doBuildFreeMarker method to add more data to the context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: BaseFreeMarkerScreen.java,v 1.8 2001/04/08 17:18:36 ilkka Exp $
+ * @version $Id: BaseFreeMarkerScreen.java,v 1.9 2001/05/07 14:39:04 mpoeschl Exp $
*/
public class BaseFreeMarkerScreen extends TemplateScreen
{
@@ -95,8 +88,7 @@
* @param context, the context into which the extra data is to be added.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate(RunData data,
- SimpleHash context)
+ protected void doBuildTemplate(RunData data, SimpleHash context)
throws Exception
{
}
@@ -161,7 +153,7 @@
{
templateName = '/' + templateName;
}
-
+
FreeMarkerService fm = (FreeMarkerService)
TurbineServices.getInstance()
.getService(FreeMarkerService.SERVICE_NAME);
@@ -169,7 +161,7 @@
StringElement output = new StringElement();
output.setFilterState(false);
output.addElement(
- fm.handleRequest(context,"screens" + templateName, true));
+ fm.handleRequest(context, "screens" + templateName, true));
return output;
}
}
1.8 +12 -17
jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
Index: BaseJspScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseJspScreen.java 2001/04/08 17:18:36 1.7
+++ BaseJspScreen.java 2001/05/07 14:39:07 1.8
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,18 +54,13 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.util.*;
-
// Turbine/Village/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.ecs.ConcreteElement;
import org.apache.turbine.services.jsp.JspService;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.template.TurbineTemplate;
+import org.apache.turbine.util.RunData;
+
/**
* Base JSP Screen that should be subclassed by screens that want to
@@ -73,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author Frank Y. Kim
- * @version $Id: BaseJspScreen.java,v 1.7 2001/04/08 17:18:36 ilkka Exp $
+ * @version $Id: BaseJspScreen.java,v 1.8 2001/05/07 14:39:07 mpoeschl Exp $
*/
public class BaseJspScreen extends TemplateScreen
{
@@ -89,7 +84,7 @@
{
// set up any data in beans, etc
doBuildTemplate(data);
-
+
// get the name of the JSP we want to use
String templateName = TurbineTemplate.getScreenTemplateName(
data.getTemplateInfo().getScreenTemplate() );
@@ -105,7 +100,7 @@
JspService jsp = (JspService)
TurbineServices.getInstance().getService(JspService.SERVICE_NAME);
jsp.handleRequest(data, "/screens" + templateName, getLayout(data) == null);
-
+
return null;
}
1.5 +26 -18
jakarta-turbine/src/java/org/apache/turbine/modules/screens/Error.java
Index: Error.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/Error.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Error.java 2001/03/06 04:50:47 1.4
+++ Error.java 2001/05/07 14:39:11 1.5
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,23 +55,31 @@
*/
// Java Core Classes
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
// Turbine Modules
-import org.apache.turbine.modules.*;
+import org.apache.turbine.modules.Screen;
// Turbine Utility Classes
import org.apache.turbine.util.RunData;
// ECS Classes
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.H3;
+import org.apache.ecs.html.H4;
+import org.apache.ecs.html.PRE;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TR;
+
/**
* This is a sample Error Screen module.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: Error.java,v 1.4 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: Error.java,v 1.5 2001/05/07 14:39:11 mpoeschl Exp $
*/
public class Error extends Screen
{
@@ -94,8 +102,8 @@
String key = (String) keys.nextElement();
String value = data.getParameters().getString(key);
TR tr = new TR()
- .addElement ( new TD().addElement(new B(key)) )
- .addElement ( new TD().addElement(" = " + value ) );
+ .addElement( new TD().addElement(new B(key)) )
+ .addElement( new TD().addElement(" = " + value ) );
table.addElement(tr);
hasValues = true;
}
@@ -109,25 +117,25 @@
String key = (String) keys.nextElement();
String value = varDebug.get(key).toString();
TR tr = new TR()
- .addElement ( new TD().addElement(new B(key)) )
- .addElement ( new TD().addElement(" = " + value ) );
+ .addElement( new TD().addElement(new B(key)) )
+ .addElement( new TD().addElement(" = " + value ) );
table2.addElement(tr);
hasValues2 = true;
}
- data.getPage().getBody().addElement (new H3(data.getTitle() +
+ data.getPage().getBody().addElement(new H3(data.getTitle() +
" Please review the exception below for more information."));
if ( hasValues )
{
- data.getPage().getBody().addElement (new H4().addElement("Get/Post
Data:"));
- data.getPage().getBody().addElement (table);
+ data.getPage().getBody().addElement(new H4().addElement("Get/Post
Data:"));
+ data.getPage().getBody().addElement(table);
}
if ( hasValues2 )
{
- data.getPage().getBody().addElement (new H4().addElement("Debugging
Data:"));
- data.getPage().getBody().addElement (table2);
+ data.getPage().getBody().addElement(new H4().addElement("Debugging
Data:"));
+ data.getPage().getBody().addElement(table2);
}
String trace = data.getStackTrace();
1.4 +7 -9
jakarta-turbine/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
Index: JspErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspErrorScreen.java 2001/03/06 22:40:37 1.3
+++ JspErrorScreen.java 2001/05/07 14:39:13 1.4
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,17 +55,15 @@
*/
// Turbine
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.*;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.resources.TurbineResources;
/**
* Directs errors at the Jsp error template defined in template.error.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ingo Schuster</a>
- * @version $Id: JspErrorScreen.java,v 1.3 2001/03/06 22:40:37 chrise Exp $
+ * @version $Id: JspErrorScreen.java,v 1.4 2001/05/07 14:39:13 mpoeschl Exp $
*/
public class JspErrorScreen extends BaseJspScreen
{
1.6 +10 -11
jakarta-turbine/src/java/org/apache/turbine/modules/screens/RawScreen.java
Index: RawScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/RawScreen.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RawScreen.java 2001/03/06 04:50:47 1.5
+++ RawScreen.java 2001/05/07 14:39:14 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,13 +55,13 @@
*/
// Turbine stuff.
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.modules.Screen;
+import org.apache.turbine.util.RunData;
// ECS Classes
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+
/**
* Base class for writing Screens that output binary data. This class
* is provided as a helper class for those who want to write Screens
@@ -75,10 +75,9 @@
* contained in the TDK.<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Regis Koenig</a>
- * @version $Id: RawScreen.java,v 1.5 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: RawScreen.java,v 1.6 2001/05/07 14:39:14 mpoeschl Exp $
*/
-public abstract class RawScreen
- extends Screen
+public abstract class RawScreen extends Screen
{
/**
* Build the Screen. This method actually makes a call to the
1.10 +16 -22
jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Index: TemplateScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TemplateScreen.java 2001/03/06 04:50:47 1.9
+++ TemplateScreen.java 2001/05/07 14:39:16 1.10
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,19 +54,13 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-
// Turbine/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.turbine.modules.Screen;
+import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.template.TurbineTemplate;
+
/**
* Template Screen.
@@ -81,7 +75,7 @@
* going on there (it is quite simple really).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateScreen.java,v 1.9 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: TemplateScreen.java,v 1.10 2001/05/07 14:39:16 mpoeschl Exp $
*/
public abstract class TemplateScreen extends Screen
{
@@ -116,7 +110,7 @@
{
// empty
}
-
+
/**
* This method is called by the Screenloader to construct the
* Screen.
@@ -129,7 +123,7 @@
throws Exception
{
ConcreteElement out = null;
-
+
try
{
doBuildTemplate(data);
@@ -139,7 +133,7 @@
{
doPostBuildTemplate(data);
}
-
+
return out;
}
@@ -148,7 +142,7 @@
* change the template that will be executed next. <b>Note that the current
* context will be applied to the next template that is executed.
* If you want to have the context executed for the next screen,
- * to be the same one as the next screen, then you should use the
+ * to be the same one as the next screen, then you should use the
* TemplateScreen.doRedirect() method.</b>
*
* @param data Turbine information.
@@ -196,7 +190,7 @@
setTemplate(data, template);
ScreenLoader.getInstance().exec(data,screen);
}
-
+
/**
* You can call this within a Screen to cause an internal redirect
* to happen. It essentially allows you to stop execution in one
1.6 +7 -9
jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
Index: VelocityErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityErrorScreen.java 2001/03/06 22:40:37 1.5
+++ VelocityErrorScreen.java 2001/05/07 14:39:18 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,10 +55,8 @@
*/
// Turbine
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.*;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.resources.TurbineResources;
// Velocity
import org.apache.velocity.context.Context;
@@ -68,7 +66,7 @@
* error template defined in template.error.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Gonzalo Diethelm</a>
- * @version $Id: VelocityErrorScreen.java,v 1.5 2001/03/06 22:40:37 chrise Exp $
+ * @version $Id: VelocityErrorScreen.java,v 1.6 2001/05/07 14:39:18 mpoeschl Exp $
*/
public class VelocityErrorScreen extends VelocityScreen
{
1.14 +16 -20
jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
Index: VelocityScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityScreen.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- VelocityScreen.java 2001/04/09 21:55:44 1.13
+++ VelocityScreen.java 2001/05/07 14:39:20 1.14
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,23 +54,19 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.util.*;
-
// Turbine/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.StringUtils;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
+import org.apache.turbine.services.velocity.TurbineVelocity;
+import org.apache.turbine.services.template.TurbineTemplate;
// Velocity Stuff
-import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
+
/**
* Base Velocity Screen. The buildTemplate() assumes the template
* parameter has been set in the RunData object. This provides the
@@ -82,7 +78,7 @@
* class and override the doBuildTemplate() method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: VelocityScreen.java,v 1.13 2001/04/09 21:55:44 jmcnally Exp $
+ * @version $Id: VelocityScreen.java,v 1.14 2001/05/07 14:39:20 mpoeschl Exp $
*/
public class VelocityScreen extends TemplateScreen
{
@@ -132,14 +128,14 @@
// because of TemplateSessionValidator.
String templateName = TurbineTemplate.getScreenTemplateName(
data.getTemplateInfo().getScreenTemplate() );
-
+
// Template service adds the leading slash, but make it sure.
if ((templateName.length() > 0) &&
(templateName.charAt(0) != '/'))
{
templateName = '/' + templateName;
}
-
+
try
{
// if a layout has been defined return the results, otherwise
@@ -147,7 +143,7 @@
if (getLayout(data) == null)
{
TurbineVelocity.handleRequest(context,
- "screens" + templateName,
+ "screens" + templateName,
data.getResponse().getOutputStream());
}
else
@@ -173,7 +169,7 @@
screenData = TurbineVelocity.handleRequest(
context, "screens" + templateName);
}
-
+
// package the response in an ECS element
if (screenData != null)
{
1.5 +8 -9
jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
Index: VelocitySecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VelocitySecureScreen.java 2001/03/06 22:40:37 1.4
+++ VelocitySecureScreen.java 2001/05/07 14:39:22 1.5
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,14 +55,13 @@
*/
// Turbine
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.RunData;
// Velocity
-import org.apache.turbine.services.velocity.*;
+import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.velocity.context.Context;
+
/**
* VelocitySecureScreen
*
@@ -75,7 +74,7 @@
* your base screen.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: VelocitySecureScreen.java,v 1.4 2001/03/06 22:40:37 chrise Exp $
+ * @version $Id: VelocitySecureScreen.java,v 1.5 2001/05/07 14:39:22 mpoeschl Exp $
*/
public abstract class VelocitySecureScreen extends VelocityScreen
{
1.7 +9 -10
jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java
Index: WebMacroSiteErrorScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebMacroSiteErrorScreen.java 2001/03/06 22:40:38 1.6
+++ WebMacroSiteErrorScreen.java 2001/05/07 14:39:24 1.7
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,20 +55,19 @@
*/
// Turbine
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.resources.*;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.services.resources.TurbineResources;
// WebMacro
-import org.webmacro.servlet.*;
+import org.webmacro.servlet.WebContext;
+
/**
* WebMacroSiteErrorScreen screen - directs errors at the webmacro
* error template defined in template.error.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: WebMacroSiteErrorScreen.java,v 1.6 2001/03/06 22:40:38 chrise Exp $
+ * @version $Id: WebMacroSiteErrorScreen.java,v 1.7 2001/05/07 14:39:24 mpoeschl
Exp $
*/
public class WebMacroSiteErrorScreen extends WebMacroSiteScreen
{
1.10 +21 -25
jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteScreen.java
Index: WebMacroSiteScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteScreen.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WebMacroSiteScreen.java 2001/04/08 17:18:36 1.9
+++ WebMacroSiteScreen.java 2001/05/07 14:39:26 1.10
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,23 +54,18 @@
* <http://www.apache.org/>.
*/
-// JDK Imports
-import java.io.*;
-import java.util.*;
-
// Turbine/ECS Imports
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.webmacro.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.StringUtils;
+import org.apache.turbine.services.webmacro.TurbineWebMacro;
+import org.apache.turbine.services.webmacro.WebMacroService;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
// WebMacro Stuff
-import org.apache.turbine.services.webmacro.*;
-import org.webmacro.servlet.*;
+import org.webmacro.servlet.WebContext;
+
/**
* Base WebMacro Screen. This screen relies on the WebMacroSitePage
@@ -86,7 +81,7 @@
* class and override the doBuildTemplate() method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: WebMacroSiteScreen.java,v 1.9 2001/04/08 17:18:36 ilkka Exp $
+ * @version $Id: WebMacroSiteScreen.java,v 1.10 2001/05/07 14:39:26 mpoeschl Exp $
*/
public class WebMacroSiteScreen extends TemplateScreen
{
@@ -99,8 +94,7 @@
* @param context Context for web pages.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate( RunData data,
- WebContext context )
+ protected void doBuildTemplate( RunData data, WebContext context )
throws Exception
{
}
@@ -147,15 +141,15 @@
String screenData = null;
try
{
- screenData = buildWMTemplate(context,"screens" + templateName);
+ screenData = buildWMTemplate(context, "screens" + templateName);
}
catch (Exception e)
{
// If there is an error, build a $processingException and
// attempt to call the error.wm template in the screens
// directory.
- context.put ( "processingException", e.toString() );
- context.put ( "stackTrace", StringUtils.stackTrace(e) );
+ context.put( "processingException", e.toString() );
+ context.put( "stackTrace", StringUtils.stackTrace(e) );
templateName = TurbineResources.getString(
"template.error", "/error.wm");
if ((templateName.length() > 0) &&
@@ -181,11 +175,13 @@
{
// Attempt to get it from the session first. If it doesn't
// exist, create it and then stuff it into the session.
- WebContext wc =
(WebContext)data.getTemplateInfo().getTemplateContext(WebMacroService.WEBMACRO_CONTEXT);
+ WebContext wc = (WebContext)data.getTemplateInfo().getTemplateContext(
+ WebMacroService.WEBMACRO_CONTEXT);
if (wc == null)
{
wc = TurbineWebMacro.getContext(data);
-
data.getTemplateInfo().setTemplateContext(WebMacroService.WEBMACRO_CONTEXT, wc);
+ data.getTemplateInfo().setTemplateContext(
+ WebMacroService.WEBMACRO_CONTEXT, wc);
}
return wc;
}
1.5 +8 -9
jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteSecureScreen.java
Index: WebMacroSiteSecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteSecureScreen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebMacroSiteSecureScreen.java 2001/03/06 22:40:38 1.4
+++ WebMacroSiteSecureScreen.java 2001/05/07 14:39:29 1.5
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,13 +55,12 @@
*/
// Turbine
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.RunData;
// WebMacro
-import org.webmacro.servlet.*;
+import org.webmacro.servlet.WebContext;
+
/**
* WebMacroSiteSecure screen.
*
@@ -74,7 +73,7 @@
* your base screen.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: WebMacroSiteSecureScreen.java,v 1.4 2001/03/06 22:40:38 chrise Exp
$
+ * @version $Id: WebMacroSiteSecureScreen.java,v 1.5 2001/05/07 14:39:29 mpoeschl
Exp $
*/
public abstract class WebMacroSiteSecureScreen extends WebMacroSiteScreen
{
1.4 +13 -9
jakarta-turbine/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Index: InvalidState.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/error/InvalidState.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvalidState.java 2001/03/06 04:50:48 1.3
+++ InvalidState.java 2001/05/07 14:39:53 1.4
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -55,13 +55,17 @@
*/
// ECS
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
+import org.apache.ecs.html.A;
// Turbine
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.modules.Screen;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.RunData;
+
/**
* Users will get this screen if the screen on their browser is in an
* invalid state. For example, if they hit "Back" or "Reload" and
@@ -74,7 +78,7 @@
* value and redirect you to this screen.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: InvalidState.java,v 1.3 2001/03/06 04:50:48 chrise Exp $
+ * @version $Id: InvalidState.java,v 1.4 2001/05/07 14:39:53 mpoeschl Exp $
*/
public class InvalidState extends Screen
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
