cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.0/src/webapp/WEB-INF cocoon.xconf
Date Mon, 10 Mar 2003 09:12:07 GMT
cziegeler    2003/03/10 01:12:07

  Modified:    src/scratchpad/schecoon/webapp/WEB-INF cocoon.xconf
               src/java/org/apache/cocoon/components/xpath
                        XPathProcessorImpl.java XPathProcessor.java
                        JaxenProcessorImpl.java
               src/documentation/xdocs/installing updating.xml index.xml
               src/documentation/xdocs/ctwig ctwig-contributing.xml
                        ctwig-installing.xml ctwig-osx.xml
                        ctwig-resources.xml ctwig-gettingstarted.xml
               src/documentation cocoon.xconf
               src/documentation/xdocs/tutorial tutorial-rmi-generator.xml
                        RMIGenerator.java
               src/test/org/apache/cocoon/components/resolver/test
                        ResolverImplTestCase.xtest
                        ResolverImplTestCase.java
               src/documentation/xdocs index.xml who.xml
               src/java/org/apache/cocoon cocoon.roles Constants.java
               src/documentation/xdocs/css testdoc.xml
               src/documentation/xdocs/userdocs/concepts catalog.xml
               src/documentation/xdocs/howto/xmlform-wizard book.xml
               src/webapp/WEB-INF cocoon.xconf
  Log:
  Fixing all references to excalibur xmlutil. Build docs now works again
  
  Revision  Changes    Path
  1.2       +4 -4      cocoon-2.0/src/scratchpad/schecoon/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/scratchpad/schecoon/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	9 Mar 2003 00:04:26 -0000	1.1
  +++ cocoon.xconf	10 Mar 2003 09:12:05 -0000	1.2
  @@ -15,16 +15,16 @@
   
     <!-- Parser:
       The default parser used in Apache Cocoon is
  -    org.apache.avalon.excalibur.xml.JaxpParser. Apache Cocoon requires a 
  +    org.apache.excalibur.xml.impl.JaxpParser. Apache Cocoon requires a 
       JAXP 1.1 parser.
       If you have problems because your servlet environment uses its own
       parser not conforming to JAXP 1.1 try using the alternative
       XercesParser instead of the JaxpParser. To activate the XercesParser,
       change the class attribute to
  -      class="org.apache.avalon.excalibur.xml.XercesParser"
  +      class="org.apache.excalibur.xml.impl.XercesParser"
       You will also need to add a system property to your JVM,
       probably on the startup of your servlet engine like this:
  -    -Dorg.apache.avalon.excalibur.xml.Parser=org.apache.avalon.excalibur.xml.XercesParser
  +    -Dorg.apache.excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
   
       Configuration for the JaxpParser (not the XercesParser!):
       - validate (boolean, default = false): This parameter causes the parser 
  @@ -54,7 +54,7 @@
           DocumentBuilderFactory implementation to be used (similar to
           sax-parser-factory for DOM).
     -->
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  +  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
                 logger="core.xml-parser">
       <parameter name="validate" value="false"/>
       <parameter name="namespace-prefixes" value="false"/>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java
  
  Index: XPathProcessorImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XPathProcessorImpl.java	9 Mar 2003 00:02:49 -0000	1.1
  +++ XPathProcessorImpl.java	10 Mar 2003 09:12:05 -0000	1.2
  @@ -68,7 +68,7 @@
    * &lt;/xslt-processor&gt;
    * </pre>
    *
  - * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl instead.
  + * @deprecated Use the org.apache.excalibur.xml.xpath.XPathProcessorImpl instead.
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @version CVS $Id$
    */
  
  
  
  1.2       +2 -2      cocoon-2.0/src/java/org/apache/cocoon/components/xpath/XPathProcessor.java
  
  Index: XPathProcessor.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/xpath/XPathProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XPathProcessor.java	9 Mar 2003 00:02:49 -0000	1.1
  +++ XPathProcessor.java	10 Mar 2003 09:12:05 -0000	1.2
  @@ -57,7 +57,7 @@
   /**
    * This is the interface of the XPath processor in Cocoon.
    *
  - * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.XPathProcessor instead.
  + * @deprecated Use the org.apache.excalibur.xml.xpath.XPathProcessor instead.
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @version CVS $Id$
    */
  
  
  
  1.2       +2 -2      cocoon-2.0/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java
  
  Index: JaxenProcessorImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JaxenProcessorImpl.java	9 Mar 2003 00:02:49 -0000	1.1
  +++ JaxenProcessorImpl.java	10 Mar 2003 09:12:05 -0000	1.2
  @@ -70,7 +70,7 @@
    * &lt;xslt-processor class="org.apache.cocoon.components.xpath.JaxenProcessorImpl"&gt;
    * &lt;/xslt-processor&gt;
    * </pre>
  - * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl instead.
  + * @deprecated Use the org.apache.excalibur.xml.xpath.JaxenProcessorImpl instead.
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @version CVS $Id$
  
  
  
  1.2       +2 -2      cocoon-2.0/src/documentation/xdocs/installing/updating.xml
  
  Index: updating.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/installing/updating.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- updating.xml	9 Mar 2003 00:01:04 -0000	1.1
  +++ updating.xml	10 Mar 2003 09:12:05 -0000	1.2
  @@ -47,7 +47,7 @@
        manually update swap the hint names.</p>
       <p>From within your source code you should not lookup the
         <em>org.apache.cocoon.components.parser.Parser.ROLE</em> anymore; use
  -      <em>org.apache.avalon.excalibur.xml.Parser.ROLE</em> instead.
  +      <em>org.apache.excalibur.xml.sax.SAXParser.ROLE</em> instead.
       </p>
     </s2>
     <s2 title="XML Entity Resolver">
  @@ -57,7 +57,7 @@
        manually update swap the hint names.</p>
       <p>From within your source code you should not lookup the
         <em>org.apache.cocoon.components.resolver.Resolver.ROLE</em> anymore;
