Return-Path: 
 <avalon-cvs-return-8282-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 71091 invoked from network); 7 Jul 2002 08:30:37 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 7 Jul 2002 08:30:37 -0000
Received: (qmail 19700 invoked by uid 97); 7 Jul 2002 08:30:59 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 19664 invoked by uid 97); 7 Jul 2002 08:30:58 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 19653 invoked by uid 97); 7 Jul 2002 08:30:58 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 7 Jul 2002 08:30:31 -0000
Message-ID: <20020707083031.18602.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/xmlbundle/src/xdocs/images
 build.gif code.gif design.gif update.gif
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     2002/07/07 01:30:31

  Modified:    xmlbundle build.xml default.properties
               xmlbundle/src/java/org/apache/excalibur/xmlbundle
                        AbstractBundle.java Bundle.java BundleFactory.java
                        BundleInfo.java BundleInfoMapper.java
                        BundleLoader.java BundleMatcher.java
                        BundleSelector.java ConfigurableBundleInfo.java
                        DefaultBundleFactory.java DefaultBundleMatcher.java
                        DefaultMapper.java DirectoryMapper.java
                        FlatXmlBundle.java XmlBundle.java
               xmlbundle/src/java/org/apache/excalibur/xmlbundle/test
                        AbstractBundleTestCase.java
                        DefaultBundleLoaderTestCase.java
                        DefaultBundleMatcherTestCase.java
                        XmlBundleTestCase.java
               xmlbundle/src/java/org/apache/excalibur/xmlbundle/util
                        ResourceCheck.java
               xmlbundle/src/xdocs index.xml
  Added:       xmlbundle/lib jdom.jar
  Removed:     xmlbundle/src/java/org/apache/avalon/excalibur/xml
                        AbstractXMLConsumer.java ContentHandlerWrapper.java
                        EntityResolver.java JaxpParser.java Parser.java
                        XMLConsumer.java XMLFragment.java XMLizable.java
                        XercesParser.java
               xmlbundle/src/java/org/apache/avalon/excalibur/xml/xpath
                        EmptyNodeList.java JaxenProcessorImpl.java
                        SimpleNodeList.java XPathProcessor.java
                        XPathProcessorImpl.java package.html
               xmlbundle/src/java/org/apache/avalon/excalibur/xml/xslt
                        TraxErrorHandler.java XSLTProcessor.java
                        XSLTProcessorException.java XSLTProcessorImpl.java
               xmlbundle/src/java/org/apache/excalibur/xmlizer XMLizer.java
               xmlbundle/src/java/org/apache/excalibur/xmlizer/impl
                        HTMLXMLizer.java TextXMLizer.java XMLizerImpl.java
               xmlbundle/src/xdocs book.xml xmlbundle.uris
               xmlbundle/src/xdocs/dtd changes-v10.dtd characters.ent
                        document-v10.dtd faq-v10.dtd specification-v10.dtd
                        todo-v10.dtd
               xmlbundle/src/xdocs/images build.gif code.gif design.gif
                        update.gif
  Log:
  Update xmlbundle to contain the XML i18n utilities.
  
  Remove the old XML utils from here as they are moved to new product.
  
  Revision  Changes    Path
  1.24      +46 -96    jakarta-avalon-excalibur/xmlbundle/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	6 Jul 2002 05:44:27 -0000	1.23
  +++ build.xml	7 Jul 2002 08:30:29 -0000	1.24
  @@ -12,16 +12,13 @@
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${excalibur-logger.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
           <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
  -        <pathelement location="${excalibur-pool.jar}"/>
  +        <pathelement location="${excalibur-xmlutil.jar}"/>
  +        <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-sourceresolve.jar}"/>
  -        <pathelement location="${excalibur-store.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <pathelement location="${xalan.jar}"/>
           <pathelement location="${xerces.jar}"/>
           <pathelement location="${xml-apis.jar}"/>
           <fileset dir="${lib.dir}">
  @@ -32,9 +29,7 @@
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  -        <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">
  @@ -63,12 +58,9 @@
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkSourceResolve"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkStore"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
  +
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
               <property name="name" value="xerces.jar"/>
               <property name="path" value="${xerces.jar}"/>
  @@ -106,12 +98,6 @@
               target="1.2">
               <classpath refid="project.class.path" />
               <exclude name="**/test/**"/>
  -            <exclude name="org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java"
  -                unless="xpath.present"/>
  -            <exclude name="org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java"
  -                unless="jaxen.present"/>
  -            <exclude name="org/apache/excalibur/xmlizer/impl/HTMLXMLizer.java"
  -                unless="jtidy.present"/>
           </javac>
   
           <!-- copy resources to same location as .class files -->
  @@ -311,10 +297,9 @@
   
       <!-- 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)">
   
  -
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
   
  @@ -352,84 +337,49 @@
   
       </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>
   
  -      <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>
  -
  -      <copy todir="${docs.dir}">
  -        <fileset dir="${build.docs}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  +    <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>
   
  -      <!-- hack for stupid transport on api link -->
  -      <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
  +    <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>
   
  +        <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>
   
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for hosting on website">
  
  
  
  1.13      +5 -0      jakarta-avalon-excalibur/xmlbundle/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/default.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- default.properties	11 Jun 2002 00:04:23 -0000	1.12
  +++ default.properties	7 Jul 2002 08:30:29 -0000	1.13
  @@ -50,6 +50,11 @@
   excalibur-store.lib=${excalibur-store.home}
   excalibur-store.jar=${excalibur-store.lib}/excalibur-store-1.0.jar
   
  +# ----- Excalibur XMLUtil, version 1.0 or later -----
  +excalibur-xmlutil.home=${basedir}/../xmlutil/dist
  +excalibur-xmlutil.lib=${excalibur-xmlutil.home}
  +excalibur-xmlutil.jar=${excalibur-xmlutil.lib}/excalibur-xmlutil-1.0.jar
  +
   # --------------------------------------------------
   tools.dir=${basedir}/../../jakarta-avalon/tools
   
  
  
  
  1.3       +0 -0      jakarta-avalon-excalibur/xmlbundle/lib/jdom.jar
  
  	<<Binary file>>
  
  
  1.15      +1 -1      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/AbstractBundle.java
  
  Index: AbstractBundle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/AbstractBundle.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AbstractBundle.java	12 May 2002 14:23:19 -0000	1.14
  +++ AbstractBundle.java	7 Jul 2002 08:30:30 -0000	1.15
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Map;
   import org.apache.avalon.framework.component.Component;
  
  
  
  1.10      +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/Bundle.java
  
  Index: Bundle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/Bundle.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Bundle.java	12 May 2002 14:24:16 -0000	1.9
  +++ Bundle.java	7 Jul 2002 08:30:30 -0000	1.10
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Map;
   
  
  
  
  1.4       +1 -1      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleFactory.java
  
  Index: BundleFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BundleFactory.java	12 May 2002 14:24:48 -0000	1.3
  +++ BundleFactory.java	7 Jul 2002 08:30:30 -0000	1.4
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   public interface BundleFactory
   {
  
  
  
  1.9       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleInfo.java
  
  Index: BundleInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleInfo.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BundleInfo.java	12 May 2002 14:25:14 -0000	1.8
  +++ BundleInfo.java	7 Jul 2002 08:30:30 -0000	1.9
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Locale;
   
  
  
  
  1.9       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleInfoMapper.java
  
  Index: BundleInfoMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleInfoMapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BundleInfoMapper.java	12 May 2002 14:25:35 -0000	1.8
  +++ BundleInfoMapper.java	7 Jul 2002 08:30:30 -0000	1.9
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   /**
    * Used to map bundle information to string representation (e.g. URI),
  
  
  
  1.8       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleLoader.java
  
  Index: BundleLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleLoader.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BundleLoader.java	12 May 2002 14:25:55 -0000	1.7
  +++ BundleLoader.java	7 Jul 2002 08:30:30 -0000	1.8
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   /**
    * Used to map locale information to URI space, to find the relevant bundle.
  
  
  
  1.8       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleMatcher.java
  
  Index: BundleMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleMatcher.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BundleMatcher.java	12 May 2002 14:26:29 -0000	1.7
  +++ BundleMatcher.java	7 Jul 2002 08:30:30 -0000	1.8
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   /**
    * Used to map bundle information to string representation (e.g. URI),
  
  
  
  1.17      +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleSelector.java
  
  Index: BundleSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/BundleSelector.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BundleSelector.java	7 Jul 2002 03:30:21 -0000	1.16
  +++ BundleSelector.java	7 Jul 2002 08:30:30 -0000	1.17
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.HashMap;
   import java.util.Locale;
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/ConfigurableBundleInfo.java
  
  Index: ConfigurableBundleInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/ConfigurableBundleInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConfigurableBundleInfo.java	13 May 2002 12:17:37 -0000	1.3
  +++ ConfigurableBundleInfo.java	7 Jul 2002 08:30:30 -0000	1.4
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Locale;
   import org.apache.avalon.framework.configuration.Configurable;
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultBundleFactory.java
  
  Index: DefaultBundleFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultBundleFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultBundleFactory.java	13 May 2002 12:17:37 -0000	1.3
  +++ DefaultBundleFactory.java	7 Jul 2002 08:30:30 -0000	1.4
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.io.FileNotFoundException;
   import org.apache.avalon.framework.activity.Initializable;
  
  
  
  1.8       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultBundleMatcher.java
  
  Index: DefaultBundleMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultBundleMatcher.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultBundleMatcher.java	13 May 2002 12:17:37 -0000	1.7
  +++ DefaultBundleMatcher.java	7 Jul 2002 08:30:30 -0000	1.8
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.LinkedList;
   import java.util.List;
  
  
  
  1.9       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultMapper.java
  
  Index: DefaultMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DefaultMapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultMapper.java	13 May 2002 12:17:37 -0000	1.8
  +++ DefaultMapper.java	7 Jul 2002 08:30:30 -0000	1.9
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Locale;
   import org.apache.avalon.framework.component.Component;
  
  
  
  1.9       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DirectoryMapper.java
  
  Index: DirectoryMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/DirectoryMapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DirectoryMapper.java	13 May 2002 12:17:38 -0000	1.8
  +++ DirectoryMapper.java	7 Jul 2002 08:30:30 -0000	1.9
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   import java.util.Locale;
   
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/FlatXmlBundle.java
  
  Index: FlatXmlBundle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/FlatXmlBundle.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FlatXmlBundle.java	12 May 2002 14:28:11 -0000	1.4
  +++ FlatXmlBundle.java	7 Jul 2002 08:30:30 -0000	1.5
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   /**
    * @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
  
  
  
  1.14      +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/XmlBundle.java
  
  Index: XmlBundle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/XmlBundle.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XmlBundle.java	13 May 2002 12:17:38 -0000	1.13
  +++ XmlBundle.java	7 Jul 2002 08:30:30 -0000	1.14
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n;
  +package org.apache.excalibur.xmlbundle;
   
   /** JDK classes **/
   
  
  
  
  1.10      +3 -3      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/AbstractBundleTestCase.java
  
  Index: AbstractBundleTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/AbstractBundleTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractBundleTestCase.java	16 Mar 2002 00:05:47 -0000	1.9
  +++ AbstractBundleTestCase.java	7 Jul 2002 08:30:30 -0000	1.10
  @@ -5,11 +5,11 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n.test;
  +package org.apache.excalibur.xmlbundle.test;
   
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.avalon.excalibur.i18n.AbstractBundle;
  +import org.apache.excalibur.xmlbundle.AbstractBundle;
   import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
   
   /**
  
  
  
  1.10      +3 -3      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/DefaultBundleLoaderTestCase.java
  
  Index: DefaultBundleLoaderTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/DefaultBundleLoaderTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultBundleLoaderTestCase.java	13 Jun 2002 13:06:27 -0000	1.9
  +++ DefaultBundleLoaderTestCase.java	7 Jul 2002 08:30:30 -0000	1.10
  @@ -5,9 +5,9 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n.test;
  +package org.apache.excalibur.xmlbundle.test;
   
  -import org.apache.avalon.excalibur.i18n.BundleSelector;
  +import org.apache.excalibur.xmlbundle.BundleSelector;
   import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
   
   /**
  
  
  
  1.7       +4 -4      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/DefaultBundleMatcherTestCase.java
  
  Index: DefaultBundleMatcherTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/DefaultBundleMatcherTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultBundleMatcherTestCase.java	24 Mar 2002 09:56:40 -0000	1.6
  +++ DefaultBundleMatcherTestCase.java	7 Jul 2002 08:30:30 -0000	1.7
  @@ -5,13 +5,13 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n.test;
  +package org.apache.excalibur.xmlbundle.test;
   
   import java.net.URL;
   import java.util.Locale;
   import junit.framework.TestCase;
  -import org.apache.avalon.excalibur.i18n.BundleInfo;
  -import org.apache.avalon.excalibur.i18n.BundleMatcher;
  +import org.apache.excalibur.xmlbundle.BundleInfo;
  +import org.apache.excalibur.xmlbundle.BundleMatcher;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  
  
  
  1.13      +5 -5      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/XmlBundleTestCase.java
  
  Index: XmlBundleTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/test/XmlBundleTestCase.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XmlBundleTestCase.java	13 Jun 2002 13:06:27 -0000	1.12
  +++ XmlBundleTestCase.java	7 Jul 2002 08:30:30 -0000	1.13
  @@ -5,13 +5,13 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n.test;
  +package org.apache.excalibur.xmlbundle.test;
   
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.avalon.excalibur.i18n.BundleInfo;
  -import org.apache.avalon.excalibur.i18n.BundleInfoMapper;
  -import org.apache.avalon.excalibur.i18n.XmlBundle;
  +import org.apache.excalibur.xmlbundle.BundleInfo;
  +import org.apache.excalibur.xmlbundle.BundleInfoMapper;
  +import org.apache.excalibur.xmlbundle.XmlBundle;
   import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.xml.sax.InputSource;
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/util/ResourceCheck.java
  
  Index: ResourceCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/java/org/apache/excalibur/xmlbundle/util/ResourceCheck.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourceCheck.java	16 Mar 2002 00:05:47 -0000	1.5
  +++ ResourceCheck.java	7 Jul 2002 08:30:30 -0000	1.6
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.i18n.util;
  +package org.apache.excalibur.xmlbundle.util;
   
   /**
    @author <a href="mailto:neeme@one.lv">Neeme Praks</a>
  
  
  
  1.3       +13 -35    jakarta-avalon-excalibur/xmlbundle/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/src/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	6 Jul 2002 04:56:17 -0000	1.2
  +++ index.xml	7 Jul 2002 08:30:31 -0000	1.3
  @@ -1,42 +1,20 @@
  -<?xml version="1.0"?>
  -
  +<?xml version="1.0" encoding="UTF-8"?>
   <document>
  -    <header>
  +    <properties>
           <title>Excalibur XML Resource Bundles - Overview</title>
  -        <authors>
  -            <person name="Berin Loritsch" email="bloritsch@apache.org"/>
  -            <person name="Leo Simons" email="mail@leosimons.com"/>
  -        </authors>
  -    </header>
  +        
  +            <author email="neeme@apache.org">Neeme Praks</author>
  +        
  +    </properties>
       <body>
  -        <s1 title="Introduction">
  +        <section name="Introduction">
               <p>
                 Excalibur's Internationalization package is found in
  -              <code>org.apache.avalon.excalibur.i18n</code> (in the
  -              Scratchpad jar).  The XML ResourceBundle code is functional,
  -              but the method to access the bundles will change in the
  -              near future.
  +              <code>org.apache.excalibur.xmlbundle</code>. The XML
  +              ResourceBundle code is functional, but the method to
  +              access the bundles will change in the near future.
               </p>
  -            <p>
  -              This package is under development, and the API is not
  -              guaranteed to be the same when it is ready for release.
  -              Do not blame us if the next release of Excalibur breaks
  -              your code if you use this package.
  -            </p>
  -            <p>
  -              The Avalon team recognizes the importance of good
  -              internationalization packages, and as a result, will do
  -              our best to provide this functionality officially as
  -              soon as we can.  We also recognize the importance of
  -              good design, so we do not want to rush this any more
  -              than we have to.
  -            </p>
  -        </s1>
  +        </section>
       </body>
  -    <footer>
  -        <legal>
  -          Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
  -          $Revision$ $Date$
  -        </legal>
  -    </footer>
  -</document>
  +    
  +</document>
  \ No newline at end of file
  
  
  

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