Return-Path: 
 <geronimo-cvs-return-3094-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org
Received: (qmail 86948 invoked from network); 2 Mar 2004 22:28:37 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 2 Mar 2004 22:28:37 -0000
Received: (qmail 37923 invoked by uid 500); 2 Mar 2004 22:28:24 -0000
Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org
Received: (qmail 37769 invoked by uid 500); 2 Mar 2004 22:28:22 -0000
Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:geronimo-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:geronimo-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:geronimo-cvs@incubator.apache.org>
Reply-To: geronimo-dev@incubator.apache.org
Delivered-To: mailing list geronimo-cvs@incubator.apache.org
Received: (qmail 37756 invoked from network); 2 Mar 2004 22:28:22 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 2 Mar 2004 22:28:22 -0000
Received: (qmail 86928 invoked by uid 1711); 2 Mar 2004 22:28:34 -0000
Date: 2 Mar 2004 22:28:34 -0000
Message-ID: <20040302222834.86927.qmail@minotaur.apache.org>
From: dain@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/console-web maven.xml
 project.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

dain        2004/03/02 14:28:34

  Modified:    .        maven.xml
               applications/jmxdebug maven.xml project.xml
               etc      global.properties maven.xml
               modules/assembly maven.xml project.xml
               modules/console-web maven.xml project.xml
  Log:
  Build cleanup:
  o can now clean, clobber and rebuild on fresh (unbuilt) checkout
  o wars are now installed into the local maven repository
  o assembly depends on the jmxdebug and console-web wars
  
  Revision  Changes    Path
  1.72      +32 -6     incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- maven.xml	24 Feb 2004 15:50:00 -0000	1.71
  +++ maven.xml	2 Mar 2004 22:28:34 -0000	1.72
  @@ -69,7 +69,6 @@
       <!-- ======= -->
       <!-- Modules -->
       <!-- ======= -->
  -
       <goal name="modules:reactor:init">
           <!--
              | Determine the includes which the reactor will use.
  @@ -149,13 +148,15 @@
                  | the baseddir portion of the file's name.  So this will essentially strip off
                  | ${basedir}
                -->
  -            <j:set var="filename"
  -                value="${file.parentFile.parentFile.name}/${file.parentFile.name}/${file.name}"/>
  +            <j:set var="directory" value="${file.parentFile.parentFile.name}/${file.parentFile.name}"/>
  +            <j:set var="filename" value="${directory}/${file.name}"/>
               <j:choose>
                   <j:when test="${context.getVariable('modules.reactor.includes') == null}">
  +                    <j:set var="modules.directories" value="${directory}"/>
                       <j:set var="modules.reactor.includes" value="${filename}"/>
                   </j:when>
                   <j:otherwise>
  +                    <j:set var="modules.directories" value="${modules.directories},${directory}"/>
                       <j:set var="modules.reactor.includes" value="${modules.reactor.includes},${filename}"/>
                   </j:otherwise>
               </j:choose>
  @@ -219,11 +220,36 @@
       </goal>
   
       <goal name="modules:clean">
  -        <modules:reactor goals="clean"/>
  +        <attainGoal name="modules:reactor:init"/>
  +        <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
  +        <j:forEach var="directory" items="${directories}">
  +            <ant:echo>+----------------------------------------</ant:echo>
  +            <ant:echo>| Cleaning: ${directory} </ant:echo>
  +            <ant:echo>+----------------------------------------</ant:echo>
  +            <ant:delete dir="${directory}/target"/>
  +            <ant:delete file="${directory}/velocity.log" quiet="true" failonerror="false"/>
  +            <ant:echo></ant:echo>
  +        </j:forEach>
  +
       </goal>
   
       <goal name="modules:clobber">
  -        <modules:reactor goals="clobber"/>
  +        <attainGoal name="modules:reactor:init"/>
  +        <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
  +        <j:forEach var="directory" items="${directories}">
  +            <ant:echo>+----------------------------------------</ant:echo>
  +            <ant:echo>| Clobbering: ${directory} </ant:echo>
  +            <ant:echo>+----------------------------------------</ant:echo>
  +            <ant:delete dir="${directory}/target"/>
  +            <ant:delete quiet="false" failonerror="false">
  +                <ant:fileset dir="${directory}">
  +                    <ant:include name="maven.log"/>
  +                    <ant:include name="velocity.log*"/>
  +                    <ant:include name="junit*.properties"/>
  +                </ant:fileset>
  +            </ant:delete>
  +            <ant:echo></ant:echo>
  +        </j:forEach>
       </goal>
   
       <preGoal name="clean:clean">
  
  
  
  1.2       +2 -47     incubator-geronimo/applications/jmxdebug/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/applications/jmxdebug/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	18 Feb 2004 15:29:30 -0000	1.1
  +++ maven.xml	2 Mar 2004 22:28:34 -0000	1.2
  @@ -8,51 +8,6 @@
       xmlns:ant="jelly:ant">
   
       <goal name="default">
  -        <attainGoal name="war"/>
  -    </goal>
  -
  -    <!-- generate packages ready to be deployed, if appropriate -->
  -    <postGoal name="war">
  -        <ant:available property="geronimoServicePresent" file="${basedir}/src/etc/META-INF/geronimo-service.xml"/>
  -        <j:if test="${geronimoServicePresent == 'true'}">
  -            <ant:jar destfile="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar">
  -                <fileset dir="${basedir}/target" includes="${pom.artifactId}-${pom.currentVersion}.jar"/>
  -                <fileset dir="${basedir}/target" includes="jmx-debug.war"/>
  -
  -                <fileset dir="${basedir}/src/etc" includes="META-INF/geronimo-service.xml"/>
  -                <j:forEach var="artifact" items="${pom.artifacts}">
  -                    <j:set var="dependency" value="${artifact.dependency}"/>
  -                    <j:if test="${dependency.getProperty('package') == 'true'}">
  -                        <ant:echo>Processing dependency: ${dependency.id}</ant:echo>
  -                        <fileset file="${artifact.path}"/>
  -                    </j:if>
  -                </j:forEach>
  -            </ant:jar>
  -            <ant:property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
  -            <ant:mkdir dir="${jardir__}"/>
  -            <ant:copy
  -                file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"
  -                todir="${jardir__}"
  -                overwrite="true"
  -                />
  -        </j:if>
  -    </postGoal>
  -
  -    <!-- Remove the log files -->
  -    <goal name="clobber"
  -        description="Removes all (non-repository installed) build generated files">
  -
  -        <!-- Let clean:clean do some work first -->
  -        <attainGoal name="clean:clean"/>
  -
  -        <j:jelly xmlns="jelly:ant">
  -            <delete quiet="false" failonerror="false">
  -                <fileset dir="${basedir}">
  -                    <include name="maven.log"/>
  -                    <include name="velocity.log*"/>
  -                    <include name="junit*.properties"/>
  -                </fileset>
  -            </delete>
  -        </j:jelly>
  +        <attainGoal name="war:install"/>
       </goal>
   </project>
  
  
  
  1.3       +1 -8      incubator-geronimo/applications/jmxdebug/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/applications/jmxdebug/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	19 Feb 2004 09:00:27 -0000	1.2
  +++ project.xml	2 Mar 2004 22:28:34 -0000	1.3
  @@ -24,19 +24,12 @@
       <!-- ============ -->
   
       <dependencies>
  -
  -        <!-- Plugin Dependencies -->
  -
  -        <!-- Module Dependencies -->
  -
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-servlet</artifactId>
               <version>${pom.currentVersion}</version>
           </dependency>
   
  -
  -        <!-- Thirdparty Dependencies -->
           <dependency>
               <groupId>mx4j</groupId>
               <artifactId>mx4j-jmx</artifactId>
  
  
  
  1.8       +3 -1      incubator-geronimo/etc/global.properties
  
  Index: global.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/global.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- global.properties	18 Feb 2004 22:16:33 -0000	1.7
  +++ global.properties	2 Mar 2004 22:28:34 -0000	1.8
  @@ -16,6 +16,8 @@
   
   maven.junit.fork=true
   
  +#maven.war.final.name=${pom.artifactId}-${pom.currentVersion}.war
  +
   maven.simian.linecount=3
   
   # Force module tests to run, even if maven thinks they have passed
  
  
  
  1.30      +5 -1      incubator-geronimo/etc/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- maven.xml	18 Feb 2004 22:11:28 -0000	1.29
  +++ maven.xml	2 Mar 2004 22:28:34 -0000	1.30
  @@ -20,6 +20,10 @@
       <!-- Load the global properties -->
       <ant:property file="${project.root}/etc/global.properties"/>
   
  +    <!-- set the maven.war.final.name by hand here because the variable is not -->
  +    <!-- expanded correctly when in the global.properties file -->
  +    <j:set var="maven.war.final.name" value="${pom.artifactId}-${pom.currentVersion}.war"/>
  +
   
       <!-- ==================== -->
       <!-- Default Global Goals -->
  
  
  
  1.6       +5 -2      incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	25 Feb 2004 08:01:08 -0000	1.5
  +++ maven.xml	2 Mar 2004 22:28:34 -0000	1.6
  @@ -45,6 +45,9 @@
       <!-- Assemble server installation from generated modules  -->
       <!-- ==================================================== -->
       <goal name="assemble">
  +        <!-- delete the dist directory first, to remove any cruft -->
  +        <ant:delete dir="${distDir}"/>
  +
           <!-- Copy  the runtime dependencies into lib and create a classpath for the server.jar file -->
           <j:set var="libDir" value="${distDir}/lib"/>
           <ant:mkdir dir="${libDir}"/>
  @@ -149,7 +152,7 @@
           <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
               <ant:arg value="--install"/>
               <ant:arg value="--module"/>
  -            <ant:arg value="${project.root}/applications/jmxdebug/target/geronimo-jmxdebug.war"/>
  +            <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/>
           </ant:java>
       </goal>
   
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	24 Feb 2004 06:05:36 -0000	1.4
  +++ project.xml	2 Mar 2004 22:28:34 -0000	1.5
  @@ -55,6 +55,13 @@
   
           <dependency>
               <groupId>geronimo</groupId>
  +            <artifactId>geronimo-console-web</artifactId>
  +            <version>${pom.currentVersion}</version>
  +            <type>war</type>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>geronimo</groupId>
               <artifactId>geronimo-core</artifactId>
               <version>${pom.currentVersion}</version>
           </dependency>
  @@ -79,6 +86,13 @@
               <groupId>geronimo</groupId>
               <artifactId>geronimo-jetty</artifactId>
               <version>${pom.currentVersion}</version>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>geronimo</groupId>
  +            <artifactId>geronimo-jmxdebug</artifactId>
  +            <version>${pom.currentVersion}</version>
  +            <type>war</type>
           </dependency>
   
           <dependency>
  
  
  
  1.5       +2 -20     incubator-geronimo/modules/console-web/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/console-web/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	20 Feb 2004 23:28:41 -0000	1.4
  +++ maven.xml	2 Mar 2004 22:28:34 -0000	1.5
  @@ -8,24 +8,6 @@
       xmlns:ant="jelly:ant">
   
       <goal name="default">
  -        <attainGoal name="war"/>
  -    </goal>
  -
  -    <!-- Remove the log files -->
  -    <goal name="clobber"
  -        description="Removes all (non-repository installed) build generated files">
  -
  -        <!-- Let clean:clean do some work first -->
  -        <attainGoal name="clean:clean"/>
  -
  -        <j:jelly xmlns="jelly:ant">
  -            <delete quiet="false" failonerror="false">
  -                <fileset dir="${basedir}">
  -                    <include name="maven.log"/>
  -                    <include name="velocity.log*"/>
  -                    <include name="junit*.properties"/>
  -                </fileset>
  -            </delete>
  -        </j:jelly>
  +        <attainGoal name="war:install"/>
       </goal>
   </project>
  
  
  
  1.5       +4 -3      incubator-geronimo/modules/console-web/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/console-web/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	19 Feb 2004 09:00:27 -0000	1.4
  +++ project.xml	2 Mar 2004 22:28:34 -0000	1.5
  @@ -10,8 +10,9 @@
       <!-- Module Identification -->
       <!-- ===================== -->
   
  -    <name>Geronimo :: Web Console</name>
  -    <id>geronimo-web-console</id>
  +    <name>Geronimo :: Console Web</name>
  +    <id>geronimo-console-web</id>
  +    <type>war</type>
       <shortDescription></shortDescription>
       <description></description>
       <siteDirectory></siteDirectory>