avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/tutorials/simple-web project.xml
Date Thu, 15 Apr 2004 11:53:30 GMT
mcconnell    2004/04/15 04:53:30

  Modified:    merlin   maven.xml
               merlin/platform/tutorials README.TXT maven-template.xml
               merlin/platform/tutorials/composition/application/impl
                        project.xml
               merlin/platform/tutorials/composition/location/api
                        project.xml
               merlin/platform/tutorials/composition/location/impl
                        project.xml
               merlin/platform/tutorials/composition/publisher/api
                        project.xml
               merlin/platform/tutorials/composition/publisher/impl
                        project.xml
               merlin/platform/tutorials/configuration/block project.xml
               merlin/platform/tutorials/configuration/defaults project.xml
               merlin/platform/tutorials/configuration/injection
                        project.xml
               merlin/platform/tutorials/configuration/override project.xml
               merlin/platform/tutorials/context/avalon project.xml
               merlin/platform/tutorials/context/casting project.xml
               merlin/platform/tutorials/context/custom project.xml
               merlin/platform/tutorials/context/injection project.xml
               merlin/platform/tutorials/context/plus project.xml
               merlin/platform/tutorials/context/strategy project.xml
               merlin/platform/tutorials/dependencies/auto project.xml
               merlin/platform/tutorials/dependencies/manual project.xml
               merlin/platform/tutorials/dynamics project.xml
               merlin/platform/tutorials/hello project.xml
               merlin/platform/tutorials/jmx project.xml
               merlin/platform/tutorials/lifecycle/activation project.xml
               merlin/platform/tutorials/lifecycle/excalibur project.xml
               merlin/platform/tutorials/main project.xml
               merlin/platform/tutorials/meta project.xml
               merlin/platform/tutorials/parameterization project.xml
               merlin/platform/tutorials/profiles project.xml
               merlin/platform/tutorials/security/application/impl
                        project.xml
               merlin/platform/tutorials/security/location/api project.xml
               merlin/platform/tutorials/security/location/impl project.xml
               merlin/platform/tutorials/security/publisher/api project.xml
               merlin/platform/tutorials/security/publisher/impl
                        project.xml
               merlin/platform/tutorials/selection project.xml
               merlin/platform/tutorials/simple-web project.xml
  Added:       merlin/platform/tutorials master.xml
  Removed:     merlin/platform/tutorials project.xml
  Log:
  Switch tutorials to use master.xml instead of a root project.xml and update avalon:dist
