Hi Chris, It seems to me we are going backward here. I had added the sitemap generation and you've removed it! :-)
I'm ok for the <document> removal in the sitemap DTD *provided* you add the sitemap2document.xsl and make it work. I'm +1 for all the rest ;-) Thanks -Vincent > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Sent: 18 January 2003 14:58 > To: [EMAIL PROTECTED] > Subject: cvs commit: jakarta- > cactus/documentation/docs/skins/jakarta.apache.org/stylesheets common.xsl > > cmlenz 2003/01/18 06:57:59 > > Modified: anttasks/src/java/org/apache/cactus/ant > CheckSitemapTask.java > documentation build.xml > documentation/docs/xdocs navigation.xml sitemap.xml > documentation/docs/skins/jakarta.apache.org/stylesheets > common.xsl > Added: documentation/docs/dtds sitemap-v10.dtd > Log: > Base the documentation sitemap on a DTD in its own right, instead of > nesting the <sitemap> element in a regular <document>. For now, also > remove > the Sitemap from the generated docs, and remove the link to it from the > navigation menu. It could be re-added with an sitemap2document > stylesheet. > > In addition, enable the <checksitemap>-Task to accept <xmlcatalog> as > nested elements, and use that to resolve any DTDs or entities found when > parsing the sitemap XML file. > > Revision Changes Path > 1.3 +29 -5 jakarta- > cactus/anttasks/src/java/org/apache/cactus/ant/CheckSitemapTask.java > > Index: CheckSitemapTask.java > =================================================================== > RCS file: /home/cvs/jakarta- > cactus/anttasks/src/java/org/apache/cactus/ant/CheckSitemapTask.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- CheckSitemapTask.java 15 Jan 2003 22:31:11 -0000 1.2 > +++ CheckSitemapTask.java 18 Jan 2003 14:57:58 -0000 1.3 > @@ -66,6 +66,7 @@ > import org.apache.tools.ant.BuildException; > import org.apache.tools.ant.Project; > import org.apache.tools.ant.Task; > +import org.apache.tools.ant.types.XMLCatalog; > import org.w3c.dom.Document; > import org.w3c.dom.Element; > import org.w3c.dom.NodeList; > @@ -96,6 +97,11 @@ > private File sitemapDir; > > /** > + * For resolving entities such as DTDs. > + */ > + private XMLCatalog xmlCatalog = new XMLCatalog(); > + > + /** > * Sets the location of the sitemap file. > * > * @param theSitemap The sitemap file > @@ -116,6 +122,26 @@ > } > > /** > + * Add the catalog to our internal catalog > + * > + * @param theXmlCatalog the XMLCatalog instance to use to look up > DTDs > + */ > + public void addConfiguredXMLCatalog(XMLCatalog theXmlCatalog) > + { > + this.xmlCatalog.addConfiguredXMLCatalog(theXmlCatalog); > + } > + > + /** > + * @see Task#init() > + */ > + public void init() throws BuildException > + { > + super.init(); > + // Initialize internal instance of XMLCatalog > + this.xmlCatalog.setProject(getProject()); > + } > + > + /** > * Execute task. > * > * @see Task#execute() > @@ -139,6 +165,7 @@ > try > { > DocumentBuilder builder = getDocumentBuilder(); > + builder.setEntityResolver(this.xmlCatalog); > Document document = builder.parse(sitemap); > if (!checkSitemap(document) && (this.failOnError)) > { > @@ -183,11 +210,8 @@ > */ > private boolean checkSitemap(Document theDocument) > { > - Element root = > - (Element) > theDocument.getElementsByTagName("document").item(0); > - Element body = (Element) > root.getElementsByTagName("body").item(0); > Element sitemap = > - (Element) body.getElementsByTagName("sitemap").item(0); > + (Element) > theDocument.getElementsByTagName("sitemap").item(0); > NodeList resources = sitemap.getElementsByTagName("resource"); > boolean success = true; > for (int i = 0; i < resources.getLength(); i++) > > > > 1.29 +6 -1 jakarta-cactus/documentation/build.xml > > Index: build.xml > =================================================================== > RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v > retrieving revision 1.28 > retrieving revision 1.29 > diff -u -r1.28 -r1.29 > --- build.xml 18 Jan 2003 14:31:52 -0000 1.28 > +++ build.xml 18 Jan 2003 14:57:58 -0000 1.29 > @@ -139,6 +139,8 @@ > <xmlcatalog id="documentation.dtds"> > <dtd publicId="-//Apache Software Foundation//DTD Cactus > Navigation V1.0//EN" > location="${doc.dtd.dir}/navigation-v10.dtd"/> > + <dtd publicId="-//Apache Software Foundation//DTD Cactus > Sitemap V1.0//EN" > + location="${doc.dtd.dir}/sitemap-v10.dtd"/> > </xmlcatalog> > > </target> > @@ -220,7 +222,9 @@ > </taskdef> > > <!-- Check the sitemap for invalid links --> > - <checksitemap sitemap="${target.xdoc.dir}/sitemap.xml"/> > + <checksitemap sitemap="${target.xdoc.dir}/sitemap.xml"> > + <xmlcatalog refid="documentation.dtds"/> > + </checksitemap> > > </target> > > @@ -234,6 +238,7 @@ > <xmlcatalog refid="documentation.dtds"/> > > <include name="**/*.xml"/> > + <exclude name="sitemap.xml"/> > <exclude name="**/navigation.xml"/> > <exclude name="**/cvslog.xml"/> > > > > > 1.7 +2 -3 jakarta- > cactus/documentation/docs/xdocs/navigation.xml > > Index: navigation.xml > =================================================================== > RCS file: /home/cvs/jakarta- > cactus/documentation/docs/xdocs/navigation.xml,v > retrieving revision 1.6 > retrieving revision 1.7 > diff -u -r1.6 -r1.7 > --- navigation.xml 18 Jan 2003 14:31:52 -0000 1.6 > +++ navigation.xml 18 Jan 2003 14:57:58 -0000 1.7 > @@ -1,6 +1,6 @@ > <?xml version="1.0"?> > -<!DOCTYPE navigation > - PUBLIC "-//Apache Software Foundation//DTD Cactus Navigation > V1.0//EN" > +<!DOCTYPE navigation PUBLIC > + "-//Apache Software Foundation//DTD Cactus Navigation V1.0//EN" > "file:../dtds/navigation-v10.dtd"> > > <navigation> > @@ -24,7 +24,6 @@ > </menu> > > <menu label="Documentation"> > - <item label="Site Map" id="sitemap"/> > <item label="How it works?" id="how_it_works"/> > <item label="Getting Started" id="getting_started"/> > <item label="Mock vs Container" id="mockobjects"/> > > > > 1.3 +142 -155 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.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- sitemap.xml 12 Jan 2003 17:24:50 -0000 1.2 > +++ sitemap.xml 18 Jan 2003 14:57:58 -0000 1.3 > @@ -1,158 +1,145 @@ > <?xml version="1.0"?> > +<!DOCTYPE sitemap PUBLIC > + "-//Apache Software Foundation//DTD Cactus Sitemap V1.0//EN" > + "file:../dtds/sitemap-v10.dtd"> > + > +<sitemap> > + > + <!-- Internal links --> > + > + <resource id="index" source="index.xml" name="What is Cactus?"> > + Describes what is the Cactus framework, defines several types of > + unit tests and explains what are those best achieved with Cactus. > + </resource> > + > + <resource id="news" source="news.xml" name="News"> > + Latest news and events about Cactus. > + </resource> > + > + <resource id="changes" source="changes.xml" name="Changes"> > + Cactus release changelogs and list of all the web site pages that > + have been recently changed. > + </resource> > + > + <resource id="features" source="features.xml" name="Features/Status"> > + Cactus feature list. > + </resource> > + > + <resource id="goals" source="goals.xml" name="Goals"> > + Short and long term goals for Cactus. > + </resource> > + > + <resource id="todo" source="participating/todo.xml" > name="Roadmap/Todo"> > + List of todo tasks for the next Cactus releases. > + </resource> > + > + <resource id="contributors" source="participating/contributors.xml"/> > + <resource id="contributing" source="participating/contributing.xml"/> > + <resource id="users" source="participating/users.xml"/> > + <resource id="testedon" source="testedon.xml"/> > + <resource id="license" source="license.xml"/> > + <resource id="downloads" source="downloads.xml"/> > + <resource id="how_it_works" source="how_it_works.xml"/> > + <resource id="how_it_works_uml" source="how_it_works_uml.xml"/> > + <resource id="getting_started" source="getting_started.xml"/> > + <resource id="mock_vs_cactus" source="mock_vs_cactus.xml"/> > + <resource id="javadoc" source="javadoc.xml"/> > + <resource id="javadoc_12" source="javadoc_12.xml"/> > + <resource id="javadoc_13" source="javadoc_13.xml"/> > + <resource id="faq" source="faq.xml"/> > + <resource id="eclipse_plugin" > source="spines/eclipse/eclipse_plugin.xml"/> > + <resource id="howto_classpath" > source="spines/manual/howto_classpath.xml"/> > + <resource id="howto_config" source="spines/manual/howto_config.xml"/> > + <resource id="howto_migration" source="howto_migration.xml"/> > + <resource id="howto_testcase" source="writing/howto_testcase.xml"/> > + <resource id="howto_testcase_servlet" > source="writing/howto_testcase_servlet.xml"/> > + <resource id="howto_testcase_jsp" > source="writing/howto_testcase_jsp.xml"/> > + <resource id="howto_testcase_filter" > source="writing/howto_testcase_filter.xml"/> > + <resource id="howto_jsp" source="writing/howto_jsp.xml"/> > + <resource id="howto_runner" source="spines/howto_runner.xml"/> > + <resource id="howto_security" source="writing/howto_security.xml"/> > + <resource id="howto_ant" source="spines/ant/howto_ant.xml"/> > + <resource id="howto_ant_cactus" > source="spines/ant/howto_ant_cactus.xml"/> > + <resource id="howto_ant_install" > source="spines/ant/howto_ant_install.xml"/> > + <resource id="howto_ant_primer" > source="spines/ant/howto_ant_primer.xml"/> > + <resource id="howto_httpunit" source="writing/howto_httpunit.xml"/> > + <resource id="howto_sample" source="howto_sample.xml"/> > + <resource id="howto_ejb" source="writing/howto_ejb.xml"/> > + <resource id="howto_ejb_j2eeri" > source="writing/howto_ejb_j2eeri.xml"/> > + <resource id="howto_ide" source="spines/manual/howto_ide.xml"/> > + <resource id="howto_ide_vajava_wte" > source="spines/manual/howto_ide_vajava_wte.xml"/> > + <resource id="howto_ide_vajava_tomcat" > source="spines/manual/howto_ide_vajava_tomcat.xml"/> > + <resource id="howto_ide_jbuilder4" > source="spines/manual/howto_ide_jbuilder4.xml"/> > + <resource id="howto_ide_jbuilder5" > source="spines/manual/howto_ide_jbuilder5.xml"/> > + <resource id="howto_tomcat" > source="spines/browser/howto_tomcat.xml"/> > + <resource id="howto_junitee" > source="spines/browser/howto_junitee.xml"/> > + <resource id="mailinglist" source="mailinglist.xml"/> > + <resource id="cactusname" source="cactusname.xml"/> > + <resource id="logos" source="participating/logos.xml"/> > + <resource id="resources" source="resources.xml"/> > + <resource id="coverage" source="participating/coverage.xml"/> > + <resource id="coverage_12" source="participating/coverage_12.xml"/> > + <resource id="coverage_13" source="participating/coverage_13.xml"/> > + <resource id="coverage_empty" > source="participating/coverage_empty.xml"/> > + <resource id="webalizer" source="webalizer.xml"/> > + <resource id="coding_conventions" > source="participating/coding_conventions.xml"/> > + <resource id="build_result" source="build_result.xml"/> > + <resource id="release_checklist" > source="participating/release_checklist.xml"/> > + <resource id="howto_build" source="participating/howto_build.xml"/> > > -<document id="sitemap"> > - > - <properties> > - <title>Site Map</title> > - <authors> > - <author name="Vincent Massol" email="[EMAIL PROTECTED]"/> > - </authors> > - </properties> > - > - <body> > - > - <sitemap> > - > - <!-- Internal links --> > - > - <resource id="index" source="index.xml" name="What is Cactus?"> > - Describes what is the Cactus framework, defines several types > of > - unit tests and explains what are those best achieved with > Cactus. > - </resource> > - > - <resource id="news" source="news.xml" name="News"> > - Latest news and events about Cactus. > - </resource> > - > - <resource id="changes" source="changes.xml" name="Changes"> > - Cactus release changelogs and list of all the web site pages > that > - have been recently changed. > - </resource> > - > - <resource id="features" source="features.xml" > name="Features/Status"> > - Cactus feature list. > - </resource> > - > - <resource id="goals" source="goals.xml" name="Goals"> > - Short and long term goals for Cactus. > - </resource> > - > - <resource id="todo" source="participating/todo.xml" > name="Roadmap/Todo"> > - List of todo tasks for the next Cactus releases. > - </resource> > - > - <resource id="contributors" > source="participating/contributors.xml"/> > - <resource id="contributing" > source="participating/contributing.xml"/> > - <resource id="users" source="participating/users.xml"/> > - <resource id="testedon" source="testedon.xml"/> > - <resource id="license" source="license.xml"/> > - <resource id="downloads" source="downloads.xml"/> > - <resource id="how_it_works" source="how_it_works.xml"/> > - <resource id="how_it_works_uml" source="how_it_works_uml.xml"/> > - <resource id="getting_started" source="getting_started.xml"/> > - <resource id="mock_vs_cactus" source="mock_vs_cactus.xml"/> > - <resource id="javadoc" source="javadoc.xml"/> > - <resource id="javadoc_12" source="javadoc_12.xml"/> > - <resource id="javadoc_13" source="javadoc_13.xml"/> > - <resource id="faq" source="faq.xml"/> > - <resource id="eclipse_plugin" > source="spines/eclipse/eclipse_plugin.xml"/> > - <resource id="howto_classpath" > source="spines/manual/howto_classpath.xml"/> > - <resource id="howto_config" > source="spines/manual/howto_config.xml"/> > - <resource id="howto_migration" source="howto_migration.xml"/> > - <resource id="howto_testcase" > source="writing/howto_testcase.xml"/> > - <resource id="howto_testcase_servlet" > source="writing/howto_testcase_servlet.xml"/> > - <resource id="howto_testcase_jsp" > source="writing/howto_testcase_jsp.xml"/> > - <resource id="howto_testcase_filter" > source="writing/howto_testcase_filter.xml"/> > - <resource id="howto_jsp" source="writing/howto_jsp.xml"/> > - <resource id="howto_runner" source="spines/howto_runner.xml"/> > - <resource id="howto_security" > source="writing/howto_security.xml"/> > - <resource id="howto_ant" source="spines/ant/howto_ant.xml"/> > - <resource id="howto_ant_cactus" > source="spines/ant/howto_ant_cactus.xml"/> > - <resource id="howto_ant_install" > source="spines/ant/howto_ant_install.xml"/> > - <resource id="howto_ant_primer" > source="spines/ant/howto_ant_primer.xml"/> > - <resource id="howto_httpunit" > source="writing/howto_httpunit.xml"/> > - <resource id="howto_sample" source="howto_sample.xml"/> > - <resource id="howto_ejb" source="writing/howto_ejb.xml"/> > - <resource id="howto_ejb_j2eeri" > source="writing/howto_ejb_j2eeri.xml"/> > - <resource id="howto_ide" source="spines/manual/howto_ide.xml"/> > - <resource id="howto_ide_vajava_wte" > source="spines/manual/howto_ide_vajava_wte.xml"/> > - <resource id="howto_ide_vajava_tomcat" > source="spines/manual/howto_ide_vajava_tomcat.xml"/> > - <resource id="howto_ide_jbuilder4" > source="spines/manual/howto_ide_jbuilder4.xml"/> > - <resource id="howto_ide_jbuilder5" > source="spines/manual/howto_ide_jbuilder5.xml"/> > - <resource id="howto_tomcat" > source="spines/browser/howto_tomcat.xml"/> > - <resource id="howto_junitee" > source="spines/browser/howto_junitee.xml"/> > - <resource id="mailinglist" source="mailinglist.xml"/> > - <resource id="cactusname" source="cactusname.xml"/> > - <resource id="logos" source="participating/logos.xml"/> > - <resource id="resources" source="resources.xml"/> > - <resource id="coverage" source="participating/coverage.xml"/> > - <resource id="coverage_12" > source="participating/coverage_12.xml"/> > - <resource id="coverage_13" > source="participating/coverage_13.xml"/> > - <resource id="coverage_empty" > source="participating/coverage_empty.xml"/> > - <resource id="webalizer" source="webalizer.xml"/> > - <resource id="coding_conventions" > source="participating/coding_conventions.xml"/> > - <resource id="build_result" source="build_result.xml"/> > - <resource id="release_checklist" > source="participating/release_checklist.xml"/> > - <resource id="howto_build" > source="participating/howto_build.xml"/> > - <resource id="sitemap" source="sitemap.xml"/> > - > - <!-- 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/"/> > - > - </sitemap> > - > - </body> > + <!-- External links (sorted alphabetically by id) --> > > -</document> > \ No newline at end of file > + <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/"/> > + > +</sitemap> > > > > 1.1 jakarta-cactus/documentation/docs/dtds/sitemap- > v10.dtd > > Index: sitemap-v10.dtd > =================================================================== > <!-- =================================================================== > > Apache Cactus Sitemap DTD (Version 1.0) > > PURPOSE: > This DTD defines the structure of the Sitemap used as a central URI > management isntance for Cactus documentation. > > TYPICAL INVOCATION: > > <!DOCTYPE sitemap PUBLIC > "-//Apache Software Foundation//DTD Cactus Sitemap V1.0//EN" > "sitemap-v10.dtd"> > > ==================================================================== --> > > > <!-- =============================================================== --> > <!-- Sitemap --> > <!-- =============================================================== --> > > <!ELEMENT sitemap (resource*)> > > <!ELEMENT resource (#PCDATA)> > <!ATTLIST resource > id ID #REQUIRED > source CDATA #IMPLIED > href CDATA #IMPLIED > name CDATA #IMPLIED > > > > > > 1.2 +3 -3 jakarta- > cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/common.xs l > > Index: common.xsl > =================================================================== > RCS file: /home/cvs/jakarta- > cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/common.xs l, > v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- common.xsl 18 Jan 2003 14:11:12 -0000 1.1 > +++ common.xsl 18 Jan 2003 14:57:59 -0000 1.2 > @@ -36,7 +36,7 @@ > sitemap.xml placed at the same level as the xdoc files. > The path we specify is relative to where this stylesheet is > located --> > <xsl:variable name="sitemap" > - > select="document(concat($xdocdir,'/',$sitefile))/document/body/sitemap"/ > > + select="document(concat($xdocdir,'/',$sitefile))/sitemap"/> > > <!-- The current document being processed. Note: This is needed for > the > "get-base-directory" template as it can be called with another > @@ -98,7 +98,7 @@ > </xsl:with-param> > </xsl:call-template> > </xsl:template> > - > + > <xsl:template name="get-base-directory-internal"> > <xsl:param name="file"/> > <xsl:choose> > > > > > -- > 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]>
