weaver 2004/09/17 11:33:17
Modified: portal/src/java/org/apache/jetspeed/velocity
JetspeedPowerTool.java
portal/src/webapp/WEB-INF jetspeed_macros.vm
Log:
Made template type configurable
Revision Changes Path
1.27 +4 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
Index: JetspeedPowerTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JetspeedPowerTool.java 17 Sep 2004 18:05:25 -0000 1.26
+++ JetspeedPowerTool.java 17 Sep 2004 18:33:16 -0000 1.27
@@ -67,6 +67,7 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.PortletPermission;
import org.apache.jetspeed.services.information.PortletURLProviderImpl;
+import org.apache.jetspeed.util.ArgUtil;
import org.apache.pluto.Constants;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.ContentTypeSet;
@@ -486,6 +487,8 @@
public Configuration getTypeConfiguration(String type, String name) throws
Exception
{
+ ArgUtil.assertNotNull(String.class, type, this,
"getTypeConfiguration(String type, String name)");
+ ArgUtil.assertNotNull(String.class, name, this,
"getTypeConfiguration(String type, String name)");
try
{
TemplateDescriptor locator = getTemplate(name+"/"+type+".properties",
type);
1.2 +7 -4 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm
Index: jetspeed_macros.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetspeed_macros.vm 17 Sep 2004 18:05:25 -0000 1.1
+++ jetspeed_macros.vm 17 Sep 2004 18:33:17 -0000 1.2
@@ -6,11 +6,14 @@
#set($BOTTOM_TO_TOP = "BottomToTop")
#end
+#macro (defineConfig $name $type)
+ #set($_navConfig =$jetspeed.getTypeConfiguration("navigation", $name))
+#end
+
#* Includes a navigation component *#
#macro (includeNavigation $name $_nodeSet $orientation)
- #parse($jetspeed.getTemplate("${name}/${orientation}.vm",
"navigation").appRelativePath)
+ #defineConfig($name "navigation")
+ #set($_ext = $_navConfig.getString("template.extension"))
+ #parse($jetspeed.getTemplate("${name}/${orientation}${_ext}",
"navigation").appRelativePath)
#end
-#macro (defineConfig $name $type)
- #set($_navConfig =$jetspeed.getTypeConfiguration("navigation", $name))
-#end
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
