You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2007/12/07 18:54:18 UTC
svn commit: r602166 - in
/myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core:
CoreRenderingContext.java skin/MinimalPortletSkinExtension.java
Author: jwaldman
Date: Fri Dec 7 09:54:09 2007
New Revision: 602166
URL: http://svn.apache.org/viewvc?rev=602166&view=rev
Log:
TRINIDAD-853 skin-sharing not working after deployment unless accessed as servlet first
TRINIDAD-852 output-mode portlet gives NPE if minimal skin
on 1.2.4.1-branch
Modified:
myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
Modified: myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?rev=602166&r1=602165&r2=602166&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Fri Dec 7 09:54:09 2007
@@ -432,6 +432,11 @@
Object requestMapStyleSheetId = requestMap.get(_SKIN_STYLESHEET_ID_PARAM);
if (requestMapStyleSheetId != null)
{
+ // set up the styleProvider first, so that it will create the /adf/style
+ // directory. Otherwise the following code would get an error when it
+ // tries to getStyleDir. This could possibly be done better.
+ getStyleContext().getStyleProvider();
+
String skinForPortalStyleSheetId = requestedSkin.getStyleSheetDocumentId(this);
if (skinForPortalStyleSheetId != null &&
skinForPortalStyleSheetId.equals(requestMapStyleSheetId))
Modified: myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java?rev=602166&r1=602165&r2=602166&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java (original)
+++ myfaces/trinidad/branches/1.2.4.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java Fri Dec 7 09:54:09 2007
@@ -39,7 +39,8 @@
super(baseSkin,
"minimal.portlet",
"minimal",
- XhtmlConstants.OUTPUT_MODE_PORTLET);
+ XhtmlConstants.OUTPUT_MODE_PORTLET,
+ "META-INF/adf/styles/simple-portlet.xss");
}
}