jvanzyl 01/06/27 11:46:07
Modified: src/java/org/apache/turbine/modules/navigations
BaseJspNavigation.java TemplateNavigation.java
VelocityNavigation.java WebMacroSiteNavigation.java
Removed: src/java/org/apache/turbine/modules/navigations
DefaultBottomNavigation.java
DefaultTopNavigation.java
Log:
- using the new ModuleLoader
- getting rid of ECS layouts, deprecated in the 2.1 tree.
Revision Changes Path
1.4 +0 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseJspNavigation.java 2001/05/07 14:38:12 1.3
+++ BaseJspNavigation.java 2001/06/27 18:46:02 1.4
@@ -54,10 +54,7 @@
* <http://www.apache.org/>.
*/
-// ECS Classes
import org.apache.ecs.ConcreteElement;
-
-// Turbine Classes
import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.RunData;
1.6 +2 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TemplateNavigation.java 2001/05/07 14:38:19 1.5
+++ TemplateNavigation.java 2001/06/27 18:46:04 1.6
@@ -54,17 +54,15 @@
* <http://www.apache.org/>.
*/
-// Turbine/ECS Imports
import org.apache.ecs.ConcreteElement;
-import org.apache.turbine.modules.Navigation;
import org.apache.turbine.util.RunData;
-
+import org.apache.turbine.modules.Navigation;
/**
* Base Template Navigation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateNavigation.java,v 1.5 2001/05/07 14:38:19 mpoeschl Exp $
+ * @version $Id: TemplateNavigation.java,v 1.6 2001/06/27 18:46:04 jvanzyl Exp $
*/
public abstract class TemplateNavigation extends Navigation
{
1.8 +1 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityNavigation.java 2001/05/14 19:25:32 1.7
+++ VelocityNavigation.java 2001/06/27 18:46:05 1.8
@@ -54,16 +54,12 @@
* <http://www.apache.org/>.
*/
-// Turbine/Village/ECS Imports
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.velocity.context.Context;
-
/**
* VelocityNavigation. This screen relies on the VelocityPage
* being set as the default page. The doBuildTemplate() assumes the
@@ -73,7 +69,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: VelocityNavigation.java,v 1.7 2001/05/14 19:25:32 jon Exp $
+ * @version $Id: VelocityNavigation.java,v 1.8 2001/06/27 18:46:05 jvanzyl Exp $
*/
public class VelocityNavigation extends TemplateNavigation
{
1.9 +1 -5
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebMacroSiteNavigation.java 2001/05/23 16:36:32 1.8
+++ WebMacroSiteNavigation.java 2001/06/27 18:46:05 1.9
@@ -54,17 +54,13 @@
* <http://www.apache.org/>.
*/
-// Turbine/Village/ECS Imports
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.webmacro.servlet.WebContext;
-
/**
* WebMacroSiteNavigation. This screen relies on the WebMacroSitePage
* being set as the default page. This screen can be called directly
@@ -75,7 +71,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: WebMacroSiteNavigation.java,v 1.8 2001/05/23 16:36:32 mikeh Exp $
+ * @version $Id: WebMacroSiteNavigation.java,v 1.9 2001/06/27 18:46:05 jvanzyl Exp $
*/
public class WebMacroSiteNavigation extends TemplateNavigation
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
