You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tf...@apache.org on 2006/02/04 15:49:05 UTC

svn commit: r374875 - in /db/torque: docs-all-components/trunk/xdocs/ generator/trunk/ generator/trunk/xdocs/ maven-plugin/trunk/ maven-plugin/trunk/xdocs/ runtime/trunk/xdocs/ tutorial/trunk/ tutorial/trunk/xdocs/

Author: tfischer
Date: Sat Feb  4 06:48:50 2006
New Revision: 374875

URL: http://svn.apache.org/viewcvs?rev=374875&view=rev
Log:
- updated navigation t omatch the bnavigation in site
- corrected svn url in the tutorial's project.xml
- disabled wrong addition of maven-generated docs to the navigation in the generator and the maven-plugin

Modified:
    db/torque/docs-all-components/trunk/xdocs/navigation.xml
    db/torque/generator/trunk/project.properties
    db/torque/generator/trunk/xdocs/navigation.xml
    db/torque/maven-plugin/trunk/project.properties
    db/torque/maven-plugin/trunk/xdocs/navigation.xml
    db/torque/maven-plugin/trunk/xdocs/properties.xml
    db/torque/runtime/trunk/xdocs/navigation.xml
    db/torque/tutorial/trunk/project.xml
    db/torque/tutorial/trunk/xdocs/navigation.xml

Modified: db/torque/docs-all-components/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/db/torque/docs-all-components/trunk/xdocs/navigation.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/docs-all-components/trunk/xdocs/navigation.xml (original)
+++ db/torque/docs-all-components/trunk/xdocs/navigation.xml Sat Feb  4 06:48:50 2006
@@ -34,31 +34,43 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Documentation"         href="../../../documentation/index.html">
-        <item name="All Torque 3.2 Components" href="/index.html">
-          <item name="Supported Databases" href="/supported-databases.html"/>
-          <item name="Database Howtos"   href="/database-howtos/index.html" collapse="true">
-            <item name="MS SQL Server"   href="/database-howtos/mssql-howto.html"/>
-            <item name="Oracle"          href="/database-howtos/oracle-howto.html"/>
-            <item name="Postgres"        href="/database-howtos/postgres-howto.html"/>
-            <item name="Sybase"          href="/database-howtos/sybase-howto.html"/>
-           </item>
-          <item name="Other Howtos"      href="/other-howtos/index.html" collapse="true">
-            <item name="Database Layout" href="/other-howtos/database-layout-howto.html"/>
-            <item name="DB Schema Support" href="/other-howtos/schema-howto.html"/>
-            <item name="Inheritance"     href="/other-howtos/inheritance-guide.html"/>
-          </item>
+      <item name="overview"              href="../../../documentation/index.html"/>
+      <item name="Torque 3.2"            href="../../../documentation/torque-3.2.html">
+        <item name="Generator"           href="../generator/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Runtime"             href="../runtime/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Supported Databases" href="/supported-databases.html"/>
+        <item name="Database Howtos"     href="/database-howtos/index.html" collapse="true">
+          <item name="MS SQL Server"     href="/database-howtos/mssql-howto.html"/>
+          <item name="Oracle"            href="/database-howtos/oracle-howto.html"/>
+          <item name="Postgres"          href="/database-howtos/postgres-howto.html"/>
+          <item name="Sybase"            href="/database-howtos/sybase-howto.html"/>
+        </item>
+        <item name="Other Howtos"        href="/other-howtos/index.html" collapse="true">
+          <item name="Database Layout"   href="/other-howtos/database-layout-howto.html"/>
+          <item name="DB Schema Support" href="/other-howtos/schema-howto.html"/>
+          <item name="Inheritance"       href="/other-howtos/inheritance-guide.html"/>
         </item> 
+        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
       </item>
-      <item name="Tutorial"              href="../../../tutorial/index.html">
-      </item>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
     </menu>
 
     <menu name="Project documentation">
       <item name="Project info"          href="../../../project-info.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
-      <item name="Project Reports"       href="../../../project-reports.html" collapse="true">
+      <item name="Site Project Reports"  href="../../../project-reports.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
     </menu>

Modified: db/torque/generator/trunk/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/project.properties?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/generator/trunk/project.properties (original)
+++ db/torque/generator/trunk/project.properties Sat Feb  4 06:48:50 2006
@@ -25,4 +25,7 @@
 # multiproject build
 maven.multiproject.type=jar
 
