You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/05/02 23:15:49 UTC

cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context standard.xml

mcconnell    2003/05/02 14:15:49

  Modified:    merlin/merlin-smp/xdocs/starting/examples index.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/starting/examples/afs navigation.xml
               merlin/merlin-smp/xdocs/starting/hello/context standard.xml
  Added:       merlin/merlin-smp/xdocs/starting/examples/james about.xml
                        block.xml index.xml navigation.xml resources.xml
                        runtime.xml
  Log:
  Initial document placeholders for the James example.
  
  Revision  Changes    Path
  1.2       +8 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	6 Apr 2003 19:31:25 -0000	1.1
  +++ index.xml	2 May 2003 21:15:48 -0000	1.2
  @@ -20,6 +20,14 @@
                 examples of component-oriented development.
               </td>
             </tr>
  +          <tr>
  +            <td><a href="james/index.html">James Enterprise Messaging</a></td>
  +            <td>
  +              Application example covering the Apache James Enterprise Messaging
  +              Platform.  The example presents a complex application packaged as 
  +              a fully functioning Merlin block.
  +            </td>
  +          </tr>
           </table>
         </subsection>
       </section>
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	27 Apr 2003 09:28:54 -0000	1.6
  +++ navigation.xml	2 May 2003 21:15:48 -0000	1.7
  @@ -20,6 +20,7 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
           <item name="Examples" href="/starting/examples/index.html">
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html"/>
  +          <item name="James Enterprise Messaging" href="/starting/examples/james/index.html"/>
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	27 Apr 2003 09:28:54 -0000	1.6
  +++ navigation.xml	2 May 2003 21:15:48 -0000	1.7
  @@ -22,6 +22,7 @@
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html">
               <item name="Simple Bank" href="/starting/examples/afs/simple/index.html"/>
             </item>
  +          <item name="James Enterprise Messaging" href="/starting/examples/james/index.html"/>
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/about.xml
  
  Index: about.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>About James</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="James Enterprise Messaging Platform">
        <subsection name="About James">
          <p>
          The Java Apache Mail Enterprise Server (a.k.a. Apache 
          James) is a 100% pure Java SMTP and POP3 Mail server and 
          NNTP News server designed to be a complete and portable 
          enterprise mail engine solution based on currently available 
          open protocols.
          </p>
          <p>
          James is also a mail application platform. The James project 
          hosts the Apache Mailet API, and James provides an 
          implementation of this mail application platform API. 
          </p>
        </subsection>
        <subsection name="Features">
          <table>
            <tr><th>Feature</th><th>Description</th></tr>
            <tr><td>Complete portability</td>
              <td>
                <p>
                Apache James is be a 100% pure Java application
                based on the Java 2 platform and the JavaMail 1.3 API.
                </p>
              </td>
            </tr>
            <tr><td>Protocol abstraction</td>
              <td>
                <p>
                Unlike other mail engines, protocols are seen only
                like "communication languages" ruling comunications between clients and
                the server. Apache James is not be tied to any particular protocol but
                follow an abstracted server design (like JavaMail did on the
                client side).
               </p>
              </td>
            </tr>
            <tr><td>Complete solution</td>
              <td>
                <p>
                The mail system is able to handle both mail
                transport and storage in a single server application. Apache James
                in combnination with the Merlin platform works alone without the need 
                for any other server or solution.
               </p>
              </td>
            </tr>
            <tr><td>Complete solution</td>
              <td>
                <p>
                The mail system is able to handle both mail
                transport and storage in a single server application. Apache James
                works alone without the need for any other server or solution.
               </p>
              </td>
            </tr>
            <tr><td>Mailet support</td>
              <td>
                <p>
                 Apache James supports the Apache Mailet API. A Mailet
                 is a discrete piece of mail-processing logic which is incorporated into
                 a Mailet-compliant mail-server's processing. This easy-to-write,
                 easy-to-use pattern allows developers to build powerful customized mail
                 systems. Examples of the services a Mailet might provide include: a
                 mail-to-fax or mail-to-phone transformer, a filter, a language translator, a mailing
                 list manager, etc. Several Mailets are included in the JAMES
                 distribution (see 
                 <a href="http://james.apache.org/documentation_2_1.html">documentation</a>).
               </p>
              </td>
            </tr>
            <tr><td>Resource abstraction</td>
              <td>
                <p>
                Like protocols, resources are abstracted and,
                accessed through defined interfaces (JavaMail for transport, JDBC for
                spool storage or user accounts in RDBMS's, Apache Mailet API). The server is
                highly modular and reuse solutions from other projects.
                </p>
              </td>
            </tr>
            <tr><td>Secure and multi-threaded design</td>
              <td>
                <p>
                Based on the technology developed
                for the Apache JServ servlet engine, Apache James has a careful,
                security-oriented, full multi-threaded design, to allow performance,
                scalability and mission-critical use.
                </p>
              </td>
            </tr>
          </table>
        </subsection>
      </section>
    </body>
  
  </document>
  
  
  
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/block.xml
  
  Index: block.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>About James</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="James Enterprise Messaging Platform">
        <subsection name="The James Block Defintion">
          <p>
            The following block defintion contains the complete James system 
            within a single containment context. In the future it is expected 
            that some of the underlying service components (such as the 
            cornerstone content) will be seperated into indepedent block 
            defintions that will be introduced via include statements (enabling
            improved seperation of James functionality from underlying services).
          </p>
          <p>
            NOTE: Before using this defintion please update the adminstrator 
            account settings in the remote server defintion.
          </p>
  <source><![CDATA[
  <administrator_accounts>
    <account login="root" password="root"/>
  </administrator_accounts>
  ]]></source>
          <p>
            Additional infromation concerning configuration setting for the James
            platform can be found under the <a href="http://james.apache.org">James Home</a>.
          </p>
  
        </subsection>
        <subsection name="block.xml">
  <source><![CDATA[
  <block>
  
     <info>
       <name>james</name>
     </info>
  
     <!--
     Service provided by this block.
     Please not that in order to use these services, you must ensure that
     the required API classes are available in a classloader within the scope 
     of a container using these services.
     -->
    <services>
      <service name="org.apache.james.services.MailServer" version="1.0" />
      <service name="org.apache.mailet.MailetContext" version="1.0" />
    </services>
  
     <!--
     Block implementation.  The implementation element may contain component
     and container entities. The block implementation statement is equivalent
     to a root container.  
     -->
     <implementation>
  
       <categories priority="INFO"/>
  
       <engine>
         <classpath>
           <repository>
             <resource id="excalibur:excalibur-io" version="1.1"/>
             <resource id="excalibur:excalibur-pool" version="1.2"/>
             <resource id="excalibur:excalibur-thread" version="1.1"/>
             <resource id="excalibur:excalibur-threadcontext" version="1.0"/>
             <resource id="excalibur:excalibur-collections" version="1.0"/>
             <resource id="commons:commons-collections" version="2.1"/>
             <resource id="cornerstone:cornerstone-threads" version="1.0"/>
             <resource id="cornerstone:cornerstone-connection" version="1.0"/>
             <resource id="cornerstone:cornerstone-datasources" version="1.0"/>
             <resource id="cornerstone:cornerstone-scheduler" version="1.0"/>
             <resource id="cornerstone:cornerstone-sockets" version="1.0"/>
             <resource id="cornerstone:cornerstone-store" version="1.0"/>
             <resource id="james:dnsjava" version="1.3.2"/>
             <resource id="james:mail" version="1.3"/>
             <resource id="james:activation" version="1.0"/>
             <resource id="james:mailet" version="1.0"/>
             <resource id="james:james" version="1.3"/>
           </repository>
         </classpath>
       </engine>
  
       <component name="james" class="org.apache.james.James" 
             activation="true">
         <configuration>
           <postmaster>postmaster@localhost</postmaster>
           <servernames autodetect="true" autodetectIP="true"/>
          <usernames ignoreCase="true" enableAliases="true" enableForwarding="true"/>
          <inboxRepository>
            <repository destinationURL="file://var/mail/inboxes/" type="MAIL"/>
          </inboxRepository>
        </configuration>
       </component>
  
       <component name="dns" class="org.apache.james.dnsserver.DNSServer" 
             activation="true">
         <configuration>
           <autodiscover>true</autodiscover>
           <authoritative>false</authoritative>
         </configuration>
       </component>
  
       <component name="remote" 
            class="org.apache.james.remotemanager.RemoteManager" 
            activation="true">
         <configuration>
           <port>4555</port>
           <handler>
             <helloName autodetect="TRUE"/>
             <administrator_accounts>
               <account login="root" password="root"/>
             </administrator_accounts>
             <connectiontimeout> 60000 </connectiontimeout>
           </handler>
         </configuration>
       </component>
  
       <component name="pop3" 
             class="org.apache.james.pop3server.POP3Server"  
             activation="true">
           <configuration enabled="true">
             <port>110</port>
             <handler>
               <helloName autodetect="true"/>
               <connectiontimeout>120000</connectiontimeout>
             </handler>
           </configuration>
       </component>
  
       <component name="smtp" 
             class="org.apache.james.smtpserver.SMTPServer" 
             activation="true">
           <configuration enabled="true">
             <port>25</port>
             <handler>
               <helloName autodetect="true"/>
               <connectiontimeout>360000</connectiontimeout>
               <maxmessagesize>0</maxmessagesize>
             </handler>
           </configuration>
       </component>
  
       <component name="threads"
            class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
            activation="true">
         <configuration>
           <thread-group>
             <name>default</name>
             <priority>5</priority> 
             <is-daemon>false</is-daemon>
             <max-threads>100</max-threads>
             <min-threads>20</min-threads>
             <min-spare-threads>20</min-spare-threads>
           </thread-group>
         </configuration>
       </component>
  
       <component name="store" 
            class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" 
             activation="true">
           <configuration>
            <repositories>
              <repository
                  class="org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository"> 
                <protocols>
                  <protocol>file</protocol>
                </protocols>
                <types>
                  <type>OBJECT</type>
                </types>
                <models>
                  <model>SYNCHRONOUS</model>
                  <model>ASYNCHRONOUS</model>
                  <model>CACHE</model>
                </models>
              </repository>
              <repository 
                class="org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository">
                <protocols>
                  <protocol>file</protocol>
                </protocols>
                <types>
                  <type>STREAM</type>
                </types>
                <models>
                  <model>SYNCHRONOUS</model>
                  <model>ASYNCHRONOUS</model>
                  <model>CACHE</model>
                </models>
              </repository>
            </repositories>
          </configuration>
       </component>
  
       <!-- The High Level Storage block -->
       <component name="mailstore" 
            class="org.apache.james.core.AvalonMailStore" 
            activation="true">
           <configuration>
             <repositories>
               <repository class="org.apache.james.mailrepository.AvalonMailRepository">
                 <protocols>
                   <protocol>file</protocol>
                 </protocols>
                 <types>
                   <type>MAIL</type>
                 </types>
               </repository>
               <repository class="org.apache.james.mailrepository.AvalonSpoolRepository">
                 <protocols>
                   <protocol>file</protocol>
                 </protocols>
                 <types>
                   <type>SPOOL</type>
                 </types>
               </repository>
  
               <!-- These repositories store the entire message in the database -->
               <repository class="org.apache.james.mailrepository.JDBCMailRepository">
                 <protocols>
                   <protocol>db</protocol>
                 </protocols>
                 <types>
                   <type>MAIL</type>
                 </types>
                 <config>
                   <sqlFile>file://conf/sqlResources.xml</sqlFile>
                 </config>
               </repository>
               <repository class="org.apache.james.mailrepository.JDBCSpoolRepository">
                 <protocols>
                   <protocol>db</protocol>
                 </protocols>
                 <types>
                    <type>SPOOL</type>
                 </types>
                 <config>
                    <sqlFile>file://conf/sqlResources.xml</sqlFile>
                 </config>
               </repository>
  
               <!-- These repositories store message delivery and headers in the DB, and 
                    the body to the filesystem -->
               <repository class="org.apache.james.mailrepository.JDBCMailRepository">
                 <protocols>
                   <protocol>dbfile</protocol>
                 </protocols>
                 <types>
                   <type>MAIL</type>
                 </types>
                 <config>
                   <sqlFile>file://conf/sqlResources.xml</sqlFile>
                   <filestore>file://var/dbmail</filestore>
                 </config>
               </repository>
               <repository class="org.apache.james.mailrepository.JDBCSpoolRepository">
                 <protocols>
                   <protocol>dbfile</protocol>
                 </protocols>
                 <types>
                   <type>SPOOL</type>
                 </types>
                 <config>
                   <sqlFile>file://conf/sqlResources.xml</sqlFile>
                   <filestore>file://var/dbmail</filestore>
                 </config>
               </repository>
             </repositories>
             <spoolRepository>
               <repository destinationURL="file://var/mail/spool/" type="SPOOL"/>
             </spoolRepository>
           </configuration>
       </component>
  
       <component name="users-store" 
             class="org.apache.james.core.AvalonUsersStore" 
             activation="true">
           <configuration>
             <repository name="LocalUsers" 
                class="org.apache.james.userrepository.UsersFileRepository">
               <destination URL="file://var/users/"/>
             </repository>
           </configuration>
       </component>
  
       <component name="connections" 
             class="org.apache.james.util.connection.SimpleConnectionManager" 
             activation="true">
           <configuration>
             <idle-timeout>300000</idle-timeout>
             <max-connections>30</max-connections>
           </configuration>
       </component>
  
       <component name="sockets"
            class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" 
            activation="true">
         <configuration>
           <server-sockets>
             <factory name="plain" 
               class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
           </server-sockets>
           <client-sockets>
             <factory name="plain" 
               class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"/>
           </client-sockets>
         </configuration>
       </component>
  
       <component  name="scheduler"
            class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler"  
            activation="true"/>
  
       <component name="datasources" 
            class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" 
            activation="true"/>
  
       <component name="spool" 
            class="org.apache.james.transport.JamesSpoolManager" 
            activation="true">
           <configuration>
             <threads> 10 </threads>
             <mailetpackages>
               <mailetpackage>org.apache.james.transport.mailets</mailetpackage>
             </mailetpackages>
             <matcherpackages>
               <matcherpackage>org.apache.james.transport.matchers</matcherpackage>
             </matcherpackages>
  
             <processor name="root">
               <mailet match="RelayLimit=30" class="Null">
                 <debug>false</debug>
               </mailet>
               <mailet match="InSpammerBlacklist=blackholes.mail-abuse.org" class="ToProcessor">
                 <processor> spam </processor>
                 <notice> Rejected - see  http://www.mail-abuse.org/rbl/ </notice>
                 <debug>false</debug>
               </mailet>
               <mailet match="InSpammerBlacklist=dialups.mail-abuse.org" class="ToProcessor">
                 <processor> spam </processor>
                 <notice> Dialup - see http://www.mail-abuse.org/dul/ </notice>
                 <debug>false</debug>
               </mailet>
               <mailet match="InSpammerBlacklist=relays.mail-abuse.org" class="ToProcessor">
                 <processor> spam </processor>
                 <notice> Open spam relay - see http://www.mail-abuse.org/rss/ </notice>
                 <debug>false</debug>
               </mailet>
               <mailet match="All" class="ToProcessor">
                 <processor> transport </processor>
                 <debug>false</debug>
               </mailet>
             </processor>
  
             <processor name="error">
               <mailet match="All" class="ToRepository">
                 <repositoryPath> file://var/mail/error/</repositoryPath>
                 <passThrough> true </passThrough>
                 <debug>false</debug>
               </mailet>
             </processor>
  
             <processor name="transport">
               <mailet match="RecipientIsLocal" class="LocalDelivery"/>
               <mailet match="HostIsLocal" class="ToProcessor">
                 <processor>error</processor>
                 <debug>false</debug>
               </mailet>
               <mailet match="RemoteAddrNotInNetwork=127.0.0.1" class="ToProcessor">
                 <processor> spam </processor>
                 <debug>false</debug>
               </mailet>
               <mailet match="All" class="RemoteDelivery">
                 <outgoing> file://var/mail/outgoing/ </outgoing>
                 <delayTime> 21600000 </delayTime>
                 <maxRetries> 5 </maxRetries>
                 <deliveryThreads> 1 </deliveryThreads>
                 <debug>false</debug>
                 <!--<gateway> otherserver.mydomain.com </gateway>-->
                 <!--<gatewayPort> 25 </gatewayPort>-->
               </mailet>
             </processor>
  
             <processor name="spam">
               <!--<mailet match="All" class="Null"/>-->
               <!--<mailet match="All" class="NotifySender"/>-->
               <!--<mailet match="All" class="NotifyPostmaster"/>-->
               <mailet match="All" class="ToRepository">
                 <repositoryPath>file://var/mail/spam/</repositoryPath>
                 <debug>false</debug>
               </mailet>
             </processor>
           </configuration>
       </component>
  
  
       <!-- NNTP Repository -->
       <component name="nntp-repository" 
             class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" 
             activation="false">
           <configuration>
             <readOnly>false</readOnly>
             <rootPath>file://var/nntp/groups</rootPath>
             <tempPath>file://var/nntp/temp</tempPath>
             <articleIDPath>file://var/nntp/articleid</articleIDPath>
             <articleIDDomainSuffix>news.james.apache.org</articleIDDomainSuffix>
  
             <!-- The news groups hosted in this NNTP repository. -->
             <newsgroups>
               <newsgroup>org.apache.james.dev</newsgroup>
               <newsgroup>org.apache.james.user</newsgroup>
               <newsgroup>org.apache.avalon.dev</newsgroup>
               <newsgroup>org.apache.avalon.user</newsgroup>
             </newsgroups>
  
             <spool>
               <configuration>
                 <spoolPath>file://var/nntp/spool</spoolPath>
                 <threadCount>1</threadCount>
                 <threadIdleTime>1000</threadIdleTime>
               </configuration>
             </spool>
           </configuration>
       </component>
  
       <component name="nntp" class="org.apache.james.nntpserver.NNTPServer"  
             activation="false">
           <configuration enabled="false">
             <port>119</port>
             <handler>
               <helloName autodetect="true"/>
               <connectiontimeout>120000</connectiontimeout>
               <authRequired>false</authRequired>
             </handler>
           </configuration>
       </component>
  
       <component name="fetchpop" class="org.apache.james.fetchpop.FetchScheduler" 
             activation="false">
          <configuration enabled="false">
            <fetch name="mydomain.com">
              <host>mail.mydomain.com</host>
              <!-- Account login username -->
              <user>username</user>
              <!-- Account login password -->
              <password>pass</password>
              <interval>600000</interval>
            </fetch>
           </configuration>
       </component>
  
     </implementation>
  
  </block>
  ]]></source>
        </subsection>
      </section>
    </body>
  
  </document>
  
  
  
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/index.xml
  
  Index: index.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>Getting Started - James</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="Examples">
        <subsection name="James Enterprise Messaging Platform">
          <p>
            An example of a production messaging platform deployed under the 
            Merlin platform.
          </p>
        </subsection>
        <subsection name="Index">
          <table>
            <tr><th>Topic</th><th>Summary</th></tr>
            <tr>
              <td><a href="about.html">About James</a></td>
              <td>
                Introduction to the Apache James Messaging Platform.
              </td>
            </tr>
            <tr>
              <td><a href="resources.html">Resources</a></td>
              <td>
                Summary of the resources need to deploy james.  Pending the 
                completion of an application packaging model, you will need to
                download and manually install a set of jar files that are need
                by the James service.  This page provides the necessary resources
                and related instructions.
              </td>
            </tr>
            <tr>
              <td><a href="block.html">Block Defintion</a></td>
              <td>
                A description of the James block and the component systems
                that are used by the James platform.
              </td>
            </tr>
            <tr>
              <td><a href="runtime.html">Execution</a></td>
              <td>
                Summary of the execution of the james application.
              </td>
            </tr>
          </table>
        </subsection>
      </section>
    </body>
  
  </document>
  
  
  
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <project>
   <title>Merlin</title>
  
   <body>
  
       <links>
         <item name="Home" href="http://avalon.apache.org/"/>
         <item name="Framework" href="http://avalon.apache.org/framework/"/>
         <item name="Components" href="http://avalon.apache.org/components"/>
         <item name="Containers" href="http://avalon.apache.org/containers/"/>
         <item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
       </links>
  
      <menu name="About Merlin">
        <item name="Overview" href="/about/index.html"/>
        <item name="Getting Started" href="/starting/index.html">
          <item name="Installation" href="/starting/installation.html"/>
          <item name="Using Merlin" href="/starting/hello/index.html"/>
          <item name="Advanced Features" href="/starting/advanced/index.html"/>
          <item name="Examples" href="/starting/examples/index.html">
            <item name="Apache Financial Services" href="/starting/examples/afs/index.html"/>
            <item name="James Enterprise Messaging" href="/starting/examples/james/index.html">
              <item name="About James" href="/starting/examples/james/about.html"/>
              <item name="Resources" href="/starting/examples/james/resources.html"/>
              <item name="Block Defintion" href="/starting/examples/james/block.html"/>
              <item name="Runtime" href="/starting/examples/james/runtime.html"/>
            </item>
          </item>
        </item>
        <item name="Merlin System" href="/merlin/index.html"/>
        <item name="Meta Model" href="/meta/index.html"/>
        <item name="Tools" href="/tools/index.html"/>
        <item name="JavaDoc" href="/api/index.html"/>
      </menu>
  
      <menu name="Extensions">
        <item name="JNDI" href="/extensions/jndi/index.html"/>
        <item name="Servlet" href="/extensions/servlet/index.html"/>
      </menu>
  
   </body>
  
  </project>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/resources.xml
  
  Index: resources.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>About James</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="James Enterprise Messaging Platform">
        <subsection name="Required Resource">
          <p>
            In preparation.
          </p>
        </subsection>
      </section>
    </body>
  
  </document>
  
  
  
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/james/runtime.xml
  
  Index: runtime.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>About James</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="James Enterprise Messaging Platform">
        <subsection name="James Runtime">
          <p>
            In preparation.
          </p>
        </subsection>
      </section>
    </body>
  
  </document>
  
  
  
  
  
  
  
  1.4       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/standard.xml
  
  Index: standard.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/standard.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- standard.xml	10 Apr 2003 19:27:11 -0000	1.3
  +++ standard.xml	2 May 2003 21:15:49 -0000	1.4
  @@ -9,7 +9,7 @@
     </header>
     <body>
       <section name="Using Merlin">
  -      <subsection name="Managing Configurations">
  +      <subsection name="Managing Context">
           <p>
           This tutorial presents information about the management
           of the runtime context supplied to your component.
  @@ -39,7 +39,7 @@
           </tr>
           <tr>
             <td>urn:avalon:work</td><td>java.io.File</td>
  -          <td>The temporary directory that will be destory at the 
  +          <td>The temporary directory that will be destoryed at the 
               end of the session.</td>
           </tr>
           <tr>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org