geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject cvs commit: incubator-geronimo/modules/maven-xmlbeans-plugin project.xml
Date Wed, 28 Jul 2004 19:16:09 GMT
dblevins    2004/07/28 12:16:09

  Modified:    .        maven.xml project.properties
               modules/assembly maven.xml
               modules/maven-plugin project.xml
               modules/maven-xmlbeans-plugin project.xml
  Log:
  Geronimo now builds into target/${pom.groupId}-${pom.currentVersion}
  i.e. target/geronimo-1.0-M67
  
  Revision  Changes    Path
  1.78      +17 -7     incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- maven.xml	13 Jul 2004 02:25:13 -0000	1.77
  +++ maven.xml	28 Jul 2004 19:16:08 -0000	1.78
  @@ -11,19 +11,20 @@
       xmlns:modules="local:modules">
   
       <j:set var="release.id" value="${pom.standardToLegacyId(pom.id)}-${pom.currentVersion}"/>
  +    <j:set var="distDir" value="target/${pom.groupId}-${pom.currentVersion}"/>
   
       <goal name="run">
           <attainGoal name="run:server"/>
       </goal>
   
       <goal name="run:server">
  -        <j:set var="run.dir" value="target/bin"/>
  +        <j:set var="run.dir" value="${distDir}/bin"/>
           <ant:echo message="Running in ${run.dir}"/>
   
           <j:jelly xmlns="jelly:ant">
   
               <property environment="env"/>
  -            <java jar="target/bin/server.jar"
  +            <java jar="${distDir}/bin/server.jar"
                   fork="true"
                   maxmemory="256m"
                   failonerror="true"
  @@ -41,13 +42,13 @@
       </goal>
   
       <goal name="debug:server">
  -        <j:set var="run.dir" value="target/bin"/>
  +        <j:set var="run.dir" value="${distDir}/bin"/>
           <ant:echo message="Running in ${run.dir}"/>
   
           <j:jelly xmlns="jelly:ant">
   
               <property environment="env"/>
  -            <java jar="target/bin/server.jar"
  +            <java jar="${distDir}/bin/server.jar"
                   fork="true"
                   maxmemory="256m"
                   failonerror="true"
  @@ -228,6 +229,7 @@
     </goal>
   
       <goal name="modules:clean">
  +        <!-- DMB: don't know why we are cleaning this way when we could invoke clean
on the submodules -->
           <attainGoal name="modules:reactor:init"/>
           <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
           <j:forEach var="directory" items="${directories}">
  @@ -239,6 +241,10 @@
               <ant:echo></ant:echo>
           </j:forEach>
   
  +        <ant:echo>+----------------------------------------</ant:echo>
  +        <ant:echo>| Cleaning: ${distDir} </ant:echo>
  +        <ant:echo>+----------------------------------------</ant:echo>
  +        <ant:delete dir="${distDir}"/>
       </goal>
   
       <goal name="modules:clobber">
  @@ -258,6 +264,10 @@
               </ant:delete>
               <ant:echo></ant:echo>
           </j:forEach>
  +        <ant:echo>+----------------------------------------</ant:echo>
  +        <ant:echo>| Clobbering: ${distDir} </ant:echo>
  +        <ant:echo>+----------------------------------------</ant:echo>
  +        <ant:delete dir="${distDir}"/>
       </goal>
   
       <preGoal name="clean:clean">
  @@ -331,7 +341,7 @@
           <ant:echo>Aggregating module site documentation...</ant:echo>
   
           <!-- Setup the target aggregation directory -->
  -        <j:set var="aggregate.dir" value="${basedir}/target/docs"/>
  +        <j:set var="aggregate.dir" value="${basedir}/${distDir}/docs"/>
           <ant:mkdir dir="${aggregate.dir}"/>
   
           <j:forEach var="module" items="${reactorProjects}">
  @@ -365,7 +375,7 @@
   
               <mkdir dir="${geronimo.cvs.docdir}"/>
               <copy todir="${geronimo.cvs.docdir}">
  -                <fileset dir="${basedir}/target/docs"/>
  +                <fileset dir="${basedir}/${distDir}/docs"/>
               </copy>
   
           </j:jelly>
  
  
  
  1.13      +2 -1      incubator-geronimo/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/project.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.properties	27 Apr 2004 00:55:48 -0000	1.12
  +++ project.properties	28 Jul 2004 19:16:08 -0000	1.13
  @@ -6,3 +6,4 @@
   
   geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
   maven.repo.remote=http://dist.codehaus.org, http://www.ibiblio.org/maven
  +#module.excludes=axis
  
  
  
  1.22      +2 -3      incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- maven.xml	28 Jul 2004 04:39:13 -0000	1.21
  +++ maven.xml	28 Jul 2004 19:16:08 -0000	1.22
  @@ -33,9 +33,8 @@
       <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
   
       <!-- Determine what the top-level project root is -->
  -<!--    <j:set var="distDir" value="${project.root}/${pom.groupId}-${pom.currentVersion}"/>
-->
  -    <j:set var="distDir" value="${project.root}/target"/>
  -
  +    <j:set var="distDir" value="${project.root}/target/${pom.groupId}-${pom.currentVersion}"/>
  +    <!-- <j:set var="distDir" value="${project.root}/target"/> -->
       <!-- Load the global properties -->
       <ant:property file="${project.root}/etc/global.properties"/>
   
  
  
  
  1.17      +2 -1      incubator-geronimo/modules/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.xml	25 Jul 2004 08:22:06 -0000	1.16
  +++ project.xml	28 Jul 2004 19:16:08 -0000	1.17
  @@ -18,10 +18,11 @@
   
   <project>
       <pomVersion>3</pomVersion>
  +    <extend>${basedir}/../../etc/project.xml</extend>
  +    
       <groupId>geronimo</groupId>
       <id>geronimo-deployment-plugin</id>
       <name>Geronimo maven deployment plugin</name>
  -    <currentVersion>1.0-SNAPSHOT</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://www.apache.org/</url>
  
  
  
  1.10      +2 -1      incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	1 May 2004 06:40:20 -0000	1.9
  +++ project.xml	28 Jul 2004 19:16:08 -0000	1.10
  @@ -18,10 +18,11 @@
     
   <project>
       <pomVersion>3</pomVersion>
  +    <extend>${basedir}/../../etc/project.xml</extend>
  +    
       <groupId>geronimo</groupId>
       <id>geronimo-xmlbeans-plugin</id>
       <name>Geronimo maven xmlbeans plugin</name>
  -    <currentVersion>1.0-SNAPSHOT</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://www.apache.org/</url>
  
  
  

Mime
View raw message