Author: weaver
Date: Tue Dec 6 13:30:49 2005
New Revision: 354572
URL: http://svn.apache.org/viewcvs?rev=354572&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-398:
- GOODBYE CONTENT-SERVER YOU EVIL BASTARD!
- Ease-of-use macros added.
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/web.xml
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm?rev=354572&r1=354571&r2=354572&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Tue Dec 6
13:30:49 2005
@@ -1,8 +1,9 @@
#macro (defineLayoutObjects)
- #set($_layoutDecorator = $myPage.getDefaultDecorator("layout"))
- #set($_layoutDecoratorConfig = $jetspeed.getTypeConfiguration("layout",
"${_layoutDecorator}", "decorations"))
- #set($_layoutBaseCssClass =
$_layoutDecoratorConfig.getString("base.css.class"))
#set($preferedLocale = $JS2RequestContext.locale)
+ #set($rootFragment = $jetspeed.currentFragment)
+ #set($site =
$request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+ #set($theme = $request.getAttribute("org.apache.jetspeed.theme"))
+ #set($layoutDecoration = $theme.getDecoration($rootFragment))
#end
#* Adds javascript for PortletSelector on HTML *#
@@ -17,9 +18,66 @@
//--></script>
#end
-#* Adds link for all style sheets required by the layout and portlet
decorations *#
-#macro (includeHeaderResource)
- #set($resourceHeaderFactory =
$jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
- #set($resourceHeader =
$resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
- $resourceHeader
+#*
+ * Returns the full URL for the base of this site. This
+ * can and should be used in the <base href="" /> the <HEAD></HEAD>
+ * of your decoration.
+*#
+
+#macro(BaseHref)${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}/#end
+
+#*
+ * Returns the correct Content-type string for use within the Content-type
+ * meta tag.
+*#
+#macro (ContentType)text/html#if($response.characterEncoding);
charset=$response.characterEncoding#end#end
+
+#*
+ * Returns the page title string for the current page
+ *
+*#
+#macro (PageTitle)$jetspeed.page.getTitle($preferedLocale)#end
+
+#*
+ * Returns the site description string for use within the
+ * <meta name="description" /> meta tag
+ *#
+#macro (PageDescription)$jetspeed.page.getTitle($preferedLocale)#end
+
+#*
+ * Returns the site version string for use within the
+ * <meta name="version" /> meta tag
+ *#
+#macro (SiteVersionTag)$$Id$$ #end
+
+#**
+* Includes all of the stylesheets for this Page's theme.
+*#
+#macro (IncludeStylesheets)
+ #foreach($style in $theme.styleSheets)
+
+ <link rel="stylesheet" type="text/css" media="screen, projection"
href="$style" />
+ #end
#end
+
+#*
+* Returns the base CSS class to use in top level tags
+*#
+#macro (BaseCSSClass $_decoration)${_decoration.baseCSSClass}#end
+
+#macro (PageBaseCSSClass)#BaseCSSClass($layoutDecoration)#end
+
+#**
+ * Returns the fully-qualified path the specified resources using
+ * $decorator
+ *#
+#macro (GetResource $_decorator $_path)$!{_decorator.getResource($_path)}#end
+
+#**
+ * Returns the fully-qualified path the specified resources using
+ * the $layoutDecorator that is defined by calling the #defineLayoutObjects()
+ * macro.
+ *#
+#macro (GetPageResource $_path)#GetResource($layoutDecoration $_path) #end
+
+
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/web.xml?rev=354572&r1=354571&r2=354572&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/web.xml Tue Dec 6 13:30:49 2005
@@ -20,28 +20,6 @@
<web-app>
<display-name>Jetspeed-2 Enterprise Portal</display-name>
- <filter>
- <filter-name>ContentServer</filter-name>
-
<filter-class>org.apache.jetspeed.contentserver.ContentFilter</filter-class>
- <init-param>
- <param-name>content.directory</param-name>
- <param-value>
- WEB-INF/decorations
- </param-value>
- </init-param>
- <init-param>
- <param-name>url.hint</param-name>
- <param-value>
- content/
- </param-value>
- </init-param>
- <init-param>
- <param-name>use.caching</param-name>
- <param-value>
- false
- </param-value>
- </init-param>
- </filter>
<filter>
<filter-name>AJAXFilter</filter-name>
@@ -53,35 +31,7 @@
<url-pattern>*.ajax</url-pattern>
</filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.gif</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.jpg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.jpeg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.png</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.ico</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ContentServer</filter-name>
- <url-pattern>*.css</url-pattern>
- </filter-mapping>
-
+
<listener>
<listener-class>org.apache.jetspeed.engine.JetspeedServlet</listener-class>
</listener>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
