avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-platform/src/config kernel.xml
Date Fri, 27 Jun 2003 23:10:00 GMT
mcconnell    2003/06/27 16:10:00

  Modified:    merlin/merlin-platform/examples/james README.TXT
               merlin/merlin-platform/examples/james/conf block.xml
                        james.xml kernel.xml
               merlin/merlin-platform/src/config kernel.xml
  Log:
  Example updates.
  
  Revision  Changes    Path
  1.4       +19 -39    avalon-sandbox/merlin/merlin-platform/examples/james/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/README.TXT,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README.TXT	24 Jun 2003 13:36:10 -0000	1.3
  +++ README.TXT	27 Jun 2003 23:10:00 -0000	1.4
  @@ -13,54 +13,34 @@
   
   1. download mail_1_3.jar from sun
   2. download activation.jar from sun
  -3. rename mail_1_3.jar to mail-1.3.jar
  -4. rename activation.jar to activation-1.0.jar
   5. create the directory [MAVEN-HOME]/repository/james/jars/
   6. place the above jar files in [MERLIN-HOME]/repository/james/jars/
   
  -Populate the Maven repository:
  -------------------------------
  +Build the cornerstone components
  +--------------------------------
   
  -Invoke the default maven target which will result in maven pulling down
  -the additional jar dependencies and installing them into your local 
  -maven repository. This is simply an easy way to get the jar files you 
  -need.
  -
  -$ cd merlin/merlin-platform/examples/james
  -$ maven
  -
  -Update Merlin to use Maven's repository:
  -----------------------------------------
  -
  -Update the conf/kernel.xml file to use the Maven repository by adding 
  -the following configuration fragement inside conf/kernel.xml. This 
  -is basically telling Merlin to use Maven's repository to locate the 
  -jar files needed to execute the james block.
  +1. Checkout avalon-components from CVS
  +2. build using $ maven
   
  -  <kernel>
  -
  -   <!-- ... -->
  -
  -   <repository>
  -     <!-- 
  -     replace >[MAVEN-REPOSITORY-PATH] with you maven repository 
  -     directory (e.g. C:/tools/maven/repository/) and remove the 
  -     comments around the root element declaration
  -     -->
  -     <!--
  -     <root>[MAVEN-REPOSITORY-PATH]</root>
  -     -->
  -   </repository>
  -
  -  </kernel>
  +Build the james components
  +--------------------------
   
  -Note: the above reposity switching can be bypassed if you make sure 
  -the necessary jar files are included in the [MERLIN-HOME]/repository.
  -Keep in mind that the repository directives are very likely to 
  -change in the near future.
  +1. Checkout jakarta-james from CVS
  +2. build using $ ant jars
   
   Run James
   ---------
  +
  +Update the supplied conf/kernel.xml to reference your maven repository.
  +
  +  <kernel>
  +    <repository>
  +      <cache>F:/sys/maven/repository</cache> <------ update this
  +      <host>
  +        <host>http://www.ibiblio.org/maven/</host> 
  +      </hosts>
  +    </repository>
  +  </kernel>
   
    $ cd merlin\merlin-platform\examples\james
    $ merlin conf\block.xml -kernel conf\kernel.xml
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-platform/examples/james/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	23 Jun 2003 14:06:09 -0000	1.2
  +++ block.xml	27 Jun 2003 23:10:00 -0000	1.3
  @@ -8,8 +8,8 @@
       <classloader>
         <classpath>
           <repository>
  -          <resource id="james:activation" version="1.0"/>
  -          <resource id="james:mail" version="1.3"/>
  +          <resource id="james:activation"/>
  +          <resource id="james:mail_1_3"/>
             <resource id="james:mailet-api" version="1.0"/>
           </repository>
         </classpath>
  
  
  
  1.4       +5 -6      avalon-sandbox/merlin/merlin-platform/examples/james/conf/james.xml
  
  Index: james.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/conf/james.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- james.xml	24 Jun 2003 07:31:04 -0000	1.3
  +++ james.xml	27 Jun 2003 23:10:00 -0000	1.4
  @@ -7,14 +7,13 @@
   
      <!--
      Service provided by this block.
  -   Please notw that in order to use these services, you must ensure that
  +   Please note 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 type="org.apache.mailet.MailetContext:1.0">
  -       <source>/james</source>
  +     <service type="org.apache.mailet.MailetContext">
  +       <source>james</source>
        </service>
      </services>
   
  @@ -43,9 +42,9 @@
              <resource id="excalibur:excalibur-collections" version="1.0"/>
              <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
              <resource id="excalibur-pool:excalibur-pool" version="1.2"/>
  -           <!-- <resource id="james:mail" version="1.3"/> -->
  +           <!-- <resource id="james:mail_1_3"/> -->
              <!-- <resource id="james:mailet-api" version="1.0"/> -->
  -           <!-- <resource id="james:activation" version="1.0"/> -->
  +           <!-- <resource id="james:activation"/> -->
              <resource id="dnsjava:dnsjava" version="1.3.2"/>
              <resource id="james:mailet" version="1.0"/>
              <resource id="james:james" version="3.0a1"/>
  
  
  
  1.2       +4 -1      avalon-sandbox/merlin/merlin-platform/examples/james/conf/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/conf/kernel.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- kernel.xml	24 Jun 2003 07:31:50 -0000	1.1
  +++ kernel.xml	27 Jun 2003 23:10:00 -0000	1.2
  @@ -22,7 +22,10 @@
      </pool>
   
      <repository>
  -     <root>F:/system/maven/repository/</root>
  +     <cache>F:/system/maven/repository</cache>
  +     <hosts>
  +       <host>http://www.ibiblio.org/maven/</host>
  +     </hosts>
      </repository>
   
   </kernel>
  
  
  
  1.4       +46 -0     avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- kernel.xml	22 Jun 2003 13:57:56 -0000	1.3
  +++ kernel.xml	27 Jun 2003 23:10:00 -0000	1.4
  @@ -47,4 +47,50 @@
        <timeout>250</timeout>
      </pool>
   
  +   <!-- declaration of the local repository -->
  +
  +   <repository>
  +
  +     <!-- 
  +     The default local cache is the [MERLIN-HOME]/repository.
  +     If you want to override this then uncomment and cache 
  +     entry and include the absolute path of the alternative
  +     repository directory.
  +     -->
  +     <!-- <cache>C:/my/repository</cache> -->
  +
  +     <!--
  +     If an resource cannot be located in the local repository cache,
  +     Merlin will attempt to locate the resource in one or more remote
  +     repositories.  If you have a proxy server you will need to declare
  +     it under the propxy element.  If you declare a proxy, the host and 
  +     port elements must be declared.  You can also declare a 'credentials'
  +     element if your proxy requires password authentication.
  +     -->
  +
  +     <!--
  +     <proxy>
  +       <host>proxy.somewhere.com</host>
  +       <port>proxy.somewhere.com</port>
  +       <credentials>
  +         <username>test</username>
  +         <password>test</password>
  +       </credentials>
  +     </proxy>
  +     -->
  +
  +     <!--
  +     Merlin will attempt to locate resource from the local cache.  If a 
  +     resource is unavailable, Merlin willl attempt to download the 
  +     resource from one or more remote hosts.  The hosts element contains
  +     the list of hosts that Merlin should attempt to connect to when 
  +     resolving unsatisfied resource requests.
  +     -->
  +
  +     <hosts>
  +       <host>http://www.ibiblio.org/maven/</host>
  +     </hosts>
  +
  +   </repository>
  +
   </kernel>
  
  
  

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


Mime
View raw message