5:12 a.m.
Author: julien(a)jboss.com
Date: 2008-02-07 06:12:39 -0500 (Thu, 07 Feb 2008)
New Revision: 9832
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld
modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
rename jsp tag markup and title to portletmarkup and portlettitle
Copied:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
(from rev 9831,
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/MarkupTag.java)
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-07
11:12:39 UTC (rev 9832)
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.test.jsp.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChunk;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortletMarkupTag extends SimpleChunkTagSupport
+{
+ protected Chunk doChunkTag()
+ {
+ return new PortletMarkupChunk();
+ }
+}
Copied:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java
(from rev 9831,
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/TitleTag.java)
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java 2008-02-07
11:12:39 UTC (rev 9832)
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.test.jsp.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitleChunk;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortletTitleTag extends SimpleChunkTagSupport
+{
+ protected Chunk doChunkTag()
+ {
+ return new StartPortletTitleChunk();
+ }
+}
Modified:
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld
===================================================================
---
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld 2008-02-07
11:10:06 UTC (rev 9831)
+++
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/portal.tld 2008-02-07
11:12:39 UTC (rev 9832)
@@ -43,14 +43,14 @@
</tag>
<tag>
- <name>markup</name>
-
<tag-class>org.jboss.portal.portlet.test.jsp.taglib.MarkupTag</tag-class>
+ <name>portletmarkup</name>
+
<tag-class>org.jboss.portal.portlet.test.jsp.taglib.PortletMarkupTag</tag-class>
<body-content>empty</body-content>
</tag>
<tag>
- <name>title</name>
-
<tag-class>org.jboss.portal.portlet.test.jsp.taglib.TitleTag</tag-class>
+ <name>portlettitle</name>
+
<tag-class>org.jboss.portal.portlet.test.jsp.taglib.PortletTitleTag</tag-class>
<body-content>empty</body-content>
</tag>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-07
11:10:06 UTC (rev 9831)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp 2008-02-07
11:12:39 UTC (rev 9832)
@@ -9,11 +9,11 @@
name="GoogleWeather"
applicationName="google-weather-portlet">
-----------------------------------<br/>
-<portal:title/><br/>
+<portal:portlettitle/><br/>
<a href="<portal:portleturl
windowState='minimized'/>">Minimized<a/><br/>
<a href="<portal:portleturl><portal:param name='zipcode'
value='20855'/></portal:portleturl>">Derwood<a/><br/>
-----------------------------------<br/>
- <portal:markup/>
+ <portal:portletmarkup/>
-----------------------------------<br/>
</portal:portlet>
****************************************************<br/>
@@ -21,9 +21,9 @@
name="GoogleMap"
applicationName="google-map-portlet">
-----------------------------------<br/>
-<portal:title/><br/>
+<portal:portlettitle/><br/>
-----------------------------------<br/>
- <portal:markup/>
+ <portal:portletmarkup/>
-----------------------------------<br/>
</portal:portlet>
****************************************************<br/>
@@ -31,9 +31,9 @@
name="RemoteControl"
applicationName="remotecontrol-portlet">
-----------------------------------<br/>
-<portal:title/><br/>
+<portal:portlettitle/><br/>
-----------------------------------<br/>
- <portal:markup/>
+ <portal:portletmarkup/>
-----------------------------------<br/>
</portal:portlet>
****************************************************<br/>