You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/05/16 02:32:07 UTC

svn commit: r170289 [22/24] - in /lenya/site: ./ 1_2_x/ 1_2_x/components/accesscontrol/ 1_2_x/components/asset-management/ 1_2_x/components/authoring/ 1_2_x/components/deployment/ 1_2_x/components/editors/ 1_2_x/components/layout/ 1_2_x/components/link-management/ 1_2_x/components/metadata/ 1_2_x/components/multilingual/ 1_2_x/components/publication/ 1_2_x/components/repository/ 1_2_x/components/resource-types/ 1_2_x/components/revisioncontrol/ 1_2_x/components/search/ 1_2_x/components/sitemanagement/ 1_2_x/components/tasks/ 1_2_x/components/uri-handling/ 1_2_x/components/workflow/ 1_2_x/how-to/ 1_2_x/installation/ 1_2_x/misc/ 1_2_x/tutorial/ 1_4/ 1_4/concepts/ 1_4/installation/ 1_4/reference/ 1_4/reference/publication-templating/ 1_4/reference/usecase-framework/ community/

Modified: lenya/site/1_2_x/misc/unittests.html
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/misc/unittests.html?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
--- lenya/site/1_2_x/misc/unittests.html (original)
+++ lenya/site/1_2_x/misc/unittests.html Sun May 15 17:32:04 2005
@@ -30,11 +30,7 @@
     |start group logo
     +-->
 <div class="grouplogo">
-<a href="http://lenya.apache.org"><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title="
-  	Apache Lenya is a Java-based Open-Source Content Management System.
-  	It is based on open standards such as XML and XSLT.
-  	One of its core components is Cocoon from the Apache Software Foundation.
-  "></a>
+<a href=""><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title=""></a>
 </div>
 <!--+
     |end group logo
@@ -126,10 +122,76 @@
 <a title="" href="../../1_2_x/installation/source_version.html">Install Instructions</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3', '../../skin/')" id="menu_1.1.3Title" class="menutitle">Components</div>
+<div onclick="SwitchMenu('menu_1.1.3', '../../skin/')" id="menu_1.1.3Title" class="menutitle">Tutorial</div>
 <div id="menu_1.1.3" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.1.3.1', '../../skin/')" id="menu_1.1.3.1Title" class="menutitle">Access&nbsp;Control</div>
-<div id="menu_1.1.3.1" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/index.html">Introduction</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/understanding_lenya.html">1. Understanding Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/installing_lenya.html">2. Installing Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/anatomy_of_the_pipeline.html">3. Anatomy of the Pipeline</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/editing_in_lenya.html">4. Editing in Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/custom_navigation.html">5. Custom Navigation in Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya.html">6a. Mod Proxy and Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya_continued.html">6b. Mod Proxy and Lenya</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">How-To</div>
+<div id="menu_1.1.4" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/faq.html">FAQ</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_publication.html">New Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/deploy_publication.html">Deploy Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/look_and_feel.html">Look and Feel</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/custom_resourcetype.html">Custom Resource Type</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_mime_type.html">Adding Mime Types</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/site_navigation.html">Site Navigation</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/ldap_authentication.html">LDAP Authentication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_menus.html">CMS Menus</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_screens.html">CMS Screens</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/search.html">Search Publications</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/external_data.html">External Data</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Components</div>
+<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.1', '../../skin/')" id="menu_1.1.5.1Title" class="menutitle">Access&nbsp;Control</div>
+<div id="menu_1.1.5.1" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/accesscontrol/terms.html">Basic Terms</a>
 </div>
@@ -155,8 +217,8 @@
 <a title="" href="../../1_2_x/components/accesscontrol/ssl.html">SSL Encryption</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.2', '../../skin/')" id="menu_1.1.3.2Title" class="menutitle">Authoring</div>
-<div id="menu_1.1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.2', '../../skin/')" id="menu_1.1.5.2Title" class="menutitle">Authoring</div>
+<div id="menu_1.1.5.2" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/authoring/adding-document-creator.html">Adding a new document creator</a>
 </div>
@@ -167,14 +229,14 @@
 <a title="" href="../../1_2_x/components/authoring/openoffice.html">OpenOffice</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.3', '../../skin/')" id="menu_1.1.3.3Title" class="menutitle">Deployment</div>
-<div id="menu_1.1.3.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.3', '../../skin/')" id="menu_1.1.5.3Title" class="menutitle">Deployment</div>
+<div id="menu_1.1.5.3" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/deployment/proxying.html">Proxying</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.4', '../../skin/')" id="menu_1.1.3.4Title" class="menutitle">Editors</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.4', '../../skin/')" id="menu_1.1.5.4Title" class="menutitle">Editors</div>
+<div id="menu_1.1.5.4" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/editors/htmlform.html">HTML Form Editor</a>
 </div>
@@ -191,8 +253,8 @@
 <a title="" href="../../1_2_x/components/editors/xopus.html">Xopus</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.5', '../../skin/')" id="menu_1.1.3.5Title" class="menutitle">Layout</div>
-<div id="menu_1.1.3.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.5', '../../skin/')" id="menu_1.1.5.5Title" class="menutitle">Layout</div>
+<div id="menu_1.1.5.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/layout/navigation.html">Navigation</a>
 </div>
@@ -206,8 +268,8 @@
 <a title="" href="../../1_2_x/components/layout/lenya-menubar.html">Lenya Menubar</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.6', '../../skin/')" id="menu_1.1.3.6Title" class="menutitle">Publication</div>
-<div id="menu_1.1.3.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.6', '../../skin/')" id="menu_1.1.5.6Title" class="menutitle">Publication</div>
+<div id="menu_1.1.5.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/publication/pageenvelopemodule.html">PageEnvelopeModule</a>
 </div>
@@ -215,14 +277,14 @@
 <a title="" href="../../1_2_x/components/publication/siteTree.html">Site tree</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.7', '../../skin/')" id="menu_1.1.3.7Title" class="menutitle">Resource&nbsp;Types</div>
-<div id="menu_1.1.3.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.7', '../../skin/')" id="menu_1.1.5.7Title" class="menutitle">Resource&nbsp;Types</div>
+<div id="menu_1.1.5.7" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/resource-types/resource-types.html">Resource&nbsp;Types</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.8', '../../skin/')" id="menu_1.1.3.8Title" class="menutitle">Revision Control</div>
-<div id="menu_1.1.3.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.8', '../../skin/')" id="menu_1.1.5.8Title" class="menutitle">Revision Control</div>
+<div id="menu_1.1.5.8" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/revisioncontrol/revisioncontroller.html">Revision Controller</a>
 </div>
@@ -242,20 +304,20 @@
 <a title="" href="../../1_2_x/components/revisioncontrol/rollback.html">Rollback</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.9', '../../skin/')" id="menu_1.1.3.9Title" class="menutitle">Repository</div>
-<div id="menu_1.1.3.9" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.9', '../../skin/')" id="menu_1.1.5.9Title" class="menutitle">Repository</div>
+<div id="menu_1.1.5.9" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/repository/webdav.html">WebDAV Servers</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.10', '../../skin/')" id="menu_1.1.3.10Title" class="menutitle">Search</div>
-<div id="menu_1.1.3.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.10', '../../skin/')" id="menu_1.1.5.10Title" class="menutitle">Search</div>
+<div id="menu_1.1.5.10" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/search/lucene.html">Searching with Lucene</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.11', '../../skin/')" id="menu_1.1.3.11Title" class="menutitle">URI Handling</div>
-<div id="menu_1.1.3.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.11', '../../skin/')" id="menu_1.1.5.11Title" class="menutitle">URI Handling</div>
+<div id="menu_1.1.5.11" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/uri-handling/URIParametrizer.html">URI Parametrizer</a>
 </div>
