Author: woonsan
Date: Mon Apr 20 18:31:00 2009
New Revision: 766785
URL: http://svn.apache.org/viewvc?rev=766785&view=rev
Log:
JS2-961: Implements head merging feature in the desktop client-side script
(core.src.js).
Removes the unused PortletHeaderRequestImpl and PortletHeaderResponseImpl.
- We do not use Head Aggregation Valve in portal pipeline any more.
- By the way, under desktop pipeline, head contributions are being done by
client-side javascript (core.src.js), not by server-side aggregator component.)
Adds merge hint key in HeaderResourceImpl and JPT because the merge hint key
should be used by client side javascript to merge some head content.
Marks deprecated on HeaderResource, PortletHeaderRequest, PortletHeaderResponse
and SupportsHeaderPhase interface.
Removed:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletHeaderRequestImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletHeaderResponseImpl.java
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js
portals/jetspeed-2/portal/trunk/components/jetspeed-header-resource/src/main/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResource.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/HeaderPhaseSupportConstants.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderRequest.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/PortletHeaderResponse.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portlet/SupportsHeaderPhase.java
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm?rev=766785&r1=766784&r2=766785&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
Mon Apr 20 18:31:00 2009
@@ -79,9 +79,7 @@
#acquireHeaderResource()
$resourceHeader.getContent()
#if ( $jetspeed.dojoEnabled )
-<script language="javascript">
$jetspeed.dojoConfigurations
-</script>
#end
#set($headElements = $jetspeed.headElements)
#foreach($kvPair in $headElements)
@@ -100,16 +98,6 @@
#macro (desktopIncludeHeaderContent)
#acquireHeaderResource()
$resourceHeader.getContent()
-#if ( $jetspeed.dojoEnabled )
-<script language="javascript">
-$jetspeed.dojoConfigurations
-</script>
-#end
-#set($headElements = $jetspeed.headElements)
-#foreach($kvPair in $headElements)
-#set($headElemHtml = $jetspeed.getElementHtmlString($kvPair.value))
-$headElemHtml
-#end
#end
#macro (acquireHeaderResource)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
