geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly maven.xml project.xml
Date Fri, 16 Jul 2004 06:45:48 GMT
gdamour     2004/07/15 23:45:48

  Modified:    modules/assembly maven.xml project.xml
  Log:
  Creates a new jar in order to launch the command line deployer. This jar references archives
defined in the
  cli-deployer-lib folder. This folder contains the required libraries of the command line
deployer.
  
  Revision  Changes    Path
  1.17      +23 -1     incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- maven.xml	6 Jul 2004 17:20:47 -0000	1.16
  +++ maven.xml	16 Jul 2004 06:45:48 -0000	1.17
  @@ -207,6 +207,28 @@
               <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/>
           </ant:java>
   
  +        <!-- build the cli deployer archive -->
  +        <ant:echo>Building the Command Line Deployer archive</ant:echo>
  +        <j:set var="cliLibDir" value="cli-deployer-lib"/>
  +        <j:set var="cliLib" value="${distDir}/${cliLibDir}"/>
  +        <ant:mkdir dir="${cliLib}"/>
  +        <j:forEach var="artifact" items="${pom.artifacts}">
  +            <j:set var="dependency" value="${artifact.dependency}"/>
  +            <j:if test="${dependency.getProperty('clideployer') == 'true'}">
  +                <ant:copy todir="${cliLib}" file="${artifact.path}"/>
  +                <j:set var="clideployer.classpath" value="${clideployer.classpath} ../${cliLibDir}/${artifact.name}"/>
  +            </j:if>
  +        </j:forEach>
  +        <j:set var="cliDeployer" value="${basedir}/target/geronimo-cli-deployer"/>
  +        <ant:mkdir dir="${cliDeployer}/jar/META-INF"/>
  +        <ant:manifest file="${cliDeployer}/MANIFEST.MF">
  +            <ant:attribute name="Main-Class" value="org.apache.geronimo.console.cli.Deployer"/>
  +            <ant:attribute name="Class-Path" value="${clideployer.classpath}"/>
  +        </ant:manifest>
  +        <ant:jar basedir="${cliDeployer}/jar" 
  +            destfile="${distDir}/bin/cli-deployer.jar"
  +            manifest="${cliDeployer}/MANIFEST.MF"/>
  +
       </goal>
   
   </project>
  
  
  
  1.32      +15 -1     incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- project.xml	12 Jul 2004 06:32:38 -0000	1.31
  +++ project.xml	16 Jul 2004 06:45:48 -0000	1.32
  @@ -89,6 +89,7 @@
               <artifactId>geronimo-core</artifactId>
               <version>${pom.currentVersion}</version>
               <properties>
  +                <clideployer>true</clideployer>
                   <repository>true</repository>
               </properties>
           </dependency>
  @@ -154,6 +155,7 @@
                   <server>true</server>
                   <deploy>true</deploy>
                   <repository>true</repository>
  +                <clideployer>true</clideployer>
               </properties>
           </dependency>
   
  @@ -226,6 +228,15 @@
   
           <dependency>
               <groupId>geronimo-spec</groupId>
  +            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
  +            <version>1.1-rc2</version>
  +            <properties>
  +                <clideployer>true</clideployer>
  +            </properties>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-j2eeschema</artifactId>
               <version>${pom.currentVersion}</version>
               <properties>
  @@ -312,6 +323,7 @@
                   <lib>true</lib>
                   <server>true</server>
                   <deploy>true</deploy>
  +                <clideployer>true</clideployer>
               </properties>
           </dependency>
   
  @@ -389,6 +401,7 @@
                   <lib>true</lib>
                   <server>true</server>
                   <deploy>true</deploy>
  +                <clideployer>true</clideployer>
               </properties>
           </dependency>
   
  @@ -400,6 +413,7 @@
                   <lib>true</lib>
                   <server>true</server>
                   <deploy>true</deploy>
  +                <clideployer>true</clideployer>
               </properties>
           </dependency>
   
  
  
  

Mime
View raw message