to do a clean tutorial (ent free) creation.
  
  Revision  Changes    Path
  1.68      +3 -31     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- maven.xml	14 Apr 2004 23:52:23 -0000	1.67
  +++ maven.xml	15 Apr 2004 11:53:28 -0000	1.68
  @@ -564,7 +564,7 @@
       <ant:copy todir="${basedir}/target/tutorials">
         <fileset dir="${basedir}/platform/tutorials">
           <include name="**/README.TXT"/>
  -        <include name="project.xml"/>
  +        <include name="master.xml"/>
           <include name="**/maven.xml"/>
           <exclude name="maven.xml"/>
         </fileset>
  @@ -578,7 +578,7 @@
       <maven:reactor
         basedir="${basedir}"
         includes="platform/tutorials/**/project.xml"
  -      excludes="platform/tutorials/project.xml,**/target/**,platform/tutorials/mixed/**,platform/tutorials/jmx/**,platform/tutorials/security/**"
  +      excludes="**/target/**,**/mixed/**,**/jmx/**,**/security/**"
         goals="xgen" 
         banner="Generation:"
         ignoreFailures="false" 
  @@ -602,34 +602,6 @@
   
     </goal>
   
  -  <goal name="avalon:generate" 
  -       description="Generate a clean tutorial package." >
  -    <j:set var="xyz" value="abc"/>
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="platform/tutorials/**/project.xml"
  -      excludes="platform/tutorials/project.xml,**/target/**"
  -      banner="Transfer:"
  -      postProcessing="true" />
  -  
  -  </goal>
  -
  -  <!--
  -  ==============================================================================
  -  veriify the the tutorials are executable
  -  ==============================================================================
  -  -->
  -
  -  <goal name="merlin:demo" description="Execute the demo targets." >
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="platform/tutorials/**/project.xml"
  -      excludes="**/target/**"
  -      goals="demo"
  -      banner="Demo:"
  -      ignoreFailures="false" />
  -  </goal>
  -
     <!--
     ==============================================================================
     update the runtime installation 
  @@ -665,7 +637,7 @@
       <maven:reactor
         basedir="${basedir}"
         includes="**/project.xml"
  -      excludes="project.xml,**/target/project.xml,platform/**"
  +      excludes="project.xml,**/target/**"
         goals="clean:clean"
         banner="Cleaning subproject:"
         ignoreFailures="true"/>
  
  
  
  1.3       +5 -11     avalon/merlin/platform/tutorials/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/README.TXT,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.TXT	14 Apr 2004 23:52:23 -0000	1.2
  +++ README.TXT	15 Apr 2004 11:53:28 -0000	1.3
  @@ -27,24 +27,17 @@
    * 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 RC2 or later and a development release of Merlin 3.3):
   
  -  $ cd [a-tutorial-dir-containing-a-project.xml]
  +  $ cd [a-tutorial-dir-containing-a-project.xml-file]
     $ maven jar:install
   
  -Runtime execution can be by simulation relative to the 
  +Runtime execution can normally by simulation relative to the 
   target/classes directory, or by executing the generated jar 
  -file as shown in the following commands.
  +file as shown in the following commands (check tutorial 
  +readme.txt for additional details).
    
     $ cd [a-tutorial-containing-a-project.xml]
     $ merlin -execute target\classes
  @@ -53,6 +46,7 @@
   Alternatively, demonstrations can be built and deployed 
   via maven using the following command:
   
  +  $ cd [a-tutorial-containing-a-project.xml]
     $ maven demo
   
   Additional tutorials are in preparation. Questions and comments
  
  
  
  1.3       +13 -1     avalon/merlin/platform/tutorials/maven-template.xml
  
  Index: maven-template.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/maven-template.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven-template.xml	15 Apr 2004 00:29:32 -0000	1.2
  +++ maven-template.xml	15 Apr 2004 11:53:28 -0000	1.3
  @@ -4,13 +4,25 @@
       <attainGoal name="avalon:meta"/>
     </preGoal>
   
  -  <goal name="demo" prereqs="jar:install">
  +  <goal name="demo">
       <j:set var="demo.target" value="${maven.build.dir}/classes/BLOCK-INF/block.xml"/>
       <util:file var="target" name="${demo.target}"/>
       <j:if test="${target.exists()}">
         <attainGoal name="merlin:simulate"/>
       </j:if>
     </goal>
  +
  +  <goal name="avalon:build" 
  +       description="Build and execute." >
  +    <maven:reactor
  +      basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="project.xml"
  +      goals="jar:install" 
  +      banner="Build:"
  +      ignoreFailures="false" />
  +  </goal>
  +
   
     <goal name="avalon:demo" 
          description="Build and execute." >
  
  
  
  1.1                  avalon/merlin/platform/tutorials/master.xml
  
  Index: master.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
  
    <groupId>merlin-tutorial</groupId>
    <id>merlin-tutorials-home</id>
    <name>Merlin Tutorials</name>
    <package>tutorial</package>
  
    <inceptionYear>2003</inceptionYear>
    <repository>
      <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:avalon/merlin/platform/src/tutorials</connection>
      <url>http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/tutorials</url>
    </repository>
    <shortDescription>Merlin Tutorials</shortDescription>
    <description>
  	A set of tutorials on merlin
    </description>
    
    <build>
  
      <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
      <sourceDirectory>${basedir}/src/java</sourceDirectory>
      <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
      <integrationUnitTestSourceDirectory/>
      <aspectSourceDirectory/>
  
      <unitTest>
        <includes>
          <include>**/*TestCase*</include>
        </includes>
        <excludes>
        </excludes>
        <resources>
          <resource>
            <directory>${basedir}/src/test</directory>
            <includes> 
              <include>**/*.dtd</include>
              <include>**/*.properties</include>
              <include>**/*.x*</include>
              <include>**/*.mf</include>
              <include>**/*.jar</include>
            </includes>
          </resource>
        </resources>
      </unitTest>
      
      <resources>
        <resource>
          <directory>${basedir}/src/java</directory>
          <includes>
            <include>**/*.dtd</include>
            <include>**/*.properties</include>
            <include>**/*.x*</include>
          </includes>
        </resource>
        <resource>
          <directory>${basedir}/conf</directory>
          <targetPath>BLOCK-INF</targetPath>
          <includes>
            <include>block.xml</include>
          </includes>
        </resource>
      </resources>
      <jars></jars>
    </build>
  
  </project>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/composition/application/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/composition/application/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:41 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>application-impl</id>
     <name>Composition Application Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/composition/location/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/composition/location/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:42 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>locator-api</id>
     <name>Composition Locator API Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/composition/location/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/composition/location/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:42 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>locator-impl</id>
     <name>Composition Locator Impl Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/composition/publisher/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/composition/publisher/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:42 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>publisher-api</id>
     <name>Composition Publisher API Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/composition/publisher/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/composition/publisher/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:43 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>publisher-impl</id>
     <name>Composition Publisher Impl Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/configuration/block/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/configuration/block/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:48 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
     <id>merlin-block-configuration</id>
     <name>Block Configuration Tutorial</name>
   
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/configuration/defaults/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/configuration/defaults/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:48 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:28 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
     <id>merlin-defaults-configuration</id>
     <name>Defaults Configuration Tutorial</name>
   
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/configuration/injection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/configuration/injection/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	11 Mar 2004 13:21:17 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
     <id>merlin-injected-configuration</id>
     <name>Injected Configuration Tutorial</name>
   
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/configuration/override/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/configuration/override/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:49 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
     <id>merlin-override-configuration</id>
     <name>Override Configuration Tutorial</name>
   
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/context/avalon/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/avalon/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:49 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-standard</id>
     <name>Merlin Context Standard Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/context/casting/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/casting/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:50 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-casting</id>
     <name>Merlin Context Casting Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/context/custom/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/custom/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:56 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-constructed</id>
     <name>Merlin Context Constuctor Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/context/injection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/injection/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	11 Mar 2004 12:59:30 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-standard</id>
     <name>Merlin Context Standard Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/context/plus/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/plus/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	2 Apr 2004 08:08:48 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-plus</id>
     <name>Merlin Context Standard Tutorial</name>
  
  
  
  1.10      +1 -1      avalon/merlin/platform/tutorials/context/strategy/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/strategy/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	5 Apr 2004 15:00:05 -0000	1.9
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.10
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-context-strategy</id>
     <name>Merlin Context Strategy Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/dependencies/auto/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/dependencies/auto/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:33:59 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-auto-dependencies</id>
     <name>Merlin Automated Assembly Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/dependencies/manual/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/dependencies/manual/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:34:00 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-manual-dependencies</id>
     <name>Merlin Explicit Dependencies Tutorial</name>
  
  
  
  1.6       +1 -1      avalon/merlin/platform/tutorials/dynamics/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/dynamics/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	14 Apr 2004 22:18:55 -0000	1.5
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.6
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
   
     <id>merlin-tutorial-dynamics</id>
     <name>Merlin Dynamics Tutorial</name>
  
  
  
  1.16      +1 -1      avalon/merlin/platform/tutorials/hello/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml	5 Apr 2004 15:00:05 -0000	1.15
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.16
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
     <groupId>merlin/tutorial</groupId>
     <id>hello</id>
     <name>Merlin Hello Tutorials</name>
  
  
  
  1.4       +1 -1      avalon/merlin/platform/tutorials/jmx/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/jmx/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	5 Apr 2004 15:00:05 -0000	1.3
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.4
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
     <groupId>merlin/tutorial</groupId>
     <id>jmx-hello</id>
     <name>Merlin Hello Tutorials</name>
  
  
  
  1.11      +1 -1      avalon/merlin/platform/tutorials/lifecycle/activation/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/lifecycle/activation/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml	14 Apr 2004 22:18:56 -0000	1.10
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.11
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-lifecycle-excalibur</id>
     <name>Merlin Lifecycle Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/lifecycle/excalibur/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/lifecycle/excalibur/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	14 Apr 2004 22:18:56 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../../master.xml</extend>
   
     <id>merlin-tutorial-lifecycle-excalibur</id>
     <name>Merlin Excalibur Lifecycle Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/main/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/main/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	14 Apr 2004 22:18:56 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
     <groupId>merlin/main</groupId>
     <id>merlin-main</id>
     <name>Merlin Embedding Tutorials</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/meta/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 09:34:04 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
   
     <id>plugin-test</id>
     <name>Merlin Plugin Test</name>
  
  
  
  1.10      +1 -1      avalon/merlin/platform/tutorials/parameterization/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	5 Apr 2004 15:00:05 -0000	1.9
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.10
  @@ -5,7 +5,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
     <groupId>merlin/tutorial</groupId>
     <id>parameters</id>
     <name>Merlin Parameterization Tutorial</name>
  
  
  
  1.4       +1 -1      avalon/merlin/platform/tutorials/profiles/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/profiles/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	8 Apr 2004 08:28:51 -0000	1.3
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
   
     <id>merlin-tutorial-profile</id>
     <name>Merlin Profiles Tutorial</name>
  
  
  
  1.4       +1 -1      avalon/merlin/platform/tutorials/security/application/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/security/application/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	7 Mar 2004 03:02:42 -0000	1.3
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-application-impl</id>
     <name>Composition Application Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/security/location/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/security/location/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	1 Mar 2004 23:53:04 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-locator-api</id>
     <name>Composition Locator API Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/security/location/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/security/location/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	1 Mar 2004 23:53:05 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-locator-impl</id>
     <name>Composition Locator Impl Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/security/publisher/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/security/publisher/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	1 Mar 2004 23:53:05 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-publisher-api</id>
     <name>Composition Publisher API Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/security/publisher/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/security/publisher/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	1 Mar 2004 23:53:05 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-publisher-impl</id>
     <name>Composition Publisher Impl Tutorial</name>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/selection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/selection/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Oct 2003 09:52:24 -0000	1.1
  +++ project.xml	15 Apr 2004 11:53:29 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../master.xml</extend>
   
     <id>merlin-tutorial-selection</id>
     <name>Merlin Profiles Selection Tutorial</name>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/simple-web/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/simple-web/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	5 Apr 2004 15:39:17 -0000	1.2
  +++ project.xml	15 Apr 2004 11:53:30 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -    <extend>${basedir}/../project.xml</extend>
  +    <extend>${basedir}/../master.xml</extend>
       <groupId>merlin-tutorial</groupId>
       <id>simple-web-server</id>
       
  
  
  

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


Mime
View raw message