use
  -      <em>org.apache.avalon.excalibur.xml.EntityResolver.ROLE</em> instead.
  +      <em>org.apache.excalibur.xml.EntityResolver.ROLE</em> instead.
       </p>
     </s2>
     <s2 title="Stores">
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/installing/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/installing/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	9 Mar 2003 00:01:03 -0000	1.1
  +++ index.xml	10 Mar 2003 09:12:05 -0000	1.2
  @@ -52,7 +52,7 @@
         <s2 title="Download a distribution">
          <p>
           You can simply download the latest official release from the
  -        <link href="http://xml.apache.org/cocoon/dist/">Cocoon distribution</link>
  +        <link href="http://cocoon.apache.org/dist/">Cocoon distribution</link>
           directory.
          </p>
         </s2>
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-contributing.xml
  
  Index: ctwig-contributing.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-contributing.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ctwig-contributing.xml	9 Mar 2003 00:00:51 -0000	1.1
  +++ ctwig-contributing.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -12,7 +12,7 @@
   	<body>
   		<s1 title="Contributing">
   			<p>I am more than happy to recieve amendments, improvements and so on to these
pages.  I want the information to be as up to date and as accurate as possible so please do
not hesitate to let me know if you find anything wrong.  I would also be really pleased to
receive submissions of more tutorial documentation for C2.  I hope that sections will develop
for areas such as the sitemap, configuration tutorials, development techniques and so on which
will require reasonable effort to develop however I think it would also be good to take up
the suggestion of a FAQ based on some of the common questions that come up on the list.  I
will start this off soon and try and add to it as quickly as possible.</p>
  -			<p>I have written these pages in the xdocs format, thus it would be really useful
if any contributions are in that format (see <link href="http://xml.apache.org/cocoon/contrib.html">Contributing</link>
for explanation of the diff format and CVS).  If you want to see examples of the markup required
please check the files in the C2 xdocs folder that comes as part of the distribution.  The
DTD is in xdocs/dtd/document-v10.dtd.  I am more than happy to take contributions in email,
MS Word, PDF, TXT etc however any conversion may delay the publishing process.</p>
  +			<p>I have written these pages in the xdocs format, thus it would be really useful