@@ -266,32 +328,32 @@
 <a title="" href="../../1_2_x/components/uri-handling/usecases.html">Usecases</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.12', '../../skin/')" id="menu_1.1.3.12Title" class="menutitle">Asset Management</div>
-<div id="menu_1.1.3.12" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.12', '../../skin/')" id="menu_1.1.5.12Title" class="menutitle">Asset Management</div>
+<div id="menu_1.1.5.12" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/asset-management/management.html">Asset Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.13', '../../skin/')" id="menu_1.1.3.13Title" class="menutitle">Link Management</div>
-<div id="menu_1.1.3.13" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.13', '../../skin/')" id="menu_1.1.5.13Title" class="menutitle">Link Management</div>
+<div id="menu_1.1.5.13" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/link-management/link-management.html">Link Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.14', '../../skin/')" id="menu_1.1.3.14Title" class="menutitle">Meta Data</div>
-<div id="menu_1.1.3.14" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.14', '../../skin/')" id="menu_1.1.5.14Title" class="menutitle">Meta Data</div>
+<div id="menu_1.1.5.14" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/metadata/metadata.html">Meta Data Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.15', '../../skin/')" id="menu_1.1.3.15Title" class="menutitle">Multilingual Documents</div>
-<div id="menu_1.1.3.15" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.15', '../../skin/')" id="menu_1.1.5.15Title" class="menutitle">Multilingual Documents</div>
+<div id="menu_1.1.5.15" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/multilingual/multilingual.html">Multilingual Document Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.16', '../../skin/')" id="menu_1.1.3.16Title" class="menutitle">Tasks</div>
-<div id="menu_1.1.3.16" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16', '../../skin/')" id="menu_1.1.5.16Title" class="menutitle">Tasks</div>
+<div id="menu_1.1.5.16" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/concept.html">The Task Concept</a>
 </div>
@@ -304,8 +366,8 @@
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/scheduling.html">Scheduling a Task</a>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.16.5', '../../skin/')" id="menu_1.1.3.16.5Title" class="menutitle">Included tasks</div>
-<div id="menu_1.1.3.16.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16.5', '../../skin/')" id="menu_1.1.5.16.5Title" class="menutitle">Included tasks</div>
+<div id="menu_1.1.5.16.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/anttask.html">AntTask</a>
 </div>
@@ -323,8 +385,8 @@
 <a title="" href="../../1_2_x/components/tasks/development.html">Developing Tasks</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.17', '../../skin/')" id="menu_1.1.3.17Title" class="menutitle">Workflow</div>
-<div id="menu_1.1.3.17" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.17', '../../skin/')" id="menu_1.1.5.17Title" class="menutitle">Workflow</div>
+<div id="menu_1.1.5.17" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/workflow/terms.html">Terms</a>
 </div>
@@ -338,8 +400,8 @@
 <a title="" href="../../1_2_x/components/workflow/implementation.html">Implementation</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.18', '../../skin/')" id="menu_1.1.3.18Title" class="menutitle">Site Management</div>
-<div id="menu_1.1.3.18" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.18', '../../skin/')" id="menu_1.1.5.18Title" class="menutitle">Site Management</div>
+<div id="menu_1.1.5.18" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/sitemanagement/archive.html">Archive</a>
 </div>
@@ -369,14 +431,17 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.1.4', '../../skin/')" id="menu_selected_1.1.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Miscellaneous</div>
-<div id="menu_selected_1.1.4" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.1.6', '../../skin/')" id="menu_selected_1.1.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Miscellaneous</div>
+<div id="menu_selected_1.1.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/namespaces.html">Namespaces</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/coding-guidelines.html">Coding Guidelines</a>
 </div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/misc/reserved_names.html">Reserved Names</a>
+</div>
 <div class="menupage">
 <div class="menupagetitle">Unit Tests</div>
 <div class="menupageitemgroup">
@@ -386,6 +451,24 @@
 <div class="menupageitem">
 <a href="#Organization">Organization</a>
 </div>
+<div class="menupageitem">
+<a title="The Test Publication" href="#The+Test+Publication">The Test Publicatio...</a>
+</div>
+<div class="menupageitem">
+<a title="The PublicationHelper" href="#The+PublicationHelper">The PublicationHelp...</a>
+</div>
+<div class="menupageitem">
+<a title="A TestCase Skeleton" href="#A+TestCase+Skeleton">A TestCase Skeleton...</a>
+</div>
+<div class="menupageitem">
+<a title="Debugging a Test" href="#Debugging+a+Test">Debugging a Test...</a>
+</div>
+<div class="menupageitem">
+<a title="The Test Buildfile" href="#The+Test+Buildfile">The Test Buildfile...</a>
+</div>
+<div class="menupageitem">
+<a title="Adding the Test to the Buildfile" href="#Adding+the+Test+to+the+Buildfile">Adding the Test to ...</a>
+</div>
 </div>
 </div>
 <div class="menuitem">
@@ -444,14 +527,216 @@
 <a name="N10031"></a><a name="Organization"></a>
 <h2 class="h3">Organization</h2>
 <div class="section">
-<ol>
-  
-<li>Put your test classes in <span class="codefrag">src/test</span>.</li>
-  
-<li>Add the ant task that executes your test to <span class="codefrag">src/targets/test-build.xml</span>
+<ul>
+
+<li>
+<p>  Put your test classes in <em>src/test</em>. </p>
+
 </li>
 
