Return-Path: 
 <cvs-return-23120-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 70455 invoked from network); 14 Apr 2004 23:52:25 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 14 Apr 2004 23:52:25 -0000
Received: (qmail 36340 invoked by uid 500); 14 Apr 2004 23:52:09 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 36291 invoked by uid 500); 14 Apr 2004 23:52:09 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 36277 invoked from network); 14 Apr 2004 23:52:08 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 14 Apr 2004 23:52:08 -0000
Received: (qmail 70395 invoked by uid 1438); 14 Apr 2004 23:52:23 -0000
Date: 14 Apr 2004 23:52:23 -0000
Message-ID: <20040414235223.70390.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit: avalon/merlin/platform/tutorials/simple-web/conf
 block.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

mcconnell    2004/04/14 16:52:23

  Modified:    merlin   maven.xml
               merlin/platform/tutorials README.TXT maven.xml
               merlin/platform/tutorials/simple-web/conf block.xml
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.67      +4 -2      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- maven.xml	14 Apr 2004 22:18:55 -0000	1.66
  +++ maven.xml	14 Apr 2004 23:52:23 -0000	1.67
  @@ -565,14 +565,16 @@
         <fileset dir="${basedir}/platform/tutorials">
           <include name="**/README.TXT"/>
           <include name="project.xml"/>
  -        <include name="maven.xml"/>
  +        <include name="**/maven.xml"/>
  +        <exclude name="maven.xml"/>
         </fileset>
       </ant:copy>
  +    <ant:copy toFile="${basedir}/target/tutorials/maven.xml"
  +       file="${basedir}/platform/tutorials/maven-template.xml"/>
     </goal>
   
     <goal name="avalon:validate" 
          description="Generate a clean tutorial package." >
  -    <j:set var="xyz" value="abc"/>
       <maven:reactor
         basedir="${basedir}"
         includes="platform/tutorials/**/project.xml"
  
  
  
  1.2       +12 -10    avalon/merlin/platform/tutorials/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/README.TXT,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.TXT	24 Sep 2003 09:33:40 -0000	1.1
  +++ README.TXT	14 Apr 2004 23:52:23 -0000	1.2
  @@ -27,26 +27,28 @@
    * composition   - creation of virtual components by 
                      composition
   
  +A complete build is provideed under the convinience goal:
  +
  +  $ maven avalon:build
  +
  +A build a runtime execution is achived by:
  +
  +  $ maven avalon:demo
   
   Unless noted in a project readme, demonstrations can be built
   using the following command (assuming you have installed 
  -Maven 10 and Merlin 3.0):
  +Maven RC2 or later and a development release of Merlin 3.3):
   
  -  $ maven
  +  $ cd [a-tutorial-dir-containing-a-project.xml]
  +  $ maven jar:install
   
   Runtime execution can be by simulation relative to the 
   target/classes directory, or by executing the generated jar 
  -file as shown in the following two command variants.
  -
  -Windows:
  +file as shown in the following commands.
    
  +  $ cd [a-tutorial-containing-a-project.xml]
     $ merlin -execute target\classes
     $ merlin -execute target\<jar-name>.jar
  -
  -Unix/Linux:
  -
  -  $ merlin.sh -execute target\classes
  -  $ merlin.sh -execute target\<jar-name>.jar
   
   Alternatively, demonstrations can be built and deployed 
   via maven using the following command:
  
  
  
  1.3       +13 -3     avalon/merlin/platform/tutorials/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	14 Apr 2004 22:18:56 -0000	1.2
  +++ maven.xml	14 Apr 2004 23:52:23 -0000	1.3
  @@ -12,7 +12,18 @@
       </j:if>
     </goal>
   
  -  <!-- utility goal used by the merlin distribution stuff -->
  +  <goal name="avalon:demo" 
  +       description="Build and execute." >
  +    <maven:reactor
  +      basedir="${basedir}"
  +      includes="platform/tutorials/**/project.xml"
  +      excludes="platform/tutorials/project.xml,**/target/**,platform/tutorials/mixed/**,platform/tutorials/jmx/**,platform/tutorials/security/**"
  +      goals="demo" 
  +      banner="Build and execute:"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
  +
     <goal name="xgen" prereqs="jar:install">
       <ant:mkdir dir="${maven.build.dir}/package"/>
       <ant:copy toDir="${maven.build.dir}/package">
  @@ -29,12 +40,11 @@
         <ant:delete file="${maven.build.dir}/package/project.xml"/>
         <ant:xslt in="${pom.file}" 
             out="${maven.build.dir}/package/project.xml"
  -          style="${xslFile}">
  +         style="${xslFile}">
           <outputproperty name="method" value="xml" />
           <outputproperty name="standalone" value="yes"/>
           <outputproperty name="indent" value="yes"/>
         </ant:xslt>
       </j:if>
     </goal>
  -
   </project>
  
  
  
  1.2       +73 -75    avalon/merlin/platform/tutorials/simple-web/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/simple-web/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	19 Jan 2004 06:59:56 -0000	1.1
  +++ block.xml	14 Apr 2004 23:52:23 -0000	1.2
  @@ -1,79 +1,77 @@
   <container name="my-web-server">
   
  -	<categories priority="INFO">
  -		<category name="classloader/scanner" priority="ERROR"/>
  -		<category name="simple-web-server" priority="DEBUG"/>
  -    </categories>
  -
  -    <classloader>
  -        <classpath>
  -            <repository>
  -                <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -                <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  -				<resource id="commons-collections:commons-collections" version="2.1"/>
  -				<resource id="excalibur-pool:excalibur-pool" version="1.2"/>
  -				<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
  -				<resource id="excalibur-event:excalibur-event" version="1.0.3"/>
  -                <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  -                <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.0"/>
  -                <resource id="cornerstone-connection:cornerstone-connection-api" version="1.0"/>
  -                <resource id="cornerstone-connection:cornerstone-connection-impl" version="1.0"/>
  -                <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
  -                <resource id="cornerstone-threads:cornerstone-threads-impl" version="1.0"/>
  -            </repository>
  -        </classpath>
  -    </classloader>
  -
  -	<component name="thread-manager"
  -			   class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
  -			   activation="startup">
  -    	<configuration>
  -	    	<thread-group>
  -	        	<name>default</name>
  -	        	<priority>5</priority>
  -	        	<is-daemon>false</is-daemon>
  -	        	<max-threads>40</max-threads>
  -	        	<min-threads>20</min-threads>
  -	        	<min-spare-threads>20</min-spare-threads>
  -	      	</thread-group>
  -      	</configuration>
  -	</component>
  -
  -	<component name="connection-manager"
  -			   class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
  -			   activation="startup">
  -
  -	</component>
  -
  -        <component name="connection-handler-factory"
  -                           class="tutorial.SimpleConnectionHandlerFactory"
  -                           activation="startup">
  -
  -	</component>
  -
  -	<component name="socket-manager"
  -			   class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
  -			   activation="startup">
  -		<configuration>
  -			<server-sockets>
  -        		<factory name="plain" class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
  -			</server-sockets>
  -
  -			<client-sockets>
  -			</client-sockets>
  -		</configuration>
  -	</component>
  -
  -	<component name="simple-web-server"
  -			   class="tutorial.SimpleWebServerComponent"
  -			   activation="startup">
  -		<configuration>
  -			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  -			<!-- Add and configure a HTTP listener on the given port             -->
  -			<!-- The default port = 80                                           -->
  -			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  -			<http-listener port="9080"/>
  -		</configuration>
  -	</component>
  +  <categories priority="INFO">
  +
  +    <category name="classloader/scanner" priority="ERROR"/>
  +    <category name="simple-web-server" priority="DEBUG"/>
  +  </categories>
  +
  +  <classloader>
  +    <classpath>
  +      <repository>
  +        <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +        <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +        <resource id="commons-collections:commons-collections" version="2.1"/>
  +        <resource id="excalibur-pool:excalibur-pool-api" version="2.0"/>
  +        <resource id="excalibur-pool:excalibur-pool-impl" version="2.0"/>
  +        <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  +        <resource id="excalibur-thread:excalibur-thread-impl" version="2.0"/>
  +        <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  +        <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="SNAPSHOT"/>
  +        <resource id="cornerstone-connection:cornerstone-connection-api" version="1.0"/>
  +        <resource id="cornerstone-connection:cornerstone-connection-impl" version="SNAPSHOT"/>
  +        <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
  +        <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
  +      </repository>
  +    </classpath>
  +  </classloader>
  +
  +  <component name="thread-manager"
  +         class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
  +         activation="startup">
  +    <configuration>
  +      <thread-group>
  +        <name>default</name>
  +        <priority>5</priority>
  +        <is-daemon>false</is-daemon>
  +        <max-threads>40</max-threads>
  +        <min-threads>20</min-threads>
  +        <min-spare-threads>20</min-spare-threads>
  +      </thread-group>
  +    </configuration>
  +  </component>
  +
  +  <component name="connection-manager"
  +      class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
  +      activation="startup"/>
  +
  +  <component name="connection-handler-factory"
  +      class="tutorial.SimpleConnectionHandlerFactory"
  +      activation="startup"/>
  +
  +  <component name="socket-manager"
  +      class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
  +      activation="startup">
  +    <configuration>
  +      <server-sockets>
  +        <factory name="plain" 
  +          class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
  +      </server-sockets>
  +      <client-sockets>
  +      </client-sockets>
  +    </configuration>
  +  </component>
  +
  +  <component name="simple-web-server"
  +      class="tutorial.SimpleWebServerComponent"
  +      activation="startup">
  +    <configuration>
  +      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  +      <!-- Add and configure a HTTP listener on the given port             -->
  +      <!-- The default port = 80                                           -->
  +      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  +      <http-listener port="9080"/>
  +    </configuration>
  +  </component>
   
   </container>
  
  
  

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