You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/04/21 17:16:44 UTC
svn commit: r767182 - in /portals/jetspeed-2/portal/trunk:
applications/jetspeed/src/main/webapp/WEB-INF/
applications/jetspeed/src/main/webapp/javascript/jetspeed/
applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/
applications/jetspee...
Author: woonsan
Date: Tue Apr 21 15:16:11 2009
New Revision: 767182
URL: http://svn.apache.org/viewvc?rev=767182&view=rev
Log:
JS2-961: Restore Head Aggregation Valve to use dojo configuration stuffs.
Now, the head aggregator works to set dojo configuration stuffs only. It does not invoke doHeader() any more.
The dojo configuration stuffs are to be used in portal aggregation and desktop renderer.
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/debug.js
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/debug.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/manifest.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/selector.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/site.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/EditorTable.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/LayoutEditPane.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/MultiRowHeaderTable.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PageEditPane.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PageEditor.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PortalAccordionContainer.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PortalBreadcrumbContainer.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PortalTabContainer.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PortalTooltipManager.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/widget/PortletWindow.js
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
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/layout/JetspeedPowerTool.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
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=767182&r1=767181&r2=767182&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 Tue Apr 21 15:16:11 2009
@@ -77,16 +77,19 @@
#* Adds additional style sheets and java script from portlets *#
#macro (includeHeaderResource)
#acquireHeaderResource()
-$resourceHeader.getContent()
-#if ( $jetspeed.dojoEnabled )
-$jetspeed.dojoConfigurations
-#end
#set($headElements = $jetspeed.headElements)
+#set($isDojoEnabled = $jetspeed.isDojoEnabled($headElements))
+#if ( $isDojoEnabled )
+#set($result = $resourceHeader.dojoEnable())
+#end
+$resourceHeader.getContent()
#foreach($kvPair in $headElements)
+#if ( $kvPair.key != "header.dojo.library.include" )
#set($headElemHtml = $jetspeed.getElementHtmlString($kvPair.value))
$headElemHtml
#end
#end
+#end
#* Adds additional style sheets and java script from portlets - desktop version *#
#macro (desktopIncludeDojoHeaderContent)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java?rev=767182&r1=767181&r2=767182&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java Tue Apr 21 15:16:11 2009
@@ -124,7 +124,7 @@
private BasePortalURL baseUrlAccess;
private PortletRenderer renderer;
-
+
public JetspeedPowerToolImpl(RequestContext requestContext, PortletConfig portletConfig, RenderRequest renderRequest, RenderResponse renderResponse, PortletRenderer renderer) throws Exception
{
HttpServletRequest request = requestContext.getRequest();
@@ -856,46 +856,17 @@
return getHeadElements(getCurrentFragment());
}
- public boolean isDojoEnabled(ContentFragment f)
+ public boolean isDojoEnabled(List<KeyValue<String, Element>> headElements)
{
- try
+ for (KeyValue<String, Element> kvPair : headElements)
{
- for (KeyValue<String, Element> kvPair : getHeadElements(f))
+ if (HeaderPhaseSupportConstants.HEAD_ELEMENT_CONTRIBUTION_ELEMENT_ID_DOJO_LIBRARY_INCLUDE.equals(kvPair.getKey()))
{
- if (HeaderPhaseSupportConstants.HEAD_ELEMENT_CONTRIBUTION_ELEMENT_ID_DOJO_LIBRARY_INCLUDE
- .equals(DOMUtils.getIdAttribute(kvPair.getValue())))
- {
- return true;
- }
+ return true;
}
}
- catch (Exception e)
- {
- handleError(e, e.toString(), f);
- }
return false;
}
-
- public boolean isDojoEnabled()
- {
- return isDojoEnabled(getCurrentFragment());
- }
- public String getDojoConfigurations()
- {
- HttpServletRequest request = getRequestContext().getRequest();
- StringBuilder sb = new StringBuilder(256);
-
- sb.append("<script language=\"JavaScript\" type=\"text/javascript\" ")
- .append(HeaderPhaseSupportConstants.HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_ATTRIBUTE).append("=\"")
- .append(HeaderPhaseSupportConstants.HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_CONFIG).append("\">\r\n")
- .append("var djConfig = {jetspeed: {}};\r\n")
- .append("djConfig.baseScriptUri = \"" + request.getContextPath() + "/javascript/dojo/\";\r\n")
- .append("djConfig.jetspeed.servletPath = \"" + request.getServletPath() + "\";\r\n")
- .append("</script>");
-
- return sb.toString();
- }
-
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java?rev=767182&r1=767181&r2=767182&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java Tue Apr 21 15:16:11 2009
@@ -264,23 +264,10 @@
List<KeyValue<String, Element>> getHeadElements() throws Exception;
/**
- * Returns true if any portlet contributes dojo include head element.
- * @param f
+ * Returns true if head element has dojo library inclusion.
+ * @param headElements
* @return
*/
- boolean isDojoEnabled(ContentFragment f);
-
- /**
- * Returns true if any portlet contributes dojo include head element.
- * @param f
- * @return
- */
- boolean isDojoEnabled();
-
- /**
- * Returns dojo configurations script body text
- * @return
- */
- String getDojoConfigurations();
+ boolean isDojoEnabled(List<KeyValue<String, Element>> headElements);
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml?rev=767182&r1=767181&r2=767182&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml Tue Apr 21 15:16:11 2009
@@ -155,6 +155,31 @@
</bean>
-->
+ <bean id="HeaderAggregatorPortal" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
+ <meta key="j2:cat" value="default" />
+ <constructor-arg index="0">
+ <ref bean="portletFactory" />
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+ </constructor-arg>
+ <constructor-arg index="2" type="boolean">
+ <value>false</value><!-- isDesktop == false -->
+ </constructor-arg>
+ <constructor-arg index="3">
+ <ref bean="HeaderResourceConfigurationPortal" />
+ </constructor-arg>
+ <constructor-arg index="4">
+ <ref bean="HeaderResourceRegistry" />
+ </constructor-arg>
+ <constructor-arg index="5">
+ <ref bean="DecorationFactory" />
+ </constructor-arg>
+
+ <!-- Uncomment this to HARD CODE your portal URL -->
+ <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg> -->
+ </bean>
+
<bean id="HeaderAggregatorDesktop" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
<meta key="j2:cat" value="default" />
<constructor-arg index="0">
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=767182&r1=767181&r2=767182&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Tue Apr 21 15:16:11 2009
@@ -271,6 +271,14 @@
</constructor-arg>
</bean>
+ <bean id="headerAggregatorValvePortal" class="org.apache.jetspeed.aggregator.HeaderAggregatorValve"
+ init-method="initialize">
+ <meta key="j2:cat" value="default" />
+ <constructor-arg>
+ <ref bean="HeaderAggregatorPortal" />
+ </constructor-arg>
+ </bean>
+
<bean id="headerAggregatorValveDesktop" class="org.apache.jetspeed.aggregator.HeaderAggregatorValve"
init-method="initialize">
<meta key="j2:cat" value="default" />
@@ -304,7 +312,7 @@
<!--
<constructor-arg index='3'>
<ref bean="decorationContentCache"/>
- </constructor-arg>
+ </constructor-arg>
-->
<!-- When clicking on Edit Mode, also switch to Maximize -->
<property name="maximizeOnEdit">
@@ -491,6 +499,7 @@
<ref bean="cleanupPortalURLValve"/>
-->
<ref bean="DecorationValve" />
+ <ref bean="headerAggregatorValvePortal" />
<ref bean="aggregatorValve" />
<ref bean="cleanUpValve" />
</list>
@@ -515,6 +524,7 @@
<ref bean="actionValve" />
<ref bean="resourceValve" />
<ref bean="DecorationValve" />
+ <ref bean="headerAggregatorValvePortal" />
<ref bean="aggregatorValve" />
<ref bean="cleanUpValve" />
</list>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org