-</ol>
+<li>
+<p>  Add the ant task that executes your test to <em>src/targets/test-build.xml</em>. </p>
+
+
+</li>
+
+</ul>
+</div>
+<a name="N10049"></a><a name="The+Test+Publication"></a>
+<h2 class="h3">The Test Publication</h2>
+<div class="section">
+<p>Most tests will need a publication in the install (servlet container) directory. To provide a predictable test publication, the clean <em>default</em> publication from the build directory is copied to the <em>test</em> publication in the installation directory. </p>
+<p>In the test buildfile, the test publication is setup by the <em>test.pub.prepare</em> target. The directory {{${install.dir}/lenya/pubs/test}} is deleted (so that the files created by former tests are removed), and the default publication is copied to this directory. Add this target to the <em>depends</em> attribute of your test target if you need the test publication. </p>
+</div>
+<a name="N10061"></a><a name="The+PublicationHelper"></a>
+<h2 class="h3">The PublicationHelper</h2>
+<div class="section">
+<p>To simplify the acces to a publication you can use the class <em>org.apache.lenya.cms.PublicationHelper</em>. It provides the following methods: </p>
+<pre class="code">
+    /**
+     * Initializes the object with the first parameters from the command
+     * line arguments &lt;code&gt;args&lt;/code&gt;. The remainder of the array is returned.
+     * @param args The command line arguments of the test.
+     * @return The remainder of the arguments after the publication
+     * parameters are extracted.
+     */
+    public static String[] extractPublicationArguments(String args[]);
+
+    /**
+     * Returns the publication.
+     * @return A publication object.
+     */
+    public static Publication getPublication();
+</pre>
+<p>The <em>extractPublicationArguments(String[])</em> method extracts the first two strings from the <em>args</em> parameter. The first one is the servlet context path, the second is the publication ID. </p>
+<p>To make use of the PublicationHelper, you have to call the <em>extractPublicationArguments(String[])</em> method in the <em>main(String())</em> method of your <em>TestCase</em> class. This initializes the PublicationHelper: </p>
+<pre class="code">
+    public static void main(String[] args) {
+
+        // extract the arguments needed for setting up the publication
+        // only the remaining arguments are returned
+        args = PublicationHelper.extractPublicationArguments(args);
+
+        ...
+    }
+</pre>
+</div>
+<a name="N1008A"></a><a name="A+TestCase+Skeleton"></a>
+<h2 class="h3">A TestCase Skeleton</h2>
+<div class="section">
+<pre class="code">
+public class MyTest extends TestCase {
+
+    // static fields to store test parameters
+    private File configFile;
+    ...
+    
+    /** Constructor. */
+    public MyTest(String test) {
+        super(test);
+    }
+
+    /**
+     * The main program.
+     * The parameters are set from the command line arguments.
+     *
+     * @param args The command line arguments.
+     */
+    public static void main(String[] args) {
+        args = PublicationHelper.extractPublicationArguments(args);
+        setConfigFile(args[0]);
+        TestRunner.run(getSuite());
+    }
+
+    /** Returns the test suite. */
+    public static Test getSuite() {
+        return new TestSuite(MyTest.class);
+    }
+
+    /** Tests whatever you want. */
+    public void testSomething() {
+        ...
+    }
+
+    /** Sets a parameter value. */
+    protected static void setConfigFile(String fileName) {
+        assertNotNull(string);
+        File publicationDirectory
+            = PublicationHelper.getPublication().getDirectory();
+        configFile = new File(publicationDirectory, fileName);
+        assertTrue(configFile.exists());
+    }
+
+    /** Returns a parameter value. */
+    protected static File getConfigFile() {
+        return configFile;
+    }
+}
+</pre>
+</div>
+<a name="N10094"></a><a name="Debugging+a+Test"></a>
+<h2 class="h3">Debugging a Test</h2>
+<div class="section">
+<p>For debugging, it might be desired to run the test from an API. In this case, the <em>main(String[])</em> method is never executed. </p>
+<p>To provide the parameters, you can hardcode them as fallback in the TestCase.setup() method that is called before the test is invoked: </p>
+<pre class="code">
+    /** @see junit.framework.TestCase#setUp() */
+    protected void setUp() throws Exception {
+        if (getConfigFile() == null) {
+            String args[] = {
+                "D:\\Development\\build\\tomcat-4.1.24\\webapps\\lenya",
+                "test"
+            };
+            PublicationHelper.extractPublicationArguments(args);
+            setConfigFile("config/something.xconf");
+        }
+    }
+</pre>
+</div>
+<a name="N100A7"></a><a name="The+Test+Buildfile"></a>
+<h2 class="h3">The Test Buildfile</h2>
+<div class="section">
+<p>The test buildfile is located at <em>src/targets/test-build.xml</em>. It contains the following common targets: </p>
+<ul>
+
+<li>
+<p>  
+<strong>test</strong> - Runs all tests. </p>
+
+</li>
+
+<li>
+<p>  
+<strong>tests.junit</strong> - Runs the JUnit tests. </p>
+
+
+</li>
+
+<li>
+<p>  
+<strong>tests.anteater</strong> - Runs the Anteater tests. </p>
+
+</li>
+
+<li>
+<p>  
+<strong>tests.prepare</strong> - Prepares the tests, e.g. compiles test classes. </p>
+
+</li>
+
+<li>
+<p>  
+<strong>test.pub.prepare</strong> - Prepares the test publication.  </p>
+
+
+</li>
+
+</ul>
+</div>
+<a name="N100DE"></a><a name="Adding+the+Test+to+the+Buildfile"></a>
+<h2 class="h3">Adding the Test to the Buildfile</h2>
+<div class="section">
+<p>To add your test to the buildfile, you create a target called <em>test.&lt;name&gt;</em>. </p>
+<p>If you use assertions (Java assertions, not the JUnit ones) in your test, it is important to enable them using the <em>-ea</em> or <em>-enableassertions</em> argument. </p>
+<pre class="code">
+  &lt;target name="test.my" depends="test.pub.prepare"&gt;
+    &lt;!-- My Test --&gt;
+    &lt;java fork="yes" classname="org.apache.lenya.cms.mypackage.MyTest"&gt;
+      &lt;jvmarg value="-enableassertions"/&gt;
+
+      &lt;arg value="${install.dir}"/&gt;           // PublicationHelper
+      &lt;arg value="test"/&gt;                     // PublicationHelper
+      &lt;arg value="config/something.xconf"/&gt;   // MyTest
+
+      &lt;classpath refid="classpath"/&gt;
+
+      &lt;classpath&gt;
+        &lt;pathelement location="${build.test}" /&gt;
+        &lt;pathelement path="${build.root}/lenya/webapp/WEB-INF/classes" /&gt;
+        &lt;fileset dir="${build.root}/lenya/webapp/WEB-INF/lib"&gt;
+          &lt;include name="ant**.jar"/&gt;
+        &lt;/fileset&gt;
+
+      &lt;/classpath&gt;
+    &lt;/java&gt;
+  &lt;/target&gt;
+</pre>
+<p>Finally, you have to add the test to the <em>tests.junit</em> target: </p>
+<pre class="code">
+
+&lt;target name="tests.junit" depends="init, tests.prepare, ..., test.my"&gt;
+</pre>
+<p>Now you can run the tests: </p>
+<pre class="code">
+$LENYA_HOME &gt; build test
+</pre>
+<p>If you want to call your test independently, you have to call the preparation targets before: </p>
+<pre class="code">
+$LENYA_HOME &gt; build init
+$LENYA_HOME &gt; build tests.prepare
+$LENYA_HOME &gt; build test.my
+
+</pre>
 </div>    
   
 </div>

Modified: lenya/site/1_2_x/misc/unittests.pdf
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/misc/unittests.pdf?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
Binary files - no diff available.

Modified: lenya/site/1_2_x/misc/xinclude-processor.html
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/misc/xinclude-processor.html?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
--- lenya/site/1_2_x/misc/xinclude-processor.html (original)
+++ lenya/site/1_2_x/misc/xinclude-processor.html Sun May 15 17:32:04 2005
@@ -30,11 +30,7 @@
     |start group logo
     +-->
 <div class="grouplogo">
-<a href="http://lenya.apache.org"><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title="
-  	Apache Lenya is a Java-based Open-Source Content Management System.
-  	It is based on open standards such as XML and XSLT.
-  	One of its core components is Cocoon from the Apache Software Foundation.
-  "></a>
+<a href=""><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title=""></a>
 </div>
 <!--+
     |end group logo
@@ -126,10 +122,76 @@
 <a title="" href="../../1_2_x/installation/source_version.html">Install Instructions</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3', '../../skin/')" id="menu_1.1.3Title" class="menutitle">Components</div>
+<div onclick="SwitchMenu('menu_1.1.3', '../../skin/')" id="menu_1.1.3Title" class="menutitle">Tutorial</div>
 <div id="menu_1.1.3" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.1.3.1', '../../skin/')" id="menu_1.1.3.1Title" class="menutitle">Access&nbsp;Control</div>
-<div id="menu_1.1.3.1" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/index.html">Introduction</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/understanding_lenya.html">1. Understanding Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/installing_lenya.html">2. Installing Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/anatomy_of_the_pipeline.html">3. Anatomy of the Pipeline</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/editing_in_lenya.html">4. Editing in Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/custom_navigation.html">5. Custom Navigation in Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya.html">6a. Mod Proxy and Lenya</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya_continued.html">6b. Mod Proxy and Lenya</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">How-To</div>
+<div id="menu_1.1.4" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/faq.html">FAQ</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_publication.html">New Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/deploy_publication.html">Deploy Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/look_and_feel.html">Look and Feel</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/custom_resourcetype.html">Custom Resource Type</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_mime_type.html">Adding Mime Types</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/site_navigation.html">Site Navigation</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/ldap_authentication.html">LDAP Authentication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_menus.html">CMS Menus</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_screens.html">CMS Screens</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/search.html">Search Publications</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/external_data.html">External Data</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Components</div>
+<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.1', '../../skin/')" id="menu_1.1.5.1Title" class="menutitle">Access&nbsp;Control</div>
+<div id="menu_1.1.5.1" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/accesscontrol/terms.html">Basic Terms</a>
 </div>
