portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp portletstd-bottom.jsp portletstd-top.jsp columns.jsp clear-bottom.jsp clear-top.jsp
Date Fri, 07 May 2004 02:43:31 GMT
taylor      2004/05/06 19:43:31

  Modified:    portal/src/webapp/WEB-INF/templates/jsp
                        portletstd-bottom.jsp portletstd-top.jsp
                        columns.jsp clear-bottom.jsp clear-top.jsp
  Log:
  *** keyword substitution change ***
  
  Revision  Changes    Path
  1.3       +22 -22    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/portletstd-bottom.jsp
  
  Index: portletstd-bottom.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/portletstd-bottom.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portletstd-bottom.jsp	18 Mar 2004 19:38:38 -0000	1.2
  +++ portletstd-bottom.jsp	7 May 2004 02:43:31 -0000	1.3
  @@ -1,23 +1,23 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed under the Apache License, Version 2.0 (the "License");
  -you may not use this file except in compliance with the License.
  -You may obtain a copy of the License at
  -
  -    http://www.apache.org/licenses/LICENSE-2.0
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java"  session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -
  -</td>
  -</tr>
  -</table>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed under the Apache License, Version 2.0 (the "License");
  +you may not use this file except in compliance with the License.
  +You may obtain a copy of the License at
  +
  +    http://www.apache.org/licenses/LICENSE-2.0
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java"  session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +
  +</td>
  +</tr>
  +</table>
   <!-- Portlet Std Decorator bottom -->
  
  
  
  1.3       +37 -37    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/portletstd-top.jsp
  
  Index: portletstd-top.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/portletstd-top.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portletstd-top.jsp	18 Mar 2004 19:38:38 -0000	1.2
  +++ portletstd-top.jsp	7 May 2004 02:43:31 -0000	1.3
  @@ -1,38 +1,38 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed under the Apache License, Version 2.0 (the "License");
  -you may not use this file except in compliance with the License.
  -You may obtain a copy of the License at
  -
  -    http://www.apache.org/licenses/LICENSE-2.0
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java" import="org.apache.jetspeed.om.page.*,org.apache.pluto.om.entity.*"
session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<portlet:defineObjects/>
  -<% 
  -Page myPage = (Page)renderRequest.getAttribute("page");
  -Fragment myF = (Fragment)renderRequest.getAttribute("fragment");
  -PortletEntity myPE = (PortletEntity)renderRequest.getAttribute("entity");
  -%>
  -<!-- Portlet Std Decorator top -->
  -<table width="100%" cellspacing"0" cellpadding="0">
  -<tr>
  -  <td bgcolor="<%=myPage.getDefaultSkin()%>">
  -  <table width="100%">
  -  <tr>
  -    <td><% if (myPE!=null) out.write(myPE.getPortletDefinition().getName());%></td>
  -    <td>
  -    </td>
  -  </tr>
  -  </table>
  -  </td>
  -</tr>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed under the Apache License, Version 2.0 (the "License");
  +you may not use this file except in compliance with the License.
  +You may obtain a copy of the License at
  +
  +    http://www.apache.org/licenses/LICENSE-2.0
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java" import="org.apache.jetspeed.om.page.*,org.apache.pluto.om.entity.*"
session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +<portlet:defineObjects/>
  +<% 
  +Page myPage = (Page)renderRequest.getAttribute("page");
  +Fragment myF = (Fragment)renderRequest.getAttribute("fragment");
  +PortletEntity myPE = (PortletEntity)renderRequest.getAttribute("entity");
  +%>
  +<!-- Portlet Std Decorator top -->
  +<table width="100%" cellspacing"0" cellpadding="0">
  +<tr>
  +  <td bgcolor="<%=myPage.getDefaultSkin()%>">
  +  <table width="100%">
  +  <tr>
  +    <td><% if (myPE!=null) out.write(myPE.getPortletDefinition().getName());%></td>
  +    <td>
  +    </td>
  +  </tr>
  +  </table>
  +  </td>
  +</tr>
   <tr><td width="100%" valign="top">
  
  
  
  1.3       +137 -137  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/columns.jsp
  
  Index: columns.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/columns.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- columns.jsp	18 Mar 2004 19:38:38 -0000	1.2
  +++ columns.jsp	7 May 2004 02:43:31 -0000	1.3
  @@ -1,137 +1,137 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed under the Apache License, Version 2.0 (the "License");
  -you may not use this file except in compliance with the License.
  -You may obtain a copy of the License at
  -
  -    http://www.apache.org/licenses/LICENSE-2.0
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java" 
  -         import="javax.portlet.*, java.util.*, org.apache.jetspeed.aggregator.*, org.apache.jetspeed.om.page.*"
  -         session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<portlet:defineObjects/>
  -
  -<% 
  -
  -List[] table = (List[])renderRequest.getAttribute("columns");
  -Page myPage = (Page)renderRequest.getAttribute("page");
  -
  -Fragment myFragment = (Fragment)renderRequest.getAttribute("fragment");
  -ContentDispatcher dispatcher = (ContentDispatcher)renderRequest.getAttribute("dispatcher");
 
  -org.apache.pluto.om.entity.PortletEntity portletEntity = 
  -          org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
  -              org.apache.jetspeed.util.JetspeedObjectID.createFromString(myFragment.getId()));
  -
  -renderRequest.setAttribute("entity",portletEntity);
  -%>
  -<%
  -  String decorator = myPage.getDefaultDecorator(myFragment.getType());
  -  String decoTop = null;
  -  String decoBottom = null;
  -  
  -  if (myFragment.getDecorator()!=null)
  -  {
  -        decorator = myFragment.getDecorator();
  -  }
  -
  -  if (decorator != null)
  -  {
  -        decoTop = decorator+"-top.jsp";
  -        decoBottom = decorator+"-bottom.jsp";
  -  }
  -%>
  -<!-- Decorator <%= decorator %>  <%=decoTop%>-<%=decoBottom%>-->
  -<%
  -  if ((decoTop != null) && (myFragment == myPage.getRootFragment()))
  -  {
  -%>
  -<jsp:include page="<%=decoTop%>" />
  -<%
  -  }
  -%>
  -<table width="100%" cellspacing="0" cellpadding="0">
  -  <tr>
  -  <%
  -     for(int i=0; i < table.length; i++)
  -     {
  -  %>
  -    <td valign="top"><table width="100%">
  -    <%
  -        for(Iterator it=table[i].iterator(); it.hasNext();)
  -        {
  -           Fragment f = (Fragment)it.next();
  -           org.apache.pluto.om.entity.PortletEntity fPE =
  -             org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
  -               org.apache.jetspeed.util.JetspeedObjectID.createFromString(f.getId()));
  -           String fDeco = myPage.getDefaultDecorator(f.getType());
  -           String fDecoTop = null;
  -           String fDecoBottom = null;
  -           
  -           if (f.getDecorator()!=null)
  -           {
  -                fDeco = f.getDecorator();
  -           }
  -           
  -           if (fDeco != null)
  -           {
  -                fDecoTop = fDeco+"-top.jsp";
  -                fDecoBottom = fDeco+"-bottom.jsp";
  -           }
  -           
  -           renderRequest.setAttribute("fragment",f);
  -           renderRequest.setAttribute("entity",fPE);
  -     %>
  -     <tr><td width="100%">
  -     <%
  -           if (fDecoTop != null)
  -           {
  -     %>
  -     <jsp:include page="<%=fDecoTop%>" />
  -     <%
  -           }
  -     %>
  -     <%
  -           out.flush();
  -           if (!"hidden".equals(f.getState()))
  -           {
  -                dispatcher.include(f,(javax.portlet.RenderRequest)renderRequest, (javax.portlet.RenderResponse)renderResponse);
  -           }
  -      %>
  -     <%
  -           if (fDecoBottom != null)
  -           {
  -     %>
  -     <jsp:include page="<%=fDecoBottom%>" />
  -     <%
  -           }
  -     %>
  -     </td></tr>
  -     <%
  -        }
  -     %>
  -     </table></td>
  -  <%
  -     }
  -  %>
  -  </tr>
  -</table>
  -<%
  -  renderRequest.setAttribute("fragment",myFragment);
  -  renderRequest.setAttribute("entity",portletEntity);
  -
  -  if ((decoBottom != null) && (myFragment == myPage.getRootFragment()))
  -  {
  -%>
  -<jsp:include page="<%=decoBottom%>" />
  -<%
  -  }
  -%>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed under the Apache License, Version 2.0 (the "License");
  +you may not use this file except in compliance with the License.
  +You may obtain a copy of the License at
  +
  +    http://www.apache.org/licenses/LICENSE-2.0
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java" 
  +         import="javax.portlet.*, java.util.*, org.apache.jetspeed.aggregator.*, org.apache.jetspeed.om.page.*"
  +         session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +<portlet:defineObjects/>
  +
  +<% 
  +
  +List[] table = (List[])renderRequest.getAttribute("columns");
  +Page myPage = (Page)renderRequest.getAttribute("page");
  +
  +Fragment myFragment = (Fragment)renderRequest.getAttribute("fragment");
  +ContentDispatcher dispatcher = (ContentDispatcher)renderRequest.getAttribute("dispatcher");
 
  +org.apache.pluto.om.entity.PortletEntity portletEntity = 
  +          org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
  +              org.apache.jetspeed.util.JetspeedObjectID.createFromString(myFragment.getId()));
  +
  +renderRequest.setAttribute("entity",portletEntity);
  +%>
  +<%
  +  String decorator = myPage.getDefaultDecorator(myFragment.getType());
  +  String decoTop = null;
  +  String decoBottom = null;
  +  
  +  if (myFragment.getDecorator()!=null)
  +  {
  +        decorator = myFragment.getDecorator();
  +  }
  +
  +  if (decorator != null)
  +  {
  +        decoTop = decorator+"-top.jsp";
  +        decoBottom = decorator+"-bottom.jsp";
  +  }
  +%>
  +<!-- Decorator <%= decorator %>  <%=decoTop%>-<%=decoBottom%>-->
  +<%
  +  if ((decoTop != null) && (myFragment == myPage.getRootFragment()))
  +  {
  +%>
  +<jsp:include page="<%=decoTop%>" />
  +<%
  +  }
  +%>
  +<table width="100%" cellspacing="0" cellpadding="0">
  +  <tr>
  +  <%
  +     for(int i=0; i < table.length; i++)
  +     {
  +  %>
  +    <td valign="top"><table width="100%">
  +    <%
  +        for(Iterator it=table[i].iterator(); it.hasNext();)
  +        {
  +           Fragment f = (Fragment)it.next();
  +           org.apache.pluto.om.entity.PortletEntity fPE =
  +             org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
  +               org.apache.jetspeed.util.JetspeedObjectID.createFromString(f.getId()));
  +           String fDeco = myPage.getDefaultDecorator(f.getType());
  +           String fDecoTop = null;
  +           String fDecoBottom = null;
  +           
  +           if (f.getDecorator()!=null)
  +           {
  +                fDeco = f.getDecorator();
  +           }
  +           
  +           if (fDeco != null)
  +           {
  +                fDecoTop = fDeco+"-top.jsp";
  +                fDecoBottom = fDeco+"-bottom.jsp";
  +           }
  +           
  +           renderRequest.setAttribute("fragment",f);
  +           renderRequest.setAttribute("entity",fPE);
  +     %>
  +     <tr><td width="100%">
  +     <%
  +           if (fDecoTop != null)
  +           {
  +     %>
  +     <jsp:include page="<%=fDecoTop%>" />
  +     <%
  +           }
  +     %>
  +     <%
  +           out.flush();
  +           if (!"hidden".equals(f.getState()))
  +           {
  +                dispatcher.include(f,(javax.portlet.RenderRequest)renderRequest, (javax.portlet.RenderResponse)renderResponse);
  +           }
  +      %>
  +     <%
  +           if (fDecoBottom != null)
  +           {
  +     %>
  +     <jsp:include page="<%=fDecoBottom%>" />
  +     <%
  +           }
  +     %>
  +     </td></tr>
  +     <%
  +        }
  +     %>
  +     </table></td>
  +  <%
  +     }
  +  %>
  +  </tr>
  +</table>
  +<%
  +  renderRequest.setAttribute("fragment",myFragment);
  +  renderRequest.setAttribute("entity",portletEntity);
  +
  +  if ((decoBottom != null) && (myFragment == myPage.getRootFragment()))
  +  {
  +%>
  +<jsp:include page="<%=decoBottom%>" />
  +<%
  +  }
  +%>
  
  
  
  1.3       +19 -19    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/clear-bottom.jsp
  
  Index: clear-bottom.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/clear-bottom.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clear-bottom.jsp	18 Mar 2004 19:38:38 -0000	1.2
  +++ clear-bottom.jsp	7 May 2004 02:43:31 -0000	1.3
  @@ -1,20 +1,20 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed under the Apache License, Version 2.0 (the "License");
  -you may not use this file except in compliance with the License.
  -You may obtain a copy of the License at
  -
  -    http://www.apache.org/licenses/LICENSE-2.0
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java"  session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<portlet:defineObjects/>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed under the Apache License, Version 2.0 (the "License");
  +you may not use this file except in compliance with the License.
  +You may obtain a copy of the License at
  +
  +    http://www.apache.org/licenses/LICENSE-2.0
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java"  session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +<portlet:defineObjects/>
   <!-- Clear decorator bottom -->
  
  
  
  1.3       +19 -19    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/clear-top.jsp
  
  Index: clear-top.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/jsp/clear-top.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clear-top.jsp	18 Mar 2004 19:38:38 -0000	1.2
  +++ clear-top.jsp	7 May 2004 02:43:31 -0000	1.3
  @@ -1,20 +1,20 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed under the Apache License, Version 2.0 (the "License");
  -you may not use this file except in compliance with the License.
  -You may obtain a copy of the License at
  -
  -    http://www.apache.org/licenses/LICENSE-2.0
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java"  session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<portlet:defineObjects/>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed under the Apache License, Version 2.0 (the "License");
  +you may not use this file except in compliance with the License.
  +You may obtain a copy of the License at
  +
  +    http://www.apache.org/licenses/LICENSE-2.0
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java"  session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +<portlet:defineObjects/>
   <!-- Clear decorator top -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message