avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-components/cornerstone/scheduler/impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler DefaultTimeScheduler.java
Date Thu, 01 Apr 2004 01:05:07 GMT
mcconnell    2004/03/31 17:05:07

  Modified:    cornerstone .cvsignore maven.xml project.properties
               cornerstone/scheduler/impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler
                        DefaultTimeScheduler.java
  Log:
  Clean up javadocs (no errors on generation), add corrections to md5 generation, package
jars in repo format, and sign jars and distribution artifacts.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-components/cornerstone/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	28 Mar 2004 09:11:05 -0000	1.1
  +++ .cvsignore	1 Apr 2004 01:05:07 -0000	1.2
  @@ -10,5 +10,5 @@
   velocity.log
   target
   build
  -
  +build.properties
   
  
  
  
  1.4       +37 -24    avalon-components/cornerstone/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	31 Mar 2004 16:55:06 -0000	1.3
  +++ maven.xml	1 Apr 2004 01:05:07 -0000	1.4
  @@ -44,28 +44,27 @@
     -->
   
     <goal name="avalon:build" description="Build the Logging system.">
  -
       <maven:reactor basedir="${basedir}"
         includes="*/*/project.xml"
         excludes="project.xml,**/target/**/project.xml"
  -      goals="jar:install"
         banner="Building:"
  +      goals="jar:install"
         ignoreFailures="false"
         postProcessing="true" />
  -
  -    <ant:copy todir="${maven.build.dir}/jars">
  -      <j:forEach var="child" items="${reactorProjects}">
  -        <ant:fileset dir="${child.file.parentFile}/target">
  -          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
  -          <ant:include name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
  -        </ant:fileset>
  -      </j:forEach>
  -    </ant:copy>
       <j:forEach var="child" items="${reactorProjects}">
         <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
  -      <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
  +      <ant:mkdir dir="${maven.build.dir}/jars/${child.groupId}"/>
  +      <ant:copy todir="${maven.build.dir}/jars/${child.groupId}">
  +        <ant:fileset dir="${child.file.parentFile}/target">
  +          <ant:include name="${path}.jar"/>
  +          <ant:include name="${path}.jar.meta"/>
  +        </ant:fileset>
  +      </ant:copy>
  +      <util:file var="jarFile" name="${maven.build.dir}/jars/${child.groupId}/${path}.jar"/>
         <j:if test="${jarFile.exists()}">
           <checksum file="${jarFile}"/>
  +        <move file="${jarFile}.md5" toFile="temp"/>
  +        <move file="temp" toFile="${jarFile}.md5"/>
           <j:if test="${maven_gpg_exe != null}">
             <ant:exec executable="${maven_gpg_exe}">
               <ant:arg value="-a"/>
  @@ -75,18 +74,6 @@
             </ant:exec>
           </j:if>
         </j:if>
  -      <util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
  -      <j:if test="${metaFile.exists()}">
  -        <checksum file="${metaFile}"/>
  -        <j:if test="${maven_gpg_exe != null}">
  -          <ant:exec executable="${maven_gpg_exe}">
  -            <ant:arg value="-a"/>
  -            <ant:arg value="--yes"/>
  -            <ant:arg value="-b"/>
  -            <ant:arg value="${metaFile}"/>
  -          </ant:exec>
  -        </j:if>
  -      </j:if>
       </j:forEach>
     </goal>
   
  @@ -182,6 +169,9 @@
       />
       <ant:delete file="${maven.dist.dir}/${binary.name}.tar"/>
       <checksum file="${maven.dist.dir}/${binary.name}.tar.gz"/>
  +    <move file="${maven.dist.dir}/${binary.name}.tar.gz.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${binary.name}.tar.gz.md5"/>
  +
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -195,6 +185,9 @@
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${binary.name}.zip"/>
  +    <move file="${maven.dist.dir}/${binary.name}.zip.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${binary.name}.zip.md5"/>
  +
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -219,6 +212,8 @@
       />
       <ant:delete file="${maven.dist.dir}/${source.name}.tar"/>
       <checksum file="${maven.dist.dir}/${source.name}.tar.gz"/>
  +    <move file="${maven.dist.dir}/${source.name}.tar.gz.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${source.name}.tar.gz.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -232,6 +227,8 @@
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${source.name}.zip"/>
  +    <move file="${maven.dist.dir}/${source.name}.zip.md5" toFile="temp"/>
  +    <move file="temp" toFile="${maven.dist.dir}/${source.name}.zip.md5"/>
       <j:if test="${maven_gpg_exe != null}">
         <ant:exec executable="${maven_gpg_exe}">
           <ant:arg value="-a"/>
  @@ -363,6 +360,22 @@
   
   	  <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
   	  <link href="http://avalon.apache.org/framework/api/" />
  +
  +        <util:tokenize 
  +          var="listOfTags" 
  +          delim=" ">${maven.javadoc.customtags}</util:tokenize>
  +        <j:forEach var="someTag" items="${listOfTags}">
  +          <j:set var="nameVar" value="${someTag}.name"/>
  +          <j:set var="name" value="${context.findVariable(nameVar)}"/>
  +          <j:set var="descriptionVar" value="${someTag}.description"/>
  +          <j:set var="description" value="${context.findVariable(descriptionVar)}"/>
  +          <j:set var="enabledVar" value="${someTag}.enabled"/>
  +          <j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
  +          <j:set var="scopeVar" value="${someTag}.scope"/>
  +          <j:set var="scope" value="${context.findVariable(scopeVar)}"/>
  +          <ant:tag name="${name}" description="${description}"
  +               enabled="${enabled}" scope="${scope}"/>
  +        </j:forEach>
   
       </ant:javadoc>
     </goal>
  
  
  
  1.5       +30 -0     avalon-components/cornerstone/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.properties	31 Mar 2004 16:22:10 -0000	1.4
  +++ project.properties	1 Apr 2004 01:05:07 -0000	1.5
  @@ -18,6 +18,36 @@
   pom.specificationVersion = 1.0
   
   #
  +# custom tags spec
  +#
  +maven.javadoc.customtags = component service entry dependency configuration
  +
  +component.name = avalon.component
  +component.description = Component:
  +component.enabled = true
  +component.scope = class
  +
  +service.name = avalon.service
  +service.description = Service Export:
  +service.enabled = true
  +service.scope = class
  +
  +entry.name = avalon.entry
  +entry.description = Context Entry:
  +entry.enabled = true
  +entry.scope = method
  +
  +dependency.name = avalon.dependency
  +dependency.description = Service Dependency:
  +dependency.enabled = true
  +dependency.scope = method
  +
  +configuration.name = avalon.configuration
  +configuration.description = Configuration Schema:
  +configuration.enabled = true
  +configuration.scope = method
  +
  +#
   # Declaration of the remote links to assign on javadoc generation.
   # Link declarations can be overriden in the user's build.properties
   # file.
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/scheduler/impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
  
  Index: DefaultTimeScheduler.java
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/scheduler/impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultTimeScheduler.java	16 Mar 2004 12:49:52 -0000	1.1
  +++ DefaultTimeScheduler.java	1 Apr 2004 01:05:07 -0000	1.2
  @@ -310,7 +310,7 @@
   
       /**
        * Return a collection of the triggerable names.
  -     * @return
  +     * @return the collection
        */
       public synchronized Collection getEntries()
       {
  
  
  

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


Mime
View raw message