@@ -155,8 +217,8 @@
 <a title="" href="../../1_2_x/components/accesscontrol/ssl.html">SSL Encryption</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.2', '../../skin/')" id="menu_1.1.3.2Title" class="menutitle">Authoring</div>
-<div id="menu_1.1.3.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.2', '../../skin/')" id="menu_1.1.5.2Title" class="menutitle">Authoring</div>
+<div id="menu_1.1.5.2" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/authoring/adding-document-creator.html">Adding a new document creator</a>
 </div>
@@ -167,14 +229,14 @@
 <a title="" href="../../1_2_x/components/authoring/openoffice.html">OpenOffice</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.3', '../../skin/')" id="menu_1.1.3.3Title" class="menutitle">Deployment</div>
-<div id="menu_1.1.3.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.3', '../../skin/')" id="menu_1.1.5.3Title" class="menutitle">Deployment</div>
+<div id="menu_1.1.5.3" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/deployment/proxying.html">Proxying</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.4', '../../skin/')" id="menu_1.1.3.4Title" class="menutitle">Editors</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.4', '../../skin/')" id="menu_1.1.5.4Title" class="menutitle">Editors</div>
+<div id="menu_1.1.5.4" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/editors/htmlform.html">HTML Form Editor</a>
 </div>
@@ -191,8 +253,8 @@
 <a title="" href="../../1_2_x/components/editors/xopus.html">Xopus</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.5', '../../skin/')" id="menu_1.1.3.5Title" class="menutitle">Layout</div>
-<div id="menu_1.1.3.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.5', '../../skin/')" id="menu_1.1.5.5Title" class="menutitle">Layout</div>
+<div id="menu_1.1.5.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/layout/navigation.html">Navigation</a>
 </div>
@@ -206,8 +268,8 @@
 <a title="" href="../../1_2_x/components/layout/lenya-menubar.html">Lenya Menubar</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.6', '../../skin/')" id="menu_1.1.3.6Title" class="menutitle">Publication</div>
-<div id="menu_1.1.3.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.6', '../../skin/')" id="menu_1.1.5.6Title" class="menutitle">Publication</div>
+<div id="menu_1.1.5.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/publication/pageenvelopemodule.html">PageEnvelopeModule</a>
 </div>
@@ -215,14 +277,14 @@
 <a title="" href="../../1_2_x/components/publication/siteTree.html">Site tree</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.7', '../../skin/')" id="menu_1.1.3.7Title" class="menutitle">Resource&nbsp;Types</div>
-<div id="menu_1.1.3.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.7', '../../skin/')" id="menu_1.1.5.7Title" class="menutitle">Resource&nbsp;Types</div>
+<div id="menu_1.1.5.7" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/resource-types/resource-types.html">Resource&nbsp;Types</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.8', '../../skin/')" id="menu_1.1.3.8Title" class="menutitle">Revision Control</div>
-<div id="menu_1.1.3.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.8', '../../skin/')" id="menu_1.1.5.8Title" class="menutitle">Revision Control</div>
+<div id="menu_1.1.5.8" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/revisioncontrol/revisioncontroller.html">Revision Controller</a>
 </div>
@@ -242,20 +304,20 @@
 <a title="" href="../../1_2_x/components/revisioncontrol/rollback.html">Rollback</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.9', '../../skin/')" id="menu_1.1.3.9Title" class="menutitle">Repository</div>
-<div id="menu_1.1.3.9" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.9', '../../skin/')" id="menu_1.1.5.9Title" class="menutitle">Repository</div>
+<div id="menu_1.1.5.9" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/repository/webdav.html">WebDAV Servers</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.10', '../../skin/')" id="menu_1.1.3.10Title" class="menutitle">Search</div>
-<div id="menu_1.1.3.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.10', '../../skin/')" id="menu_1.1.5.10Title" class="menutitle">Search</div>
+<div id="menu_1.1.5.10" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/search/lucene.html">Searching with Lucene</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.11', '../../skin/')" id="menu_1.1.3.11Title" class="menutitle">URI Handling</div>
-<div id="menu_1.1.3.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.11', '../../skin/')" id="menu_1.1.5.11Title" class="menutitle">URI Handling</div>
+<div id="menu_1.1.5.11" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/uri-handling/URIParametrizer.html">URI Parametrizer</a>
 </div>
@@ -266,32 +328,32 @@
 <a title="" href="../../1_2_x/components/uri-handling/usecases.html">Usecases</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.12', '../../skin/')" id="menu_1.1.3.12Title" class="menutitle">Asset Management</div>
-<div id="menu_1.1.3.12" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.12', '../../skin/')" id="menu_1.1.5.12Title" class="menutitle">Asset Management</div>
+<div id="menu_1.1.5.12" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/asset-management/management.html">Asset Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.13', '../../skin/')" id="menu_1.1.3.13Title" class="menutitle">Link Management</div>
-<div id="menu_1.1.3.13" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.13', '../../skin/')" id="menu_1.1.5.13Title" class="menutitle">Link Management</div>
+<div id="menu_1.1.5.13" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/link-management/link-management.html">Link Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.14', '../../skin/')" id="menu_1.1.3.14Title" class="menutitle">Meta Data</div>
-<div id="menu_1.1.3.14" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.14', '../../skin/')" id="menu_1.1.5.14Title" class="menutitle">Meta Data</div>
+<div id="menu_1.1.5.14" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/metadata/metadata.html">Meta Data Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.15', '../../skin/')" id="menu_1.1.3.15Title" class="menutitle">Multilingual Documents</div>
-<div id="menu_1.1.3.15" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.15', '../../skin/')" id="menu_1.1.5.15Title" class="menutitle">Multilingual Documents</div>
+<div id="menu_1.1.5.15" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/multilingual/multilingual.html">Multilingual Document Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.16', '../../skin/')" id="menu_1.1.3.16Title" class="menutitle">Tasks</div>
-<div id="menu_1.1.3.16" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16', '../../skin/')" id="menu_1.1.5.16Title" class="menutitle">Tasks</div>
+<div id="menu_1.1.5.16" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/concept.html">The Task Concept</a>
 </div>
@@ -304,8 +366,8 @@
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/scheduling.html">Scheduling a Task</a>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.16.5', '../../skin/')" id="menu_1.1.3.16.5Title" class="menutitle">Included tasks</div>
-<div id="menu_1.1.3.16.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16.5', '../../skin/')" id="menu_1.1.5.16.5Title" class="menutitle">Included tasks</div>
+<div id="menu_1.1.5.16.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/anttask.html">AntTask</a>
 </div>
@@ -323,8 +385,8 @@
 <a title="" href="../../1_2_x/components/tasks/development.html">Developing Tasks</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.17', '../../skin/')" id="menu_1.1.3.17Title" class="menutitle">Workflow</div>
-<div id="menu_1.1.3.17" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.17', '../../skin/')" id="menu_1.1.5.17Title" class="menutitle">Workflow</div>
+<div id="menu_1.1.5.17" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/workflow/terms.html">Terms</a>
 </div>
@@ -338,8 +400,8 @@
 <a title="" href="../../1_2_x/components/workflow/implementation.html">Implementation</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.3.18', '../../skin/')" id="menu_1.1.3.18Title" class="menutitle">Site Management</div>
