Can we use "external" instead of "external-ref"? Have you made sure the XSL still works for all cases (I seem to remember that more places were involved by this change)? For the sitemap generation for example?
Thanks -Vincent > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Sent: 18 January 2003 15:07 > To: [EMAIL PROTECTED] > Subject: cvs commit: jakarta-cactus/documentation/docs/xdocs sitemap.xml > > cmlenz 2003/01/18 07:06:39 > > Modified: documentation/docs/dtds sitemap-v10.dtd > documentation/docs/skins/jakarta.apache.org/stylesheets > document2html.xsl > documentation/docs/xdocs sitemap.xml > Log: > Make the difference between sitemap resources and external references > stronger, for better validatability (is that a word?) > > Revision Changes Path > 1.2 +7 -1 jakarta-cactus/documentation/docs/dtds/sitemap- > v10.dtd > > Index: sitemap-v10.dtd > =================================================================== > RCS file: /home/cvs/jakarta-cactus/documentation/docs/dtds/sitemap- > v10.dtd,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- sitemap-v10.dtd 18 Jan 2003 14:57:59 -0000 1.1 > +++ sitemap-v10.dtd 18 Jan 2003 15:06:38 -0000 1.2 > @@ -25,6 +25,12 @@ > <!ATTLIST resource > id ID #REQUIRED > source CDATA #IMPLIED > - href CDATA #IMPLIED > + name CDATA #IMPLIED > +> > + > +<!ELEMENT external-ref (#PCDATA)> > +<!ATTLIST external-ref > + id ID #REQUIRED > + url CDATA #IMPLIED > name CDATA #IMPLIED > > > > > > 1.20 +3 -3 jakarta- > cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2 ht > ml.xsl > > Index: document2html.xsl > =================================================================== > RCS file: /home/cvs/jakarta- > cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2 ht > ml.xsl,v > retrieving revision 1.19 > retrieving revision 1.20 > diff -u -r1.19 -r1.20 > --- document2html.xsl 18 Jan 2003 14:11:12 -0000 1.19 > +++ document2html.xsl 18 Jan 2003 15:06:38 -0000 1.20 > @@ -678,7 +678,7 @@ > </xsl:template> > > <xsl:template name="compute-link-href"> > - <xsl:param name="href"/> > + <xsl:param name="href"/> > <xsl:choose> > <xsl:when test="starts-with(@href,'site:')"> > <xsl:call-template name="get-target-file"> > @@ -688,7 +688,7 @@ > </xsl:when> > <xsl:when test="starts-with(@href,'ext:')"> > <xsl:variable name="id" select="substring- > after(@href,'ext:')"/> > - <xsl:value-of select="$sitemap//resource[@id=$id]/@href"/> > + <xsl:value-of select="$sitemap//external-ref[@id=$id]/@url"/> > </xsl:when> > <xsl:when test="starts-with(@href,'http:')"> > <xsl:value-of select="@href"/> > > > > 1.4 +53 -52 jakarta-cactus/documentation/docs/xdocs/sitemap.xml > > Index: sitemap.xml > =================================================================== > RCS file: /home/cvs/jakarta- > cactus/documentation/docs/xdocs/sitemap.xml,v > retrieving revision 1.3 > retrieving revision 1.4 > diff -u -r1.3 -r1.4 > --- sitemap.xml 18 Jan 2003 14:57:58 -0000 1.3 > +++ sitemap.xml 18 Jan 2003 15:06:38 -0000 1.4 > @@ -89,57 +89,58 @@ > > <!-- External links (sorted alphabetically by id) --> > > - <resource id="ant" href="http://ant.apache.org/"/> > - <resource id="antlr" href="http://antlr.org/"/> > - <resource id="apache" href="http://www.apache.org/"/> > - <resource id="aspectj" href="http://www.aspectj.org"/> > - <resource id="beanutils" > href="http://jakarta.apache.org/commons/beanutils.html"/> > - <resource id="book_javatools" > href="http://www.amazon.com/exec/obidos/ASIN/047120708X/"/> > - <resource id="bug_database" > href="http://jakarta.apache.org/site/bugs.html"/> > - <resource id="c2_vma" href="http://c2.com/cgi/wiki?VincentMassol"/> > - <resource id="c2_who_uses_cactus" > href="http://c2.com/cgi/wiki?WhoUsesCactus"/> > - <resource id="cactus_dutronc_lyrics" > href="http://www.muriset.com/paroles/les_cactus.htm"/> > - <resource id="cactus_dutronc_midi" > href="http://www.muriset.com/musique/les_cactus.mid"/> > - <resource id="cactus_nightly" > href="http://cvs.apache.org/builds/jakarta-cactus/nightly"/> > <resource id="cactus_release" > href="http://jakarta.apache.org/builds/jakarta-cactus/release"/> > - <resource id="cactus_viewcvs" > href="http://cvs.apache.org/viewcvs/jakarta-cactus/"/> > - <resource id="checkstyle" href="http://checkstyle.sf.net"/> > - <resource id="clover" > href="http://www.thecortex.net/clover/index.html"/> > - <resource id="collections" > href="http://jakarta.apache.org/commons/collections.html"/> > - <resource id="cvs" > href="http://jakarta.apache.org/site/cvsindex.html"/> > - <resource id="eblox" href="http://www.eblox.com"/> > - <resource id="gump" href="http://jakarta.apache.org/gump/"/> > - <resource id="gump_cactus_ant" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-ant.html"/ > > - <resource id="gump_cactus_fwk_12" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-framework- > 12.html"/> > - <resource id="gump_cactus_fwk_13" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-framework- > 13.html"/> > - <resource id="gump_cactus_sample_12" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-sample- > servlet-12.html"/> > - <resource id="gump_cactus_sample_13" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-sample- > servlet-13.html"/> > - <resource id="gump_cactus_dist_12" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus- > distribution-12.html"/> > - <resource id="gump_cactus_dist_13" > href="http://cvs.apache.org/builds/gump/latest/jakarta-cactus- > distribution-13.html"/> > - <resource id="gump_results" > href="http://cvs.apache.org/builds/gump/latest"/> > - <resource id="gump_cactus_jars" > href="http://gump.covalent.net/jars/latest/jakarta-cactus/"/> > - <resource id="gump_jars" > href="http://gump.covalent.net/jars/latest/"/> > - <resource id="gump_javadocs" > href="http://nagoya.apache.org/~rubys/gump/javadoc.html"/> > - <resource id="httpclient" > href="http://jakarta.apache.org/commons/httpclient"/> > - <resource id="httpclient_other" > href="http://www.innovation.ch/java/HTTPClient/"/> > - <resource id="httpunit" > href="http://sourceforge.net/projects/httpunit"/> > - <resource id="jakarta" href="http://jakarta.apache.org"/> > - <resource id="jakarta_roles" > href="http://jakarta.apache.org/site/roles.html"/> > - <resource id="japanese" > href="http://www.ingrid.org/jajakarta/cactus/"/> > - <resource id="junit" href="http://junit.org"/> > - <resource id="junit_faq" > href="http://junit.sourceforge.net/doc/faq/faq.htm"/> > - <resource id="korean" href="http://jakarta.apache- > korea.org/cactus/index.html"/> > - <resource id="mockobjects" href="http://www.mockobjects.com"/> > - <resource id="octo" href="http://www.octo.com"/> > - <resource id="opensource" href="http://www.opensource.org/"/> > - <resource id="regexp" href="http://jakarta.apache.org/regexp/"/> > - <resource id="servletapi_2_2" > href="http://jakarta.apache.org/builds/jakarta-servletapi/"/> > - <resource id="servletapi_2_3" > href="http://jakarta.apache.org/builds/jakarta-servletapi-4/"/> > - <resource id="stats" > href="http://jakarta.apache.org/cactus/stats/index.html"/> > - <resource id="storeblox" href="http://eblox.com/storeblox.php"/> > - <resource id="sun_coding_conventions" > href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html"/> > - <resource id="sun_j2ee_downloads" > href="http://java.sun.com/j2ee/download.html"/> > - <resource id="sun_servlet_downloads" > href="http://java.sun.com/products/servlet/download.html"/> > - <resource id="velocity" href="http://jakarta.apache.org/velocity/"/> > - <resource id="xalanj" href="http://xml.apache.org/xalan-j/"/> > + <external-ref id="ant" href="http://ant.apache.org/"/> > + <external-ref id="antlr" url="http://antlr.org/"/> > + <external-ref id="apache" url="http://www.apache.org/"/> > + <external-ref id="aspectj" url="http://www.aspectj.org"/> > + <external-ref id="beanutils" > url="http://jakarta.apache.org/commons/beanutils.html"/> > + <external-ref id="book_javatools" > url="http://www.amazon.com/exec/obidos/ASIN/047120708X/"/> > + <external-ref id="bug_database" > url="http://jakarta.apache.org/site/bugs.html"/> > + <external-ref id="c2_vma" > url="http://c2.com/cgi/wiki?VincentMassol"/> > + <external-ref id="c2_who_uses_cactus" > url="http://c2.com/cgi/wiki?WhoUsesCactus"/> > + <external-ref id="cactus_dutronc_lyrics" > url="http://www.muriset.com/paroles/les_cactus.htm"/> > + <external-ref id="cactus_dutronc_midi" > url="http://www.muriset.com/musique/les_cactus.mid"/> > + <external-ref id="cactus_nightly" > url="http://cvs.apache.org/builds/jakarta-cactus/nightly"/> > + <external-ref id="cactus_release" > url="http://jakarta.apache.org/builds/jakarta-cactus/release"/> > + <external-ref id="cactus_viewcvs" > url="http://cvs.apache.org/viewcvs/jakarta-cactus/"/> > + <external-ref id="checkstyle" url="http://checkstyle.sf.net"/> > + <external-ref id="clover" > url="http://www.thecortex.net/clover/index.html"/> > + <external-ref id="collections" > url="http://jakarta.apache.org/commons/collections.html"/> > + <external-ref id="cvs" > url="http://jakarta.apache.org/site/cvsindex.html"/> > + <external-ref id="eblox" url="http://www.eblox.com"/> > + <external-ref id="gump" url="http://jakarta.apache.org/gump/"/> > + <external-ref id="gump_cactus_ant" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-ant.html"/> > + <external-ref id="gump_cactus_fwk_12" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-framework- > 12.html"/> > + <external-ref id="gump_cactus_fwk_13" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-framework- > 13.html"/> > + <external-ref id="gump_cactus_sample_12" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-sample- > servlet-12.html"/> > + <external-ref id="gump_cactus_sample_13" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-sample- > servlet-13.html"/> > + <external-ref id="gump_cactus_dist_12" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-distributio n- > 12.html"/> > + <external-ref id="gump_cactus_dist_13" > url="http://cvs.apache.org/builds/gump/latest/jakarta-cactus-distributio n- > 13.html"/> > + <external-ref id="gump_results" > url="http://cvs.apache.org/builds/gump/latest"/> > + <external-ref id="gump_cactus_jars" > url="http://gump.covalent.net/jars/latest/jakarta-cactus/"/> > + <external-ref id="gump_jars" > url="http://gump.covalent.net/jars/latest/"/> > + <external-ref id="gump_javadocs" > url="http://nagoya.apache.org/~rubys/gump/javadoc.html"/> > + <external-ref id="httpclient" > url="http://jakarta.apache.org/commons/httpclient"/> > + <external-ref id="httpclient_other" > url="http://www.innovation.ch/java/HTTPClient/"/> > + <external-ref id="httpunit" > url="http://sourceforge.net/projects/httpunit"/> > + <external-ref id="jakarta" url="http://jakarta.apache.org"/> > + <external-ref id="jakarta_roles" > url="http://jakarta.apache.org/site/roles.html"/> > + <external-ref id="japanese" > url="http://www.ingrid.org/jajakarta/cactus/"/> > + <external-ref id="junit" url="http://junit.org"/> > + <external-ref id="junit_faq" > url="http://junit.sourceforge.net/doc/faq/faq.htm"/> > + <external-ref id="korean" url="http://jakarta.apache- > korea.org/cactus/index.html"/> > + <external-ref id="mockobjects" url="http://www.mockobjects.com"/> > + <external-ref id="octo" url="http://www.octo.com"/> > + <external-ref id="opensource" url="http://www.opensource.org/"/> > + <external-ref id="regexp" url="http://jakarta.apache.org/regexp/"/> > + <external-ref id="servletapi_2_2" > url="http://jakarta.apache.org/builds/jakarta-servletapi/"/> > + <external-ref id="servletapi_2_3" > url="http://jakarta.apache.org/builds/jakarta-servletapi-4/"/> > + <external-ref id="stats" > url="http://jakarta.apache.org/cactus/stats/index.html"/> > + <external-ref id="storeblox" url="http://eblox.com/storeblox.php"/> > + <external-ref id="sun_coding_conventions" > url="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html"/> > + <external-ref id="sun_j2ee_downloads" > url="http://java.sun.com/j2ee/download.html"/> > + <external-ref id="sun_servlet_downloads" > url="http://java.sun.com/products/servlet/download.html"/> > + <external-ref id="velocity" > url="http://jakarta.apache.org/velocity/"/> > + <external-ref id="xalanj" url="http://xml.apache.org/xalan-j/"/> > > </sitemap> > > > > > -- > To unsubscribe, e-mail: <mailto:cactus-dev- > [EMAIL PROTECTED]> > For additional commands, e-mail: <mailto:cactus-dev- > [EMAIL PROTECTED]> -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
