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/06/18 13:21:33 UTC

cvs commit: avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/conf block.xml

mcconnell    2003/06/18 04:21:33

  Added:       merlin/merlin-platform/tutorials/dependencies maven.xml
                        project.xml
               merlin/merlin-platform/tutorials/dependencies/conf block.xml
  Log:
  Moved some of the tutorials from ant to maven based builds and updated docs.  Started improvements to the inital hello demo so we can move it towards a more interesting inital presentation in the tutorial structure.
  
  Revision  Changes    Path
  1.1                  avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  
    <preGoal name="java:compile">
      <attainGoal name="merlin:meta"/>
    </preGoal>
  
  </project>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <project>
  
    <groupId>merlin</groupId>
    <id>merlin-tutorial-dependencies</id>
    <name>Merlin Dependencies Tutorial</name>
    <package>tutorial</package>
  
    <currentVersion>1.0</currentVersion>
    <inceptionYear>2003</inceptionYear>
    <shortDescription>Merlin Dependencies Tutorial.</shortDescription>
  
    <dependencies>
      <dependency>
        <id>avalon-framework</id>
        <version>4.1.4</version>
      </dependency>
    </dependencies>
    
    <build>
  
      <sourceDirectory>${basedir}/src/java</sourceDirectory>
  
      <resources>
        <resource>
          <directory>${maven.conf.dir}</directory>
          <targetPath>BLOCK-INF</targetPath>
          <includes>
            <include>block.xml</include>
          </includes>
        </resource>
        <resource>
          <directory>${maven.src.dir}/java</directory>
          <includes>
            <include>**/*.x*</include>
          </includes>
        </resource>
      </resources>
  
      <jars></jars>
  
    </build>
  
  </project>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/conf/block.xml
  
  Index: block.xml
  ===================================================================
  
  <block>
  
     <info>
       <name>tutorial</name>
     </info>
  
     <implementation>
       <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
     </implementation>
  
  </block>
  
  
  

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