if any contributions are in that format (see <link href="http://cocoon.apache.org/contrib.html">Contributing</link>
for explanation of the diff format and CVS).  If you want to see examples of the markup required
please check the files in the C2 xdocs folder that comes as part of the distribution.  The
DTD is in xdocs/dtd/document-v10.dtd.  I am more than happy to take contributions in email,
MS Word, PDF, TXT etc however any conversion may delay the publishing process.</p>
   			<p>Please email <link href="mailto:ctwig@pigbite.com">ctwig@pigbite.com</link>
with your comments, ideas and submissions.</p>
   			<p>Many thanks - Jez</p>
   		</s1>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-installing.xml
  
  Index: ctwig-installing.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-installing.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ctwig-installing.xml	9 Mar 2003 00:00:51 -0000	1.1
  +++ ctwig-installing.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -24,10 +24,10 @@
   Please note the assumptions about platform, user knowledge and existing applications in
the Why? section and also note that wherever {TOMCAT_HOME}, {COCOON_HOME} or {APACHE_HOME}
appears it should be replaced with the path it is installed into on your machine (e.g. d:\java\cocoon
for {COCOON_HOME}).</p>
   			</s2>
   			<s2 title="Download Cocoon 2">
  -				<p>The latest distribution for any operating system can be found in the <fork
href="http://xml.apache.org/cocoon/dist/">Cocoon distribution folder</fork>.  This
file contains the Cocoon code, samples, documentation and the Java libraries that enable the
Cocoon to work such as Xerces and Xalan.  When you have downloaded it then extract it to somewhere.
 This path becomes your {COCOON_HOME}.</p>
  +				<p>The latest distribution for any operating system can be found in the <fork
href="http://cocoon.apache.org/dist/">Cocoon distribution folder</fork>.  This file
contains the Cocoon code, samples, documentation and the Java libraries that enable the Cocoon
to work such as Xerces and Xalan.  When you have downloaded it then extract it to somewhere.
 This path becomes your {COCOON_HOME}.</p>
   			</s2>
   			<s2 title="Basic Configuration">
  -				<p>Follow the instructions on building Cocoon as per the installation guide that
comes with Cocoon.  It can also be found <fork href="http://xml.apache.org/cocoon/installing/index.html">here</fork>
as well.  Obviously since you have got the ZIP distribution you do not have to do the CVS
bit thus you can start at the Building Apache Cocoon 2 section.  Do each of the following
steps:</p>
  +				<p>Follow the instructions on building Cocoon as per the installation guide that
comes with Cocoon.  It can also be found <fork href="http://cocoon.apache.org/installing/index.html">here</fork>
as well.  Obviously since you have got the ZIP distribution you do not have to do the CVS
bit thus you can start at the Building Apache Cocoon 2 section.  Do each of the following
steps:</p>
   				<ul>
   					<li>Set JAVA_HOME</li>
   					<li>Create the WAR using
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-osx.xml
  
  Index: ctwig-osx.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-osx.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ctwig-osx.xml	9 Mar 2003 00:00:51 -0000	1.1
  +++ ctwig-osx.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -23,7 +23,7 @@
   	</s2>
   
   	<s2 title="II. Download and unzip Cocoon 2">
  -		<p>Download and unzip a binary version of The latest distribution of Cocoon: <link
href="http://xml.apache.org/cocoon/dist/">http://xml.apache.org/cocoon/dist/</link></p>
  +		<p>Download and unzip a binary version of The latest distribution of Cocoon: <link
