geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/etc maven.xml
Date Mon, 01 Sep 2003 16:29:47 GMT
jdillon     2003/09/01 09:29:47

  Modified:    etc      maven.xml
  Log:
   o use a tag instead of a goal for xdoclet
  
  Revision  Changes    Path
  1.13      +24 -41    incubator-geronimo/etc/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- maven.xml	1 Sep 2003 16:17:50 -0000	1.12
  +++ maven.xml	1 Sep 2003 16:29:47 -0000	1.13
  @@ -6,7 +6,8 @@
     xmlns:j="jelly:core"
     xmlns:u="jelly:util"
     xmlns:ant="jelly:ant"
  -  xmlns:maven="jelly:maven">
  +  xmlns:maven="jelly:maven"
  +  xmlns:define="jelly:define">
     
     <!-- ================= -->
     <!-- Global Properties -->
  @@ -149,8 +150,22 @@
     <!-- XDoclet Integration -->
     <!-- =================== -->
     
  -  <goal name="xdoclet:jmxdoclet">
  -    <j:jelly xmlns="jelly:ant">
  +  <define:taglib uri="common:xdoclet">
  +    
  +    <define:tag name="jmxdoclet" xmlns="jelly:ant">
  +      <j:if test="${srcdir == null}">
  +        <fail>Missing required attribute: srcdir</fail>
  +      </j:if>
  +      <j:if test="${destdir == null}">
  +        <fail>Missing required attribute: destdir</fail>
  +      </j:if>
  +      
  +      <!-- Inlcude the generated sources in the Javac compile -->
  +      <j:if test="${appendSet != null}">
  +        <path id="xdoclet.jmx.compile.src.set" location="${destdir}"/>
  +        <maven:addPath id="${appendSet}" refid="xdoclet.jmx.compile.src.set"/>
  +      </j:if>
  +      
         <echo>Generating MBean interfaces...</echo>
         
         <!-- Load the jmxdoclet task -->
  @@ -161,51 +176,19 @@
         </taskdef>
         
         <!-- Where sources will be generated -->
  -      <j:if test="${context.getVariable('maven.xdoclet.jmx.dest') == null}">
  -        <j:set var="maven.xdoclet.jmx.dest" value="${maven.build.dir}/xdoclet/jmx"/>
  -      </j:if>
  -      <mkdir dir="${maven.xdoclet.jmx.dest}"/>
  -      
  -      <!-- Where sources come from -->
  -      <j:if test="${context.getVariable('maven.xdoclet.jmx.src') == null}">
  -        <j:set var="maven.xdoclet.jmx.src" value="${basedir}/src/java"/>
  -      </j:if>
  -      
  -      <!-- Inlcude the generated sources in the Javac compile -->
  -      <path id="maven.xdoclet.jmx.compile.src.set" location="${maven.xdoclet.jmx.dest}"/>
  -      <maven:addPath id="maven.compile.src.set" refid="maven.xdoclet.jmx.compile.src.set"/>
  +      <mkdir dir="${destdir}"/>
         
         <!-- Generate MBean interfaces -->
  -      <jmxdoclet destDir="${maven.xdoclet.jmx.dest}" verbose="false">
  +      <jmxdoclet destDir="${destdir}" verbose="false">
           
  -        <fileset dir="${maven.xdoclet.jmx.src}">
  +        <fileset dir="${srcdir}">
             <include name="**/*.java"/>
           </fileset>
           
  -        <!-- Um, this is broke
  -        <j:forEach var="path" items="${pom.compileSourceRootsList}">
  -          <fileset dir="${path}">
  -            <include name="**/*.java"/>
  -            
  -            <j:forEach var="sm" items="${pom.build.sourceModifications}">
  -              <available property="classPresent" classname="${sm.className}"/>
  -              <j:if test="${classPresent != 'true'}">
  -                <j:forEach var="exclude" items="${sm.excludes}">
  -                  <exclude name="${exclude}"/>
  -                </j:forEach>
  -                <j:forEach var="include" items="${sm.includes}">
  -                  <include name="${include}"/>
  -                </j:forEach>
  -              </j:if>
  -            </j:forEach>
  -          </fileset>
  -        </j:forEach>
  -        -->
  -        
           <mbeaninterface templateFile="${project.root}/etc/xdoclet/template/jmx/mbean.xdt"/>
         </jmxdoclet>
         
  -    </j:jelly>
  -  </goal>
  +    </define:tag>
  +  </define:taglib>
     
   </project>
  
  
  

Mime
View raw message