+# Project documentation is included manually
+maven.xdoc.includeProjectDocumentation = no
+
 maven.linkcheck.exclude=http://svn.apache.org,..

Modified: db/torque/generator/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/xdocs/navigation.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/generator/trunk/xdocs/navigation.xml (original)
+++ db/torque/generator/trunk/xdocs/navigation.xml Sat Feb  4 06:48:50 2006
@@ -34,8 +34,9 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Documentation"         href="../../../documentation/index.html">
-        <item name="Torque 3.2 Generator" href="/index.html">
+      <item name="overview"              href="/documentation/index.html"/>
+      <item name="Torque 3.2"            href="/documentation/torque-3.2.html">
+        <item name="Generator"           href="/index.html" collapse="true">
           <item name="Tasks Reference"   href="/tasks-reference.html"/>
           <item name="Schema Reference"  href="/schema-reference.html"/>
           <item name="Properties Reference" href="/properties-reference.html"/>
@@ -62,15 +63,33 @@
             <item name="Link Check Report" href="/linkcheck.html"/>
           </item>
         </item>
+        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Runtime"             href="../runtime/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Supported Databases" href="../docs-all-components/supported-databases.html"/>
+        <item name="Database Howtos"     href="../docs-all-components/database-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Other Howtos"        href="../docs-all-components/other-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item> 
+        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
       </item>
-      <item name="Tutorial"              href="../../../tutorial/index.html"/>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
     </menu>
 
     <menu name="Project documentation">
       <item name="Project info"          href="../../../project-info.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
-      <item name="Project Reports"       href="../../../project-reports.html" collapse="true">
+      <item name="Site Project Reports"  href="../../../project-reports.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
     </menu>

Modified: db/torque/maven-plugin/trunk/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/maven-plugin/trunk/project.properties?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/maven-plugin/trunk/project.properties (original)
+++ db/torque/maven-plugin/trunk/project.properties Sat Feb  4 06:48:50 2006
@@ -24,4 +24,7 @@
 # multiproject build
 maven.multiproject.type=plugin
 
+# Project documentation is included manually
+maven.xdoc.includeProjectDocumentation = no
+
 maven.linkcheck.exclude=http://svn.apache.org,..

Modified: db/torque/maven-plugin/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/db/torque/maven-plugin/trunk/xdocs/navigation.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/maven-plugin/trunk/xdocs/navigation.xml (original)
+++ db/torque/maven-plugin/trunk/xdocs/navigation.xml Sat Feb  4 06:48:50 2006
@@ -34,10 +34,12 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Documentation"         href="../../../documentation/index.html">
-        <item name="Torque 3.2 Maven Plugin" href="/index.html">
-
-          <item name="Overview"          href="/index.html"/>
+      <item name="overview"              href="../../../documentation/index.html"/>
+      <item name="Torque 3.2"            href="../../../documentation/torque-3.2.html">
+        <item name="Generator"           href="../generator/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Maven Plugin"        href="/index.html" collapse="true">
           <item name="Goals"             href="/goals.html"/>
           <item name="Properties"        href="/properties.html"/>
           <item name="Dependencies"      href="/dependencies.html"/>
@@ -49,16 +51,30 @@
             <item name="Link Check Report" href="/linkcheck.html"/>
           </item>
         </item>
+        <item name="Runtime"             href="../runtime/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Supported Databases" href="../docs-all-components/supported-databases.html"/>
+        <item name="Database Howtos"     href="../docs-all-components/database-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Other Howtos"        href="../docs-all-components/other-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item> 
+        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
       </item>
-    
-      <item name="Tutorial"              href="../../../tutorial/index.html"/>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
     </menu>
 
     <menu name="Project documentation">
       <item name="Project info"          href="../../../project-info.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
-      <item name="Project Reports"       href="../../../project-reports.html" collapse="true">
+      <item name="Site Project Reports"  href="../../../project-reports.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
     </menu>

Modified: db/torque/maven-plugin/trunk/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/db/torque/maven-plugin/trunk/xdocs/properties.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/maven-plugin/trunk/xdocs/properties.xml (original)
+++ db/torque/maven-plugin/trunk/xdocs/properties.xml Sat Feb  4 06:48:50 2006
@@ -26,7 +26,7 @@
       <p>
         All of the settings used by the plugin are documented in the
         <a href="../generator/properties-reference.html">
-        Properties Reference</a> for Torque.
+        Properties Reference</a> for the Torque generator.
       </p>
       <p>
         You can also view the default settings for each of the properties

