You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/06/22 17:31:29 UTC

cvs commit: jakarta-avalon-excalibur/i18n/src/xdocs/images build.gif code.gif design.gif update.gif

donaldp     2002/06/22 08:31:29

  Modified:    i18n     README.txt build.xml default.properties
               i18n/src/xdocs index.xml
  Removed:     i18n     BUILDING.txt
               i18n/src/xdocs book.xml il8n.uris
               i18n/src/xdocs/dtd changes-v10.dtd document-v10.dtd
                        faq-v10.dtd specification-v10.dtd todo-v10.dtd
               i18n/src/xdocs/images build.gif code.gif design.gif
                        update.gif
  Log:
  Update package for release, includes;
  * Moving to anakia
  * adding src zip to archive
  * general cleanup
  
  Revision  Changes    Path
  1.2       +0 -15     jakarta-avalon-excalibur/i18n/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.txt	19 Mar 2002 21:33:42 -0000	1.1
  +++ README.txt	22 Jun 2002 15:31:29 -0000	1.2
  @@ -1,20 +1,5 @@
                     Avalons Excalibur i18n
                     ----------------------
   
  -WARNING: Under Development--the API may change
  -
   The i18n component is a set of classes that allow you to
   manage internationalization in your projects.
  -
  -Getting Started:
  -----------------
  -
  -If you downloaded a source release of the component then you 
  -will need to build the component. Directions for building the 
  -component are located in BUILDING.txt
  -
  -If you downloaded a binary release, or a release with both binary 
  -and source then it is recomended you look over the documentation
  -in docs/index.html - and then look into the examples/ directory
  -for examples of the component in action.
  -
  
  
  
  1.44      +56 -87    jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- build.xml	22 Jun 2002 14:39:06 -0000	1.43
  +++ build.xml	22 Jun 2002 15:31:29 -0000	1.44
  @@ -21,6 +21,7 @@
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
  +        <fileset dir="${jakarta-site.dir}/lib"/>
       </path>
   
       <path id="test.class.path">
  @@ -259,7 +260,7 @@
   
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="dist-jar, test-reports, checkstyle-report, javadocs"
  +        depends="dist-jar, test-reports, checkstyle-report, javadocs, docs"
           description="Generates a distribution (jar + javadocs + unit tests + checkstyle reports)">
   
   
  @@ -267,16 +268,20 @@
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
  +        <zip zipfile="${dist.dir}/src.zip" compress="false">
  +            <zipfileset dir="src/java"/>
  +        </zip>
  +
           <mkdir dir="${dist.base}"/>
   
  -        <zip zipfile="${dist.base}/${dist.name}-bin.zip" compress="true">
  +        <zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
           </zip>
   
           <!--
             Not supported by released ant but when it is we should enable this across
             all of the products
  -        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}.tar">
             <tarfileset dir="${dist.dir}"
                         prefix="${dist.name}"
                         username="avalon"
  @@ -305,8 +310,8 @@
               <fileset dir="${build.lib}">
                   <include name="*.jar"/>
               </fileset>
  -        </copy> 
  -    </target>   
  +        </copy>
  +    </target>
   
       <!-- Creates a minimal distribution -->
       <target name="dist.lite"
  @@ -319,95 +324,59 @@
   
       </target>
   
  -    <!-- Setup the filters -->
  -    <target name="setup-filters">
  -      <filter token="Name" value="Avalon ${Name}"/>
  -      <filter token="name" value="${dir-name}"/>
  -      <filter token="version" value="${version}"/>
  -      <filter token="year" value="${year}"/>
  -      <filter token="status" value="${status}"/>
  -      <filter token="release" value="${release}"/>
  -      <filter token="short-version" value="${short.version}"/>
  -
  -      <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -      <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -      <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -      <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -      <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -      <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -      <filter token="year" value="${year}"/>
  -      <filter token="AVALON_BASE" value="${avalon.base}"/>
  -      <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -      <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -      <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -      <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -      <filter token="TESTLET_BASE" value="${testlet.base}"/>
  -    </target>
  -    
  -    
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="setup-filters"> <!-- depends="javadocs" description="Generates the Docs" -->
  -      <mkdir dir="${docs.dir}"/>
  -
  -      <mkdir dir="${build.context}"/>
  -      <mkdir dir="${build.xdocs}"/>
  -      <mkdir dir="${build.docs}"/>
  -      <mkdir dir="${build.dir}/work"/>
  -  
  -      <!-- Base pointers for non-xdocs documentation. Override these in .ant.properties to link to local docs -->
  -      <copy todir="${build.context}" filtering="on">
  -        <fileset dir="${context.dir}">
  -          <exclude name="diagrams/**"/>
  -          <exclude name="resources/**"/>
  -          <exclude name="xdocs"/>
  -        </fileset>
  -      </copy>
  -  
  -      <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
  -        <fileset dir="${xdocs.dir}"/>
  -      </copy>
  -
  -      <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
  -        <fileset dir="${context.dir}/resources"/>
  -        <fileset dir="${xdocs.dir}">
  -          <include name="**/images/**"/>
  -        </fileset>
  -      </copy>
  +    <target name="anakia-avail">
  +        <available classname="org.apache.velocity.anakia.AnakiaTask"
  +            property="AnakiaTask.present">
  +            <classpath refid="tools.class.path"/>
  +        </available>
  +    </target>
  +
  +    <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present">
  +        <echo>
  +            AnakiaTask is not present! Please check to make sure that
  +            velocity.jar is in your classpath. The easiest way to build
  +            the documentation is to checkout jakarta-site CVS and specify
  +            jakarta-site.dir property.
  +        </echo>
  +    </target>
  +
  +    <target name="docs" depends="anakia-check" description="Generate documentation and website">
  +        <taskdef name="anakia"
  +            classname="org.apache.velocity.anakia.AnakiaTask">
  +            <classpath refid="tools.class.path"/>
  +        </taskdef>
   
  -      <java classname="org.apache.cocoon.Main" fork="true">
  -        <arg value="-c${build.context}/"/>
  -        <arg value="-d${build.docs}"/>
  -        <arg value="-w${build.dir}/work"/>
  -        <arg value="-l${build.dir}/work/cocoon.log"/>
  -        <arg value="-uINFO"/>
  -        <arg value="-f${xdocs.dir}/${dir-name}.uris"/>
  -        <classpath>
  -          <path refid="tools.class.path"/>
  -          <fileset dir="${tools.dir}/ext"/>
  -        </classpath>
  -      </java>
  +        <anakia basedir="${xdocs.dir}"
  +            destdir="${docs.dir}"
  +            style="docs.vsl"
  +            projectfile="stylesheets/project.xml"
  +            includes="**/*.xml"
  +            excludes="stylesheets/**"
  +            velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
  +            />
  +
  +     <copy todir="${docs.dir}" filtering="off">
  +      <fileset dir="../site/src" includes="css/*.css" />
  +      <fileset dir="${xdocs.dir}">
  +        <include name="**/images/**"/>
  +        <include name="**/*.gif"/>
  +        <include name="**/*.jpg"/>
  +        <include name="**/*.png"/>
  +        <include name="**/*.css"/>
  +        <include name="**/*.js"/>
  +      </fileset>
  +    </copy>
  +    </target>
   
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>    
  +    <target name="site" depends="javadocs, docs" description=" Places Docs ready for hosting on website">
   
  -      <!-- hack for stupid transport on api link -->
  -      <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
  -     
  -    </target>
  -    
  -    <target name="site" depends="javadocs, docs" description=" Places Docs ready for hosting on website">  
  -  
  -      <mkdir dir="../site/dist/docs/${dir-name}"/>     
  +      <mkdir dir="../site/dist/docs/${dir-name}"/>
         <copy todir="../site/dist/docs/${dir-name}">
           <fileset dir="${docs.dir}">
             <include name="**"/>
           </fileset>
  -      </copy>        
  -  
  +      </copy>
  +
       </target>
   
       <!-- Cleans up build and distribution directories -->
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/i18n/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	16 Apr 2002 12:00:41 -0000	1.5
  +++ default.properties	22 Jun 2002 15:31:29 -0000	1.6
  @@ -9,7 +9,7 @@
   Name=Excalibur I18N
   dir-name=il8n
   version=1.0
  -package-version=0.99
  +package-version=1.0
   year=2000-2002
   
   
  @@ -43,12 +43,12 @@
   context.dir = ../../jakarta-avalon/src/documentation
   tools.dir = ../../jakarta-avalon/tools
   tools.jar = ${java.home}/../lib/tools.jar
  -docs.dir = docs
   xdocs.dir = ${src.dir}/xdocs
   
   #  Set the properties for distribution directories
   dist.dir = dist
   dist.javadocs = ${dist.dir}/docs/api
  +docs.dir = ${dist.dir}/docs
   
   #  name of .zip/.tar.gz/.bz2 files and their top-level directory
   dist.name = ${name}-${version}
  
  
  
  1.3       +15 -26    jakarta-avalon-excalibur/i18n/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/src/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	5 Apr 2002 08:21:04 -0000	1.2
  +++ index.xml	22 Jun 2002 15:31:29 -0000	1.3
  @@ -1,30 +1,19 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  -    <title>Excalibur Internationalization - Overview</title>
  -    <authors>
  -      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
  -      <person name="Leo Simons" email="mail@leosimons.com"/>
  -    </authors>
  -  </header>
  -  <body>
  -    <s1 title="Introduction">
  -      <p>
  -        Excalibur's Internationalization package is found in
  -        <code>org.apache.avalon.excalibur.i18n</code>.  Avalon
  -        Excalibur includes a method of managing resources, and
  -        an interface for specifying the resource.  Support for
  -        XML resource bundles are still under development.
  -      </p>
  -    </s1>
  -  </body>
  -  <footer>
  -    <legal>
  -      Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
  -      $Revision$ $Date$
  -    </legal>
  -  </footer>
  +    <properties>
  +        <title>Excalibur Internationalization - Overview</title>
  +        <author email="peter@apache.org">Peter Donald</author>
  +    </properties>
  +    <body>
  +        <section name="Introduction">
  +            <p>
  +              Excalibur's Internationalization package is found in
  +              <code>org.apache.avalon.excalibur.i18n</code>.  Avalon
  +              Excalibur includes a method of managing resources, and
  +              an interface for specifying the resource.  Support for
  +              XML resource bundles are still under development.
  +            </p>
  +        </section>
  +    </body>
   </document>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>