-<div id="menu_1.1.3.18" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.18', '../../skin/')" id="menu_1.1.5.18Title" class="menutitle">Site Management</div>
+<div id="menu_1.1.5.18" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/sitemanagement/archive.html">Archive</a>
 </div>
@@ -369,13 +431,16 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.1.4', '../../skin/')" id="menu_selected_1.1.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Miscellaneous</div>
-<div id="menu_selected_1.1.4" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.1.6', '../../skin/')" id="menu_selected_1.1.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Miscellaneous</div>
+<div id="menu_selected_1.1.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/namespaces.html">Namespaces</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/coding-guidelines.html">Coding Guidelines</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/misc/reserved_names.html">Reserved Names</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/unittests.html">Unit Tests</a>

Modified: lenya/site/1_2_x/tutorial/anatomy_of_the_pipeline.html
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/tutorial/anatomy_of_the_pipeline.html?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
--- lenya/site/1_2_x/tutorial/anatomy_of_the_pipeline.html (original)
+++ lenya/site/1_2_x/tutorial/anatomy_of_the_pipeline.html Sun May 15 17:32:04 2005
@@ -30,11 +30,7 @@
     |start group logo
     +-->
 <div class="grouplogo">
-<a href="http://lenya.apache.org"><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title="
-  	Apache Lenya is a Java-based Open-Source Content Management System.
-  	It is based on open standards such as XML and XSLT.
-  	One of its core components is Cocoon from the Apache Software Foundation.
-  "></a>
+<a href=""><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title=""></a>
 </div>
 <!--+
     |end group logo
@@ -185,10 +181,49 @@
 <a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya_continued.html">6b. Mod Proxy and Lenya</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">Components</div>
+<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">How-To</div>
 <div id="menu_1.1.4" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.1.4.1', '../../skin/')" id="menu_1.1.4.1Title" class="menutitle">Access&nbsp;Control</div>
-<div id="menu_1.1.4.1" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/faq.html">FAQ</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_publication.html">New Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/deploy_publication.html">Deploy Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/look_and_feel.html">Look and Feel</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/custom_resourcetype.html">Custom Resource Type</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_mime_type.html">Adding Mime Types</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/site_navigation.html">Site Navigation</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/ldap_authentication.html">LDAP Authentication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_menus.html">CMS Menus</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_screens.html">CMS Screens</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/search.html">Search Publications</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/external_data.html">External Data</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Components</div>
+<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.1', '../../skin/')" id="menu_1.1.5.1Title" class="menutitle">Access&nbsp;Control</div>
+<div id="menu_1.1.5.1" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/accesscontrol/terms.html">Basic Terms</a>
 </div>
@@ -214,8 +249,8 @@
 <a title="" href="../../1_2_x/components/accesscontrol/ssl.html">SSL Encryption</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.2', '../../skin/')" id="menu_1.1.4.2Title" class="menutitle">Authoring</div>
-<div id="menu_1.1.4.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.2', '../../skin/')" id="menu_1.1.5.2Title" class="menutitle">Authoring</div>
+<div id="menu_1.1.5.2" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/authoring/adding-document-creator.html">Adding a new document creator</a>
 </div>
@@ -226,14 +261,14 @@
 <a title="" href="../../1_2_x/components/authoring/openoffice.html">OpenOffice</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.3', '../../skin/')" id="menu_1.1.4.3Title" class="menutitle">Deployment</div>
-<div id="menu_1.1.4.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.3', '../../skin/')" id="menu_1.1.5.3Title" class="menutitle">Deployment</div>
+<div id="menu_1.1.5.3" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/deployment/proxying.html">Proxying</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.4', '../../skin/')" id="menu_1.1.4.4Title" class="menutitle">Editors</div>
-<div id="menu_1.1.4.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.4', '../../skin/')" id="menu_1.1.5.4Title" class="menutitle">Editors</div>
+<div id="menu_1.1.5.4" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/editors/htmlform.html">HTML Form Editor</a>
 </div>
@@ -250,8 +285,8 @@
 <a title="" href="../../1_2_x/components/editors/xopus.html">Xopus</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.5', '../../skin/')" id="menu_1.1.4.5Title" class="menutitle">Layout</div>
-<div id="menu_1.1.4.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.5', '../../skin/')" id="menu_1.1.5.5Title" class="menutitle">Layout</div>
+<div id="menu_1.1.5.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/layout/navigation.html">Navigation</a>
 </div>
@@ -265,8 +300,8 @@
 <a title="" href="../../1_2_x/components/layout/lenya-menubar.html">Lenya Menubar</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.6', '../../skin/')" id="menu_1.1.4.6Title" class="menutitle">Publication</div>
-<div id="menu_1.1.4.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.6', '../../skin/')" id="menu_1.1.5.6Title" class="menutitle">Publication</div>
+<div id="menu_1.1.5.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/publication/pageenvelopemodule.html">PageEnvelopeModule</a>
 </div>
@@ -274,14 +309,14 @@
 <a title="" href="../../1_2_x/components/publication/siteTree.html">Site tree</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.7', '../../skin/')" id="menu_1.1.4.7Title" class="menutitle">Resource&nbsp;Types</div>
-<div id="menu_1.1.4.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.7', '../../skin/')" id="menu_1.1.5.7Title" class="menutitle">Resource&nbsp;Types</div>
+<div id="menu_1.1.5.7" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/resource-types/resource-types.html">Resource&nbsp;Types</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.8', '../../skin/')" id="menu_1.1.4.8Title" class="menutitle">Revision Control</div>
-<div id="menu_1.1.4.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.8', '../../skin/')" id="menu_1.1.5.8Title" class="menutitle">Revision Control</div>
+<div id="menu_1.1.5.8" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/revisioncontrol/revisioncontroller.html">Revision Controller</a>
 </div>
@@ -301,20 +336,20 @@
 <a title="" href="../../1_2_x/components/revisioncontrol/rollback.html">Rollback</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.9', '../../skin/')" id="menu_1.1.4.9Title" class="menutitle">Repository</div>
-<div id="menu_1.1.4.9" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.9', '../../skin/')" id="menu_1.1.5.9Title" class="menutitle">Repository</div>
+<div id="menu_1.1.5.9" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/repository/webdav.html">WebDAV Servers</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.10', '../../skin/')" id="menu_1.1.4.10Title" class="menutitle">Search</div>
-<div id="menu_1.1.4.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.10', '../../skin/')" id="menu_1.1.5.10Title" class="menutitle">Search</div>
+<div id="menu_1.1.5.10" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/search/lucene.html">Searching with Lucene</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.11', '../../skin/')" id="menu_1.1.4.11Title" class="menutitle">URI Handling</div>
-<div id="menu_1.1.4.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.11', '../../skin/')" id="menu_1.1.5.11Title" class="menutitle">URI Handling</div>
+<div id="menu_1.1.5.11" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/uri-handling/URIParametrizer.html">URI Parametrizer</a>
 </div>
@@ -325,32 +360,32 @@
 <a title="" href="../../1_2_x/components/uri-handling/usecases.html">Usecases</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.12', '../../skin/')" id="menu_1.1.4.12Title" class="menutitle">Asset Management</div>