href="http://cocoon.apache.org/dist/">http://cocoon.apache.org/dist/</link></p>
   		<p>(Feb 2002 this was <code>cocoon-2.0.1-bin.zip</code>)</p>
   
   	</s2>
  
  
  
  1.2       +3 -3      cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-resources.xml
  
  Index: ctwig-resources.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-resources.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ctwig-resources.xml	9 Mar 2003 00:00:51 -0000	1.1
  +++ ctwig-resources.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -12,13 +12,13 @@
   	<body>
   		<s1 title="Resources">
   			<s2 title="Apache Cocoon Web Site">
  -				<p>The main place is <link href="http://xml.apache.org/cocoon/"><code>http://xml.apache.org/cocoon/</code></link></p>
  +				<p>The main place is <link href="http://cocoon.apache.org/"><code>http://cocoon.apache.org/</code></link></p>
   				<p>The C2 documentation is still (and always will be) under development. There
is a lot of useful information there and it goes into a lot more detail than here.  Read it
and digest it.  I am certainly doing that as I go along and quite quickly understanding more
of the architecture and concepts.  I will seek to distill the main points into this site,
but the main place is still the supplied documentation.</p>
   				<p>You will also find the documentation in your C2 installation under {COCOON_HOME}/docs/</p>
   			</s2>
   			<s2 title="Apache Cocoon Users Mail List">
  -				<p><link href="mailto:cocoon-users-subscribe@xml.apache.org">Subscribe</link>
to the Cocoon users mail list!  This is a great resource for asking and answering questions.
 For more details, and pointers to other related lists, see the <fork href="http://xml.apache.org/cocoon/mail-lists.html">documentation</fork>.</p>
  -				<p>You can also access an excellent, searchable, archive of the users mail list
at <fork href="http://marc.theaimsgroup.com/?l=xml-cocoon-users">The Aims Group</fork>.
 Use this 'cos lots of things are there!  Other list archive information is available in the
<fork href="http://xml.apache.org/cocoon/mail-archives.html">documentation</fork>.</p>
  +				<p><link href="mailto:cocoon-users-subscribe@xml.apache.org">Subscribe</link>
to the Cocoon users mail list!  This is a great resource for asking and answering questions.
 For more details, and pointers to other related lists, see the <fork href="http://cocoon.apache.org/mail-lists.html">documentation</fork>.</p>
  +				<p>You can also access an excellent, searchable, archive of the users mail list
at <fork href="http://marc.theaimsgroup.com/?l=xml-cocoon-users">The Aims Group</fork>.
 Use this 'cos lots of things are there!  Other list archive information is available in the
<fork href="http://cocoon.apache.org/mail-archives.html">documentation</fork>.</p>
   			</s2>
   			<s2 title="Other Pages">
   				<ul>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-gettingstarted.xml
  
  Index: ctwig-gettingstarted.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/ctwig/ctwig-gettingstarted.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ctwig-gettingstarted.xml	9 Mar 2003 00:00:51 -0000	1.1
  +++ ctwig-gettingstarted.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -24,8 +24,8 @@
   			</s2>
   
   			<s2 title="Where do I get it from?">
  -				<p>Go to <fork href="http://xml.apache.org/cocoon/">http://www.apache.org/cocoon/</fork>
and download it from there.  The latest distribution for any operating system can be found
in the 
  -				<fork href="http://xml.apache.org/cocoon/dist/">Cocoon distribution folder</fork>.
 The distribution that you can download from there contains the Cocoon code, samples, documentation
and the Java libraries that enable the Cocoon to work such as Xerces and Xalan.</p>
  +				<p>Go to <fork href="http://cocoon.apache.org/">http://www.apache.org/cocoon/</fork>
and download it from there.  The latest distribution for any operating system can be found
in the 
  +				<fork href="http://cocoon.apache.org/dist/">Cocoon distribution folder</fork>.
 The distribution that you can download from there contains the Cocoon code, samples, documentation
