svn commit: r1604307 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java

Author: taylor
Date: Sat Jun 21 01:54:14 2014
New Revision: 1604307

URL: http://svn.apache.org/r1604307
Log:
JS2-1298: this turned out to be not a bug. With version 2.2.1, fragment ids must be fully qualified by the fragment path

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm?rev=1604307&r1=1604306&r2=1604307&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/clear/decorator.vm Sat Jun 21 01:54:14 2014
@@ -17,6 +17,8 @@ limitations under the License.
 
 <!--  BEGIN: clear/decorator.vm -->
 
-$f.renderedContent
+#if (!$jetspeed.isHidden($f))
+    $f.renderedContent
+#end
 
 <!--  END: clear/decorator.vm -->
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java?rev=1604307&r1=1604306&r2=1604307&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java Sat Jun 21 01:54:14 2014
@@ -465,9 +465,9 @@ public interface ContentFragment
      * rendering process.
      * </p>
      *
-     * @param contnent
+     * @param content
      */
-    void overrideRenderedContent(String contnent);
+    void overrideRenderedContent(String content);
 
     /**
      * @return the overridden content set by overrideRenderedContent