-<div id="menu_1.1.4.12" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.12', '../../skin/')" id="menu_1.1.5.12Title" class="menutitle">Asset Management</div>
+<div id="menu_1.1.5.12" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/asset-management/management.html">Asset Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.13', '../../skin/')" id="menu_1.1.4.13Title" class="menutitle">Link Management</div>
-<div id="menu_1.1.4.13" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.13', '../../skin/')" id="menu_1.1.5.13Title" class="menutitle">Link Management</div>
+<div id="menu_1.1.5.13" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/link-management/link-management.html">Link Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.14', '../../skin/')" id="menu_1.1.4.14Title" class="menutitle">Meta Data</div>
-<div id="menu_1.1.4.14" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.14', '../../skin/')" id="menu_1.1.5.14Title" class="menutitle">Meta Data</div>
+<div id="menu_1.1.5.14" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/metadata/metadata.html">Meta Data Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.15', '../../skin/')" id="menu_1.1.4.15Title" class="menutitle">Multilingual Documents</div>
-<div id="menu_1.1.4.15" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.15', '../../skin/')" id="menu_1.1.5.15Title" class="menutitle">Multilingual Documents</div>
+<div id="menu_1.1.5.15" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/multilingual/multilingual.html">Multilingual Document Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16', '../../skin/')" id="menu_1.1.4.16Title" class="menutitle">Tasks</div>
-<div id="menu_1.1.4.16" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16', '../../skin/')" id="menu_1.1.5.16Title" class="menutitle">Tasks</div>
+<div id="menu_1.1.5.16" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/concept.html">The Task Concept</a>
 </div>
@@ -363,8 +398,8 @@
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/scheduling.html">Scheduling a Task</a>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16.5', '../../skin/')" id="menu_1.1.4.16.5Title" class="menutitle">Included tasks</div>
-<div id="menu_1.1.4.16.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16.5', '../../skin/')" id="menu_1.1.5.16.5Title" class="menutitle">Included tasks</div>
+<div id="menu_1.1.5.16.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/anttask.html">AntTask</a>
 </div>
@@ -382,8 +417,8 @@
 <a title="" href="../../1_2_x/components/tasks/development.html">Developing Tasks</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.17', '../../skin/')" id="menu_1.1.4.17Title" class="menutitle">Workflow</div>
-<div id="menu_1.1.4.17" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.17', '../../skin/')" id="menu_1.1.5.17Title" class="menutitle">Workflow</div>
+<div id="menu_1.1.5.17" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/workflow/terms.html">Terms</a>
 </div>
@@ -397,8 +432,8 @@
 <a title="" href="../../1_2_x/components/workflow/implementation.html">Implementation</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.18', '../../skin/')" id="menu_1.1.4.18Title" class="menutitle">Site Management</div>
-<div id="menu_1.1.4.18" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.18', '../../skin/')" id="menu_1.1.5.18Title" class="menutitle">Site Management</div>
+<div id="menu_1.1.5.18" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/sitemanagement/archive.html">Archive</a>
 </div>
@@ -428,13 +463,16 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Miscellaneous</div>
-<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.6', '../../skin/')" id="menu_1.1.6Title" class="menutitle">Miscellaneous</div>
+<div id="menu_1.1.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/namespaces.html">Namespaces</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/coding-guidelines.html">Coding Guidelines</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/misc/reserved_names.html">Reserved Names</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/unittests.html">Unit Tests</a>

Modified: lenya/site/1_2_x/tutorial/custom_navigation.html
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/tutorial/custom_navigation.html?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
--- lenya/site/1_2_x/tutorial/custom_navigation.html (original)
+++ lenya/site/1_2_x/tutorial/custom_navigation.html Sun May 15 17:32:04 2005
@@ -30,11 +30,7 @@
     |start group logo
     +-->
 <div class="grouplogo">
-<a href="http://lenya.apache.org"><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title="
-  	Apache Lenya is a Java-based Open-Source Content Management System.
-  	It is based on open standards such as XML and XSLT.
-  	One of its core components is Cocoon from the Apache Software Foundation.
-  "></a>
+<a href=""><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title=""></a>
 </div>
 <!--+
     |end group logo
@@ -178,10 +174,49 @@
 <a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya_continued.html">6b. Mod Proxy and Lenya</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">Components</div>
+<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">How-To</div>
 <div id="menu_1.1.4" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.1.4.1', '../../skin/')" id="menu_1.1.4.1Title" class="menutitle">Access&nbsp;Control</div>
-<div id="menu_1.1.4.1" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/faq.html">FAQ</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_publication.html">New Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/deploy_publication.html">Deploy Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/look_and_feel.html">Look and Feel</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/custom_resourcetype.html">Custom Resource Type</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_mime_type.html">Adding Mime Types</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/site_navigation.html">Site Navigation</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/ldap_authentication.html">LDAP Authentication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_menus.html">CMS Menus</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_screens.html">CMS Screens</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/search.html">Search Publications</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/external_data.html">External Data</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Components</div>
+<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.1', '../../skin/')" id="menu_1.1.5.1Title" class="menutitle">Access&nbsp;Control</div>
+<div id="menu_1.1.5.1" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/accesscontrol/terms.html">Basic Terms</a>
 </div>
@@ -207,8 +242,8 @@
 <a title="" href="../../1_2_x/components/accesscontrol/ssl.html">SSL Encryption</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.2', '../../skin/')" id="menu_1.1.4.2Title" class="menutitle">Authoring</div>
-<div id="menu_1.1.4.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.2', '../../skin/')" id="menu_1.1.5.2Title" class="menutitle">Authoring</div>
+<div id="menu_1.1.5.2" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/authoring/adding-document-creator.html">Adding a new document creator</a>
 </div>
@@ -219,14 +254,14 @@
 <a title="" href="../../1_2_x/components/authoring/openoffice.html">OpenOffice</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.3', '../../skin/')" id="menu_1.1.4.3Title" class="menutitle">Deployment</div>
-<div id="menu_1.1.4.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.3', '../../skin/')" id="menu_1.1.5.3Title" class="menutitle">Deployment</div>
+<div id="menu_1.1.5.3" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/deployment/proxying.html">Proxying</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.4', '../../skin/')" id="menu_1.1.4.4Title" class="menutitle">Editors</div>
-<div id="menu_1.1.4.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.4', '../../skin/')" id="menu_1.1.5.4Title" class="menutitle">Editors</div>
+<div id="menu_1.1.5.4" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/editors/htmlform.html">HTML Form Editor</a>
 </div>
@@ -243,8 +278,8 @@
 <a title="" href="../../1_2_x/components/editors/xopus.html">Xopus</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.5', '../../skin/')" id="menu_1.1.4.5Title" class="menutitle">Layout</div>
-<div id="menu_1.1.4.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.5', '../../skin/')" id="menu_1.1.5.5Title" class="menutitle">Layout</div>
+<div id="menu_1.1.5.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/layout/navigation.html">Navigation</a>
 </div>
@@ -258,8 +293,8 @@
 <a title="" href="../../1_2_x/components/layout/lenya-menubar.html">Lenya Menubar</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.6', '../../skin/')" id="menu_1.1.4.6Title" class="menutitle">Publication</div>
-<div id="menu_1.1.4.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.6', '../../skin/')" id="menu_1.1.5.6Title" class="menutitle">Publication</div>
+<div id="menu_1.1.5.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/publication/pageenvelopemodule.html">PageEnvelopeModule</a>
 </div>
@@ -267,14 +302,14 @@
 <a title="" href="../../1_2_x/components/publication/siteTree.html">Site tree</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.7', '../../skin/')" id="menu_1.1.4.7Title" class="menutitle">Resource&nbsp;Types</div>
-<div id="menu_1.1.4.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.7', '../../skin/')" id="menu_1.1.5.7Title" class="menutitle">Resource&nbsp;Types</div>
+<div id="menu_1.1.5.7" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/resource-types/resource-types.html">Resource&nbsp;Types</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.8', '../../skin/')" id="menu_1.1.4.8Title" class="menutitle">Revision Control</div>
-<div id="menu_1.1.4.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.8', '../../skin/')" id="menu_1.1.5.8Title" class="menutitle">Revision Control</div>
+<div id="menu_1.1.5.8" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/revisioncontrol/revisioncontroller.html">Revision Controller</a>
 </div>
