avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/maven-plugins/site/etc maven.css site.jsl stylesheet.css tigris.css
Date Sun, 18 Apr 2004 15:52:11 GMT
mcconnell    2004/04/18 08:52:11

  Modified:    maven-plugins index.ent maven.xml project.properties
               maven-plugins/merlin project.properties
               maven-plugins/versioning project.properties
  Added:       maven-plugins/site PLACEHOLDER.TXT
  Removed:     maven-plugins/site/etc maven.css site.jsl stylesheet.css
                        tigris.css
  Log:
  synchronize with common site resources
  
  Revision  Changes    Path
  1.2       +1 -0      avalon/maven-plugins/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/index.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.ent	17 Apr 2004 10:22:49 -0000	1.1
  +++ index.ent	18 Apr 2004 15:52:10 -0000	1.2
  @@ -20,3 +20,4 @@
   <!ENTITY % repo-entities SYSTEM "file:../versioning/avalon-repository.ent"> %repo-entities;
   <!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent"> %util-entities;
   <!ENTITY % logging-entities SYSTEM "file:../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versioning-entities SYSTEM "file:../versioning/avalon-versioning-plugin.ent">
%versioning-entities;
  
  
  
  1.3       +7 -7      avalon/maven-plugins/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	18 Apr 2004 01:12:52 -0000	1.2
  +++ maven.xml	18 Apr 2004 15:52:10 -0000	1.3
  @@ -21,7 +21,7 @@
     <postGoal name="multiproject:site-init">
       <ant:mkdir dir="${maven.build.dir}/docs/style"/>
       <ant:copy toDir="${maven.build.dir}/docs/style">
  -      <fileset dir="${basedir}/site/etc">
  +      <fileset dir="${basedir}/../buildsystem/site">
           <include name="maven.css"/>
           <include name="tigris.css"/>
         </fileset>
  @@ -30,19 +30,19 @@
   
     <preGoal name="xdoc:transform">
       <ant:mkdir dir="${maven.build.dir}/docs/style"/>
  -    <util:file var="etcDir" name="${basedir}/site/etc"/>
  -    <j:if test="${etcDir.exists()}">
  +    <util:file var="buildSystem" name="${basedir}/../buildsystem"/>
  +    <j:if test="${buildSystem.exists()}">
         <ant:copy toDir="${maven.build.dir}/docs/style">
  -        <fileset dir="${basedir}/site/etc">
  +        <fileset dir="${buildSystem}/site">
             <include name="maven.css"/>
             <include name="tigris.css"/>
           </fileset>
         </ant:copy>
       </j:if>
  -    <util:file var="etcDir" name="${basedir}/../site/etc"/>
  -    <j:if test="${etcDir.exists()}">
  +    <util:file var="buildSystem" name="${basedir}/../../buildsystem"/>
  +    <j:if test="${buildSystem.exists()}">
         <ant:copy toDir="${maven.build.dir}/docs/style">
  -        <fileset dir="${basedir}/../site/etc">
  +        <fileset dir="${buildSystem}/site">
             <include name="maven.css"/>
             <include name="tigris.css"/>
           </fileset>
  
  
  
  1.3       +2 -2      avalon/maven-plugins/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	18 Apr 2004 11:35:56 -0000	1.2
  +++ project.properties	18 Apr 2004 15:52:10 -0000	1.3
  @@ -29,9 +29,9 @@
   maven.xdoc.poweredby.image= 
   
   # Styles & License
  -maven.xdoc.jsl = ${basedir}/../buildsystem/site.jsl
  +maven.xdoc.jsl = file:///${basedir}/../buildsystem/site/site.jsl
   maven.license.licenseFile = ${basedir}/../buildsystem/LICENSE.txt
  -maven.javadoc.stylesheet = ${basedir}/../buildsystem/stylesheet.css
  +maven.javadoc.stylesheet = ${basedir}/../buildsystem/site/stylesheet.css
   
   #
   # Declaration of the remote links to assign on javadoc generation.
  
  
  
  1.4       +2 -2      avalon/maven-plugins/merlin/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/merlin/project.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.properties	18 Apr 2004 01:12:52 -0000	1.3
  +++ project.properties	18 Apr 2004 15:52:10 -0000	1.4
  @@ -21,10 +21,10 @@
   
   maven.xdoc.date=left
   maven.xdoc.version=${pom.currentVersion}
  -maven.xdoc.jsl = file:///${basedir}/../site/etc/site.jsl
  +maven.xdoc.jsl = file:///${basedir}/../../buildsystem/site/site.jsl
   maven.checkstyle.header.file=${basedir}/../../LICENSE.txt
   maven.checkstyle.format = avalon
  -maven.javadoc.stylesheet =${basedir}/../site/etc/stylesheet.css
  +maven.javadoc.stylesheet =${basedir}/../../buildsystem/site/stylesheet.css
   maven.license.licenseFile=${basedir}/../../LICENSE.txt
   maven.xdoc.poweredby.image=
   
  
  
  
  1.5       +2 -2      avalon/maven-plugins/versioning/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/versioning/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.properties	18 Apr 2004 11:35:56 -0000	1.4
  +++ project.properties	18 Apr 2004 15:52:10 -0000	1.5
  @@ -21,11 +21,11 @@
   
   maven.xdoc.date=left
   maven.xdoc.version=${pom.currentVersion}
  -maven.xdoc.jsl = file:///${basedir}/../site/etc/site.jsl
  +maven.xdoc.jsl = file:///${basedir}/../../buildsystem/site/site.jsl
   maven.xdoc.poweredby.image=
   maven.checkstyle.header.file=${basedir}/../../LICENSE.txt
   maven.checkstyle.format = avalon
  -maven.javadoc.stylesheet =${basedir}/../site/etc/stylesheet.css
  +maven.javadoc.stylesheet =${basedir}/../../buildsystem/site/stylesheet.css
   maven.license.licenseFile=${basedir}/../../LICENSE.txt
   
   maven.artifact.type=plugin
  
  
  
  1.1                  avalon/maven-plugins/site/PLACEHOLDER.TXT
  
  	<<Binary file>>
  
  

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


Mime
View raw message