Modified: db/torque/runtime/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/navigation.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/navigation.xml (original)
+++ db/torque/runtime/trunk/xdocs/navigation.xml Sat Feb  4 06:48:50 2006
@@ -34,8 +34,15 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Documentation"         href="../../../documentation/index.html">
-        <item name="Torque 3.2 Runtime"  href="/index.html">
+      <item name="overview"              href="../../../documentation/index.html"/>
+      <item name="Torque 3.2"            href="../../../documentation/torque-3.2.html">
+        <item name="Generator"           href="../generator/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Runtime"             href="/index.html" collapse="true">
           <item name="Reference"         href="/reference/index.html" collapse="true">
             <item name="Initialisation"  href="/reference/initialisation-configuration.html"/>
             <item name="Reading from the DB" href="/reference/read-from-db.html"/>
@@ -68,16 +75,27 @@
             <item name="Link Check Report" href="/linkcheck.html"/>
           </item>
         </item>
+        <item name="Supported Databases" href="../docs-all-components/supported-databases.html"/>
+        <item name="Database Howtos"     href="../docs-all-components/database-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Other Howtos"        href="../docs-all-components/other-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item> 
+        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
       </item>
-    
-      <item name="Tutorial"              href="../../../tutorial/index.html"/>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
     </menu>
 
     <menu name="Project documentation">
       <item name="Project info"          href="../../../project-info.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
-      <item name="Project Reports"       href="../../../project-reports.html" collapse="true">
+      <item name="Site Project Reports"  href="../../../project-reports.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
     </menu>

Modified: db/torque/tutorial/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/tutorial/trunk/project.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/tutorial/trunk/project.xml (original)
+++ db/torque/tutorial/trunk/project.xml Sat Feb  4 06:48:50 2006
@@ -24,12 +24,12 @@
   <description>Torque is a persistence layer.</description>
   <shortDescription>Persistence Layer</shortDescription>
   <url>http://db.apache.org/torque/</url>
-  <siteDirectory>/www/db.apache.org/torque/runtime/</siteDirectory>
+  <siteDirectory>/www/db.apache.org/torque/tutorial/</siteDirectory>
 
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs/db/torque/runtime/trunk/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tutorial/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tutorial/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs/db/torque/tutorial/trunk/</url>
   </repository>
 
   <dependencies>
@@ -117,7 +117,7 @@
       <artifactId>jcs</artifactId>
       <groupId>jcs</groupId>
       <version>20030822.182132</version>
-      <url>http://jakarta.apache.org/turbine/jcs/</url>
+      <url>http://jakarta.apache.org/jcs/</url>
       <properties>
         <dist.bundle>true</dist.bundle>
       </properties>

Modified: db/torque/tutorial/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/db/torque/tutorial/trunk/xdocs/navigation.xml?rev=374875&r1=374874&r2=374875&view=diff
==============================================================================
--- db/torque/tutorial/trunk/xdocs/navigation.xml (original)
+++ db/torque/tutorial/trunk/xdocs/navigation.xml Sat Feb  4 06:48:50 2006
@@ -34,11 +34,25 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Documentation"         href="../../../documentation/index.html">
-      </item>
-    
-      <item name="Tutorial"              href="../../../tutorial/index.html">
-        <item name="Torque 3.2 Tutorial" href="/index.html">
+      <item name="overview"              href="/documentation/index.html"/>
+      <item name="Torque 3.2"            href="/documentation/torque-3.2.html">
+        <item name="Generator"           href="../generator/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Runtime"             href="../runtime/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Supported Databases" href="../docs-all-components/supported-databases.html"/>
+        <item name="Database Howtos"     href="../docs-all-components/database-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Other Howtos"        href="../docs-all-components/other-howtos/index.html" collapse="true">
+          <item name="dummy"/>
+        </item> 
+        <item name="Tutorial"            href="/index.html" collapse="true">
           <item name="Step 1"            href="/step1.html"/>
           <item name="Step 2"            href="/step2.html"/>
           <item name="Step 3"            href="/step3.html"/>
@@ -47,13 +61,16 @@
           <item name="Step 6"            href="/step6.html"/>
         </item>
       </item>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
     </menu>
 
     <menu name="Project documentation">
       <item name="Project info"          href="../../../project-info.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
-      <item name="Project Reports"       href="../../../project-reports.html" collapse="true">
+      <item name="Site Project Reports"  href="../../../project-reports.html" collapse="true">
         <item name="dummy"               href="/dummy.html"/>
       </item>
     </menu>



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