@@ -294,20 +329,20 @@
 <a title="" href="../../1_2_x/components/revisioncontrol/rollback.html">Rollback</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.9', '../../skin/')" id="menu_1.1.4.9Title" class="menutitle">Repository</div>
-<div id="menu_1.1.4.9" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.9', '../../skin/')" id="menu_1.1.5.9Title" class="menutitle">Repository</div>
+<div id="menu_1.1.5.9" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/repository/webdav.html">WebDAV Servers</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.10', '../../skin/')" id="menu_1.1.4.10Title" class="menutitle">Search</div>
-<div id="menu_1.1.4.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.10', '../../skin/')" id="menu_1.1.5.10Title" class="menutitle">Search</div>
+<div id="menu_1.1.5.10" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/search/lucene.html">Searching with Lucene</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.11', '../../skin/')" id="menu_1.1.4.11Title" class="menutitle">URI Handling</div>
-<div id="menu_1.1.4.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.11', '../../skin/')" id="menu_1.1.5.11Title" class="menutitle">URI Handling</div>
+<div id="menu_1.1.5.11" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/uri-handling/URIParametrizer.html">URI Parametrizer</a>
 </div>
@@ -318,32 +353,32 @@
 <a title="" href="../../1_2_x/components/uri-handling/usecases.html">Usecases</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.12', '../../skin/')" id="menu_1.1.4.12Title" class="menutitle">Asset Management</div>
-<div id="menu_1.1.4.12" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.12', '../../skin/')" id="menu_1.1.5.12Title" class="menutitle">Asset Management</div>
+<div id="menu_1.1.5.12" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/asset-management/management.html">Asset Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.13', '../../skin/')" id="menu_1.1.4.13Title" class="menutitle">Link Management</div>
-<div id="menu_1.1.4.13" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.13', '../../skin/')" id="menu_1.1.5.13Title" class="menutitle">Link Management</div>
+<div id="menu_1.1.5.13" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/link-management/link-management.html">Link Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.14', '../../skin/')" id="menu_1.1.4.14Title" class="menutitle">Meta Data</div>
-<div id="menu_1.1.4.14" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.14', '../../skin/')" id="menu_1.1.5.14Title" class="menutitle">Meta Data</div>
+<div id="menu_1.1.5.14" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/metadata/metadata.html">Meta Data Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.15', '../../skin/')" id="menu_1.1.4.15Title" class="menutitle">Multilingual Documents</div>
-<div id="menu_1.1.4.15" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.15', '../../skin/')" id="menu_1.1.5.15Title" class="menutitle">Multilingual Documents</div>
+<div id="menu_1.1.5.15" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/multilingual/multilingual.html">Multilingual Document Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16', '../../skin/')" id="menu_1.1.4.16Title" class="menutitle">Tasks</div>
-<div id="menu_1.1.4.16" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16', '../../skin/')" id="menu_1.1.5.16Title" class="menutitle">Tasks</div>
+<div id="menu_1.1.5.16" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/concept.html">The Task Concept</a>
 </div>
@@ -356,8 +391,8 @@
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/scheduling.html">Scheduling a Task</a>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16.5', '../../skin/')" id="menu_1.1.4.16.5Title" class="menutitle">Included tasks</div>
-<div id="menu_1.1.4.16.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16.5', '../../skin/')" id="menu_1.1.5.16.5Title" class="menutitle">Included tasks</div>
+<div id="menu_1.1.5.16.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/anttask.html">AntTask</a>
 </div>
@@ -375,8 +410,8 @@
 <a title="" href="../../1_2_x/components/tasks/development.html">Developing Tasks</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.17', '../../skin/')" id="menu_1.1.4.17Title" class="menutitle">Workflow</div>
-<div id="menu_1.1.4.17" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.17', '../../skin/')" id="menu_1.1.5.17Title" class="menutitle">Workflow</div>
+<div id="menu_1.1.5.17" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/workflow/terms.html">Terms</a>
 </div>
@@ -390,8 +425,8 @@
 <a title="" href="../../1_2_x/components/workflow/implementation.html">Implementation</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.18', '../../skin/')" id="menu_1.1.4.18Title" class="menutitle">Site Management</div>
-<div id="menu_1.1.4.18" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.18', '../../skin/')" id="menu_1.1.5.18Title" class="menutitle">Site Management</div>
+<div id="menu_1.1.5.18" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/sitemanagement/archive.html">Archive</a>
 </div>
@@ -421,13 +456,16 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Miscellaneous</div>
-<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.6', '../../skin/')" id="menu_1.1.6Title" class="menutitle">Miscellaneous</div>
+<div id="menu_1.1.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/namespaces.html">Namespaces</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/coding-guidelines.html">Coding Guidelines</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/misc/reserved_names.html">Reserved Names</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/unittests.html">Unit Tests</a>

Modified: lenya/site/1_2_x/tutorial/editing_in_lenya.html
URL: http://svn.apache.org/viewcvs/lenya/site/1_2_x/tutorial/editing_in_lenya.html?rev=170289&r1=170288&r2=170289&view=diff
==============================================================================
--- lenya/site/1_2_x/tutorial/editing_in_lenya.html (original)
+++ lenya/site/1_2_x/tutorial/editing_in_lenya.html Sun May 15 17:32:04 2005
@@ -30,11 +30,7 @@
     |start group logo
     +-->
 <div class="grouplogo">
-<a href="http://lenya.apache.org"><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title="
-  	Apache Lenya is a Java-based Open-Source Content Management System.
-  	It is based on open standards such as XML and XSLT.
-  	One of its core components is Cocoon from the Apache Software Foundation.
-  "></a>
+<a href=""><img class="logoImage" alt="Lenya" src="../../images/apache-lenya-light.png" title=""></a>
 </div>
 <!--+
     |end group logo
@@ -164,10 +160,49 @@
 <a title="" href="../../1_2_x/tutorial/mod_proxy_and_lenya_continued.html">6b. Mod Proxy and Lenya</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">Components</div>
+<div onclick="SwitchMenu('menu_1.1.4', '../../skin/')" id="menu_1.1.4Title" class="menutitle">How-To</div>
 <div id="menu_1.1.4" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.1.4.1', '../../skin/')" id="menu_1.1.4.1Title" class="menutitle">Access&nbsp;Control</div>
-<div id="menu_1.1.4.1" class="menuitemgroup">
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/faq.html">FAQ</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_publication.html">New Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/deploy_publication.html">Deploy Publication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/look_and_feel.html">Look and Feel</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/custom_resourcetype.html">Custom Resource Type</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/new_mime_type.html">Adding Mime Types</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/site_navigation.html">Site Navigation</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/ldap_authentication.html">LDAP Authentication</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_menus.html">CMS Menus</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/cms_screens.html">CMS Screens</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/search.html">Search Publications</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/how-to/external_data.html">External Data</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Components</div>
+<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.1', '../../skin/')" id="menu_1.1.5.1Title" class="menutitle">Access&nbsp;Control</div>
+<div id="menu_1.1.5.1" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/accesscontrol/terms.html">Basic Terms</a>
 </div>
@@ -193,8 +228,8 @@
 <a title="" href="../../1_2_x/components/accesscontrol/ssl.html">SSL Encryption</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.2', '../../skin/')" id="menu_1.1.4.2Title" class="menutitle">Authoring</div>
-<div id="menu_1.1.4.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.2', '../../skin/')" id="menu_1.1.5.2Title" class="menutitle">Authoring</div>
+<div id="menu_1.1.5.2" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/authoring/adding-document-creator.html">Adding a new document creator</a>
 </div>