and the Java libraries that enable the Cocoon to work such as Xerces and Xalan.</p>
   			</s2>
   
   			<s2 title="What assumptions have you made?">
  
  
  
  1.2       +1 -2      cocoon-2.0/src/documentation/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/cocoon.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	9 Mar 2003 00:00:38 -0000	1.1
  +++ cocoon.xconf	10 Mar 2003 09:12:06 -0000	1.2
  @@ -14,8 +14,7 @@
     <!-- ==================== General Components ========================== -->
   
     <!-- Parser -->
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  -          logger="core.parser">
  +  <xml-parser logger="core.parser">
       <parameter name="validate" value="false"/>
     </xml-parser>
   
  
  
  
  1.2       +3 -3      cocoon-2.0/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml
  
  Index: tutorial-rmi-generator.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tutorial-rmi-generator.xml	9 Mar 2003 00:01:08 -0000	1.1
  +++ tutorial-rmi-generator.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -677,12 +677,12 @@
   				<p>We would still like to point the reader to an alternative solution, i.e. the
solution that is used throughout Cocoon 2. We will give the code fragments here and we will
then explain what it does.</p>
   <source><![CDATA[
   ...
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.SAXParser;
   ...
  -Parser parser = null;
  +SAXParser parser = null;
   
     try {
  -    parser = (Parser)this.manager.lookup(Parser.ROLE);
  +    parser = (SAXParser)this.manager.lookup(SAXParser.ROLE);
       parser.parse(this.getInputSource(),handler);
     } catch (SAXException e) {
       // Preserve original exception
  
  
  
  1.2       +3 -3      cocoon-2.0/src/documentation/xdocs/tutorial/RMIGenerator.java
  
  Index: RMIGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/tutorial/RMIGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RMIGenerator.java	9 Mar 2003 00:01:07 -0000	1.1
  +++ RMIGenerator.java	10 Mar 2003 09:12:06 -0000	1.2
  @@ -24,7 +24,7 @@
   import org.apache.avalon.framework.component.ComponentException; 
   
   // needed for obtaining parser in Cocoon 
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.SAXParser;
   
   /**
    * <p>
  @@ -140,8 +140,8 @@
   				message = obj.getResource(this.source);
   			} 
   			
  -			Parser parser = null; 
  -			parser = (Parser)this.manager.lookup(Parser.ROLE); 
  +			SAXParser parser = null; 
  +			parser = (SAXParser)this.manager.lookup(SAXParser.ROLE); 
   			InputSource inputSource = new InputSource(new StringReader(message)); 
   			parser.parse(inputSource,super.xmlConsumer); 
   		} catch (NotBoundException nbe) { 
  
  
  
  1.2       +1 -1      cocoon-2.0/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.xtest
  
  Index: ResolverImplTestCase.xtest
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.xtest,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResolverImplTestCase.xtest	9 Mar 2003 00:05:24 -0000	1.1
  +++ ResolverImplTestCase.xtest	10 Mar 2003 09:12:06 -0000	1.2
  @@ -109,7 +109,7 @@
       <entry name="foo" value="bar"/>
     </context>
     <roles>
  -    <role name="org.apache.avalon.excalibur.xml.EntityResolver"
  +    <role name="org.apache.excalibur.xml.EntityResolver"
         shorthand="entity-resolver"
         default-class="org.apache.cocoon.components.resolver.ResolverImpl">
       </role>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java
  
  Index: ResolverImplTestCase.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResolverImplTestCase.java	9 Mar 2003 00:05:24 -0000	1.1
  +++ ResolverImplTestCase.java	10 Mar 2003 09:12:06 -0000	1.2
  @@ -60,7 +60,7 @@
   import junit.swingui.TestRunner;
   import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
   import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
  -import org.apache.avalon.excalibur.xml.EntityResolver;
  +import org.apache.excalibur.xml.EntityResolver;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	9 Mar 2003 00:00:49 -0000	1.1
  +++ index.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -33,7 +33,7 @@
   		<s1 title="Where can I find it?">
   			<p>
      To download the latest release @released.version@ of Apache Cocoon, go to the 
  -   <link href="http://xml.apache.org/cocoon/dist/">download area.</link>
  +   <link href="http://cocoon.apache.org/dist/">download area.</link>
   			</p>
   			<p>
      If you are looking for a past generation of Cocoon (no longer supported but still available),

  
  
  
  1.2       +3 -0      cocoon-2.0/src/documentation/xdocs/who.xml
  
  Index: who.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/who.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- who.xml	9 Mar 2003 00:00:50 -0000	1.1
  +++ who.xml	10 Mar 2003 09:12:06 -0000	1.2
  @@ -41,12 +41,14 @@
         <li>David Crossley (crossley.at.apache.org)</li>
         <li>Torsten Curdt (tcurdt.at.apache.org)</li>
         <li>Bertrand Delacr&#233;taz (bdelacretaz.at.apache.org)</li>
  +      <li>Bruno Dumon (bruno.at.apache.org)</li>
         <li>Vadim Gritsenko (vgritsenko.at.apache.org)</li>
         <li>Christian Haul (haul.at.apache.org)</li>
         <li>Bernhard Huber (huber.at.apache.org)</li>
         <li>Ivelin Ivanov (ivelin.at.apache.org)</li>
         <li>Matthew Langham (mlangham.at.apache.org)</li>
         <li>Stefano Mazzocchi (stefano.at.apache.org)</li>
  +      <li>Michael Melhem (michaelm.at.apache.org)</li>
         <li>Stephan Michels (stephan.at.apache.org)</li>
         <li>John Morrison (morrijr.at.apache.org)</li>
         <li>Steven Noels (stevenn.at.apache.org)</li>
  @@ -90,6 +92,7 @@
         <li>Ross Burton (rossb.at.apache.org)</li>
         <li>Steven Coffman (gears.at.apache.org)</li>
         <li>Peter Donald (donaldp.at.apache.org)</li>
  +      <li>Pier Fumagalli (pier.at.apache.org)</li>
         <li>Robin Green (greenrd.at.apache.org)</li>
         <li>Ben Laurie (ben.at.apache.org)</li>
         <li>Brett McLaughlin (bmclaugh.at.apache.org)</li>
  
  
  
  1.2       +11 -5     cocoon-2.0/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.roles	9 Mar 2003 00:01:23 -0000	1.1
  +++ cocoon.roles	10 Mar 2003 09:12:06 -0000	1.2
  @@ -13,11 +13,17 @@
   ]>
   
   <role-list>
  -  <role name="org.apache.avalon.excalibur.xml.Parser"
  +  <!-- This is the usual SAX parser -->
  +  <role name="org.apache.excalibur.xml.sax.SAXParser"
           shorthand="xml-parser"
  -        default-class="org.apache.avalon.excalibur.xml.JaxpParser"/>
  +        default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
   
  -  <role name="org.apache.avalon.excalibur.xml.EntityResolver"
  +  <!-- This is the usual DOM parser -->
  +  <role name="org.apache.excalibur.xml.dom.DOMParser"
  +        shorthand="dom-parser"
  +        default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
  +
  +  <role name="org.apache.excalibur.xml.EntityResolver"
           shorthand="entity-resolver"
           default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
   
  @@ -25,9 +31,9 @@
           shorthand="xslt-processor"
           default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
   
  -  <role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor"
  +  <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
           shorthand="xpath-processor"
  -        default-class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
  +        default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
   
     <role name="org.apache.cocoon.components.browser.Browser"
           shorthand="browser"
  
  
  
  1.2       +3 -3      cocoon-2.0/src/java/org/apache/cocoon/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java	9 Mar 2003 00:01:23 -0000	1.1
  +++ Constants.java	10 Mar 2003 09:12:06 -0000	1.2
  @@ -142,10 +142,10 @@
       String DEFAULT_CONF_FILE   = "cocoon.xconf";
   
       /** The name of the property holding the class for a XML parser */
  -    String PARSER_PROPERTY = "org.apache.avalon.excalibur.xml.Parser";
  +    String PARSER_PROPERTY = "org.apache.excalibur.xml.sax.SAXParser";
   
       /** The name of the class for the default XML parser to use */
  -    String DEFAULT_PARSER  = "org.apache.avalon.excalibur.xml.JaxpParser";
  +    String DEFAULT_PARSER  = "org.apache.excalibur.xml.impl.JaxpParser";
   
       /** The name of the property holding the class for a XML parser
        *  @deprecated This will be removed in future release */
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/css/testdoc.xml
  
  Index: testdoc.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/css/testdoc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testdoc.xml	9 Mar 2003 00:00:50 -0000	1.1
  +++ testdoc.xml	10 Mar 2003 09:12:07 -0000	1.2
  @@ -150,6 +150,6 @@
     </body>
   
     <footer>
  -    <legal>(c) 2002 The Apache Software Foundation.</legal>
  +    <legal>(c) 2003 The Apache Software Foundation.</legal>
     </footer>
   </document>
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/userdocs/concepts/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/userdocs/concepts/catalog.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- catalog.xml	9 Mar 2003 00:01:10 -0000	1.1
  +++ catalog.xml	10 Mar 2003 09:12:07 -0000	1.2
  @@ -529,7 +529,7 @@
      The SAX <code>Parser</code> interface provides an <code>entityResolver</code>
      hook to allow an application to resolve the external entities. This is
      enabled via 
  -   <code>org.apache.avalon.excalibur.xml.EntityResolver</code>
  +   <code>org.apache.excalibur.xml.EntityResolver</code>
     </p>
   
     <p>
  
  
  
  1.2       +1 -1      cocoon-2.0/src/documentation/xdocs/howto/xmlform-wizard/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/howto/xmlform-wizard/book.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- book.xml	9 Mar 2003 00:01:03 -0000	1.1
  +++ book.xml	10 Mar 2003 09:12:07 -0000	1.2
  @@ -3,7 +3,7 @@
   
   <book software="Apache Cocoon" 
         title="Apache Cocoon XMLForm HowTo" 
  -      copyright="1999-2002 The Apache Software Foundation"
  +      copyright="1999-2003 The Apache Software Foundation"
         xmlns:xlink="http://www.w3.org/1999/xlink">
   
     <menu label="Navigation">
  
  
  
  1.2       +5 -6      cocoon-2.0/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	9 Mar 2003 00:05:28 -0000	1.1
  +++ cocoon.xconf	10 Mar 2003 09:12:07 -0000	1.2
  @@ -13,20 +13,18 @@
   
   <!-- ===================== General Components =========================== -->
   
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  -              logger="core.xml-parser">
     <!-- Parser:
       The default parser used in Apache Cocoon is
  -    org.apache.avalon.excalibur.xml.JaxpParser. Apache Cocoon requires a 
  +    org.apache.excalibur.xml.impl.JaxpParser. Apache Cocoon requires a 
       JAXP 1.1 parser.
       If you have problems because your servlet environment uses its own
       parser not conforming to JAXP 1.1 try using the alternative
       XercesParser instead of the JaxpParser. To activate the XercesParser,
       change the class attribute to
  -      class="org.apache.avalon.excalibur.xml.XercesParser"
  +      class="org.apache.excalibur.xml.impl.XercesParser"
       You will also need to add a system property to your JVM,
       probably on the startup of your servlet engine like this:
  -    -Dorg.apache.avalon.excalibur.xml.Parser=org.apache.avalon.excalibur.xml.XercesParser
  +    -Dorg.apache.excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
   
       Configuration for the JaxpParser (not the XercesParser!):
       - validate (boolean, default = false): This parameter causes the parser 
  @@ -56,6 +54,7 @@
           DocumentBuilderFactory implementation to be used (similar to
           sax-parser-factory for DOM).
     -->
  +  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser" logger="core.xml-parser"
pool-grow="4" pool-max="32" pool-min="8">
       <parameter name="validate" value="false"/>
       <parameter name="namespace-prefixes" value="false"/>
       <parameter name="stop-on-warning" value="true"/>
  @@ -141,7 +140,7 @@
   
     <!-- Xpath Processor:
     -->
  -  <xpath-processor class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"
  +  <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
                      logger="core.xpath-processor"/>
   
     <!-- URL Factory:
  
  
  

Mime
View raw message