You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2003/12/20 02:18:04 UTC
cvs commit: cocoon-2.1/src/blocks/portal/samples/coplets/history path.xsp sitemap.xmap
crossley 2003/12/19 17:18:04
Modified: src/blocks/portal/samples/coplets/history path.xsp
sitemap.xmap
Log:
Fix more dos2unix line-endings.
Revision Changes Path
1.2 +46 -46 cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsp
Index: path.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/coplets/history/path.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- path.xsp 18 Dec 2003 13:16:14 -0000 1.1
+++ path.xsp 20 Dec 2003 01:18:04 -0000 1.2
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsp:page language="java" xmlns:xsp="http://apache.org/xsp">
-<xsp:structure>
-<xsp:include>org.apache.cocoon.portal.acting.helpers.*</xsp:include>
-<xsp:include>java.lang.String</xsp:include>
-</xsp:structure>
-<links>
-
- <xsp:logic>
-
- List listHistory = (List) request.getSession().getAttribute( "portal-history");
- String strData = "untitled";
- for (int i = 1; i < listHistory.size()-1; i++)
- {
- List listItem = (List) listHistory.get( i);
- for( int j=0; j < listItem.size(); j++)
- {
- Mapping mapping = (Mapping) listItem.get( j);
- if( mapping instanceof org.apache.cocoon.portal.acting.helpers.CopletEventDescription)
- {
- CopletEventDescription desc = (CopletEventDescription) listItem.get( j);
- if( desc.copletId.equals( "MyCoplet"))
- {
- strData = (String) desc.data;
- }
- }
- else if( mapping instanceof org.apache.cocoon.portal.acting.helpers.LayoutEventDescription)
- {
- LayoutEventDescription desc = (LayoutEventDescription) listItem.get( j);
- if( desc.layoutId.equals( "maintab") && desc.path.equals("parameters/title"))
- {
- strData = (String) desc.data;
- }
- }
- }
- <xsp:content>
- <link>
- <number><xsp:expr>i</xsp:expr></number>
- <title><xsp:expr>strData</xsp:expr></title>
- </link>
- </xsp:content>
- }
- </xsp:logic>
-
-</links>
-</xsp:page>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsp:page language="java" xmlns:xsp="http://apache.org/xsp">
+<xsp:structure>
+<xsp:include>org.apache.cocoon.portal.acting.helpers.*</xsp:include>
+<xsp:include>java.lang.String</xsp:include>
+</xsp:structure>
+<links>
+
+ <xsp:logic>
+
+ List listHistory = (List) request.getSession().getAttribute( "portal-history");
+ String strData = "untitled";
+ for (int i = 1; i < listHistory.size()-1; i++)
+ {
+ List listItem = (List) listHistory.get( i);
+ for( int j=0; j < listItem.size(); j++)
+ {
+ Mapping mapping = (Mapping) listItem.get( j);
+ if( mapping instanceof org.apache.cocoon.portal.acting.helpers.CopletEventDescription)
+ {
+ CopletEventDescription desc = (CopletEventDescription) listItem.get( j);
+ if( desc.copletId.equals( "MyCoplet"))
+ {
+ strData = (String) desc.data;
+ }
+ }
+ else if( mapping instanceof org.apache.cocoon.portal.acting.helpers.LayoutEventDescription)
+ {
+ LayoutEventDescription desc = (LayoutEventDescription) listItem.get( j);
+ if( desc.layoutId.equals( "maintab") && desc.path.equals("parameters/title"))
+ {
+ strData = (String) desc.data;
+ }
+ }
+ }
+ <xsp:content>
+ <link>
+ <number><xsp:expr>i</xsp:expr></number>
+ <title><xsp:expr>strData</xsp:expr></title>
+ </link>
+ </xsp:content>
+ }
+ </xsp:logic>
+
+</links>
+</xsp:page>
1.2 +19 -19 cocoon-2.1/src/blocks/portal/samples/coplets/history/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/coplets/history/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 18 Dec 2003 13:16:14 -0000 1.1
+++ sitemap.xmap 20 Dec 2003 01:18:04 -0000 1.2
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-<map:pipelines>
-
- <map:pipeline>
-
- <!-- this is a history coplet -->
- <map:match pattern="path">
- <map:generate type="serverpages" src="path.xsp"/>
- <map:transform type="xslt" src="path.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- </map:pipeline>
-
-</map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+<map:pipelines>
+
+ <map:pipeline>
+
+ <!-- this is a history coplet -->
+ <map:match pattern="path">
+ <map:generate type="serverpages" src="path.xsp"/>
+ <map:transform type="xslt" src="path.xsl"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ </map:pipeline>
+
+</map:pipelines>
+</map:sitemap>
RE: cvs commit:cocoon-2.1/src/blocks/portal/samples/coplets/history path.xsp sitemap.xmap
Posted by Carsten Ziegeler <cz...@s-und-n.de>.
Thanks for the info. However I don't know when/why this sometimes
happens. Perhaps if we watch the commits closely time will tell.
Carsten
> -----Original Message-----
> From: David Crossley [mailto:crossley@indexgeo.com.au]
> Sent: Saturday, December 20, 2003 2:58 AM
> To: dev@cocoon.apache.org
> Subject: Re: cvs
> commit:cocoon-2.1/src/blocks/portal/samples/coplets/history path.xsp
> sitemap.xmap
>
>
> > crossley 2003/12/19 17:18:04
> >
> > Modified: src/blocks/portal/samples/coplets/history path.xsp
> > sitemap.xmap
> > Log:
> > Fix more dos2unix line-endings.
>
> Hi Cartsen, it seems that you occasionally add some new files
> with bad line-endings. Other files that you added were okay
> but these two were not.
>
> --David
>
Re: cvs commit:
cocoon-2.1/src/blocks/portal/samples/coplets/history path.xsp sitemap.xmap
Posted by David Crossley <cr...@indexgeo.com.au>.
> crossley 2003/12/19 17:18:04
>
> Modified: src/blocks/portal/samples/coplets/history path.xsp
> sitemap.xmap
> Log:
> Fix more dos2unix line-endings.
Hi Cartsen, it seems that you occasionally add some new files
with bad line-endings. Other files that you added were okay
but these two were not.
--David