@@ -205,14 +240,14 @@
 <a title="" href="../../1_2_x/components/authoring/openoffice.html">OpenOffice</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.3', '../../skin/')" id="menu_1.1.4.3Title" class="menutitle">Deployment</div>
-<div id="menu_1.1.4.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.3', '../../skin/')" id="menu_1.1.5.3Title" class="menutitle">Deployment</div>
+<div id="menu_1.1.5.3" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/deployment/proxying.html">Proxying</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.4', '../../skin/')" id="menu_1.1.4.4Title" class="menutitle">Editors</div>
-<div id="menu_1.1.4.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.4', '../../skin/')" id="menu_1.1.5.4Title" class="menutitle">Editors</div>
+<div id="menu_1.1.5.4" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/editors/htmlform.html">HTML Form Editor</a>
 </div>
@@ -229,8 +264,8 @@
 <a title="" href="../../1_2_x/components/editors/xopus.html">Xopus</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.5', '../../skin/')" id="menu_1.1.4.5Title" class="menutitle">Layout</div>
-<div id="menu_1.1.4.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.5', '../../skin/')" id="menu_1.1.5.5Title" class="menutitle">Layout</div>
+<div id="menu_1.1.5.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/layout/navigation.html">Navigation</a>
 </div>
@@ -244,8 +279,8 @@
 <a title="" href="../../1_2_x/components/layout/lenya-menubar.html">Lenya Menubar</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.6', '../../skin/')" id="menu_1.1.4.6Title" class="menutitle">Publication</div>
-<div id="menu_1.1.4.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.6', '../../skin/')" id="menu_1.1.5.6Title" class="menutitle">Publication</div>
+<div id="menu_1.1.5.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/publication/pageenvelopemodule.html">PageEnvelopeModule</a>
 </div>
@@ -253,14 +288,14 @@
 <a title="" href="../../1_2_x/components/publication/siteTree.html">Site tree</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.7', '../../skin/')" id="menu_1.1.4.7Title" class="menutitle">Resource&nbsp;Types</div>
-<div id="menu_1.1.4.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.7', '../../skin/')" id="menu_1.1.5.7Title" class="menutitle">Resource&nbsp;Types</div>
+<div id="menu_1.1.5.7" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/resource-types/resource-types.html">Resource&nbsp;Types</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.8', '../../skin/')" id="menu_1.1.4.8Title" class="menutitle">Revision Control</div>
-<div id="menu_1.1.4.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.8', '../../skin/')" id="menu_1.1.5.8Title" class="menutitle">Revision Control</div>
+<div id="menu_1.1.5.8" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/revisioncontrol/revisioncontroller.html">Revision Controller</a>
 </div>
@@ -280,20 +315,20 @@
 <a title="" href="../../1_2_x/components/revisioncontrol/rollback.html">Rollback</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.9', '../../skin/')" id="menu_1.1.4.9Title" class="menutitle">Repository</div>
-<div id="menu_1.1.4.9" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.9', '../../skin/')" id="menu_1.1.5.9Title" class="menutitle">Repository</div>
+<div id="menu_1.1.5.9" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/repository/webdav.html">WebDAV Servers</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.10', '../../skin/')" id="menu_1.1.4.10Title" class="menutitle">Search</div>
-<div id="menu_1.1.4.10" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.10', '../../skin/')" id="menu_1.1.5.10Title" class="menutitle">Search</div>
+<div id="menu_1.1.5.10" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/search/lucene.html">Searching with Lucene</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.11', '../../skin/')" id="menu_1.1.4.11Title" class="menutitle">URI Handling</div>
-<div id="menu_1.1.4.11" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.11', '../../skin/')" id="menu_1.1.5.11Title" class="menutitle">URI Handling</div>
+<div id="menu_1.1.5.11" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/uri-handling/URIParametrizer.html">URI Parametrizer</a>
 </div>
@@ -304,32 +339,32 @@
 <a title="" href="../../1_2_x/components/uri-handling/usecases.html">Usecases</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.12', '../../skin/')" id="menu_1.1.4.12Title" class="menutitle">Asset Management</div>
-<div id="menu_1.1.4.12" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.12', '../../skin/')" id="menu_1.1.5.12Title" class="menutitle">Asset Management</div>
+<div id="menu_1.1.5.12" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/asset-management/management.html">Asset Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.13', '../../skin/')" id="menu_1.1.4.13Title" class="menutitle">Link Management</div>
-<div id="menu_1.1.4.13" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.13', '../../skin/')" id="menu_1.1.5.13Title" class="menutitle">Link Management</div>
+<div id="menu_1.1.5.13" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/link-management/link-management.html">Link Management</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.14', '../../skin/')" id="menu_1.1.4.14Title" class="menutitle">Meta Data</div>
-<div id="menu_1.1.4.14" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.14', '../../skin/')" id="menu_1.1.5.14Title" class="menutitle">Meta Data</div>
+<div id="menu_1.1.5.14" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/metadata/metadata.html">Meta Data Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.15', '../../skin/')" id="menu_1.1.4.15Title" class="menutitle">Multilingual Documents</div>
-<div id="menu_1.1.4.15" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.15', '../../skin/')" id="menu_1.1.5.15Title" class="menutitle">Multilingual Documents</div>
+<div id="menu_1.1.5.15" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/multilingual/multilingual.html">Multilingual Document Handling</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16', '../../skin/')" id="menu_1.1.4.16Title" class="menutitle">Tasks</div>
-<div id="menu_1.1.4.16" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16', '../../skin/')" id="menu_1.1.5.16Title" class="menutitle">Tasks</div>
+<div id="menu_1.1.5.16" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/concept.html">The Task Concept</a>
 </div>
@@ -342,8 +377,8 @@
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/scheduling.html">Scheduling a Task</a>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.16.5', '../../skin/')" id="menu_1.1.4.16.5Title" class="menutitle">Included tasks</div>
-<div id="menu_1.1.4.16.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.16.5', '../../skin/')" id="menu_1.1.5.16.5Title" class="menutitle">Included tasks</div>
+<div id="menu_1.1.5.16.5" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/tasks/anttask.html">AntTask</a>
 </div>
@@ -361,8 +396,8 @@
 <a title="" href="../../1_2_x/components/tasks/development.html">Developing Tasks</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.17', '../../skin/')" id="menu_1.1.4.17Title" class="menutitle">Workflow</div>
-<div id="menu_1.1.4.17" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.17', '../../skin/')" id="menu_1.1.5.17Title" class="menutitle">Workflow</div>
+<div id="menu_1.1.5.17" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/workflow/terms.html">Terms</a>
 </div>
@@ -376,8 +411,8 @@
 <a title="" href="../../1_2_x/components/workflow/implementation.html">Implementation</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.4.18', '../../skin/')" id="menu_1.1.4.18Title" class="menutitle">Site Management</div>
-<div id="menu_1.1.4.18" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.5.18', '../../skin/')" id="menu_1.1.5.18Title" class="menutitle">Site Management</div>
+<div id="menu_1.1.5.18" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/components/sitemanagement/archive.html">Archive</a>
 </div>
@@ -407,13 +442,16 @@
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.1.5', '../../skin/')" id="menu_1.1.5Title" class="menutitle">Miscellaneous</div>
-<div id="menu_1.1.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.6', '../../skin/')" id="menu_1.1.6Title" class="menutitle">Miscellaneous</div>
+<div id="menu_1.1.6" class="menuitemgroup">
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/namespaces.html">Namespaces</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/coding-guidelines.html">Coding Guidelines</a>
+</div>
+<div class="menuitem">
+<a title="" href="../../1_2_x/misc/reserved_names.html">Reserved Names</a>
 </div>
 <div class="menuitem">
 <a title="" href="../../1_2_x/misc/unittests.html">Unit Tests</a>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org