You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2002/07/01 01:26:56 UTC

cvs commit: xml-cocoon2/src/scratchpad/webapp/mount/castor sitemap.xmap

vgritsenko    2002/06/30 16:26:56

  Modified:    src/documentation/xdocs/developing Tag: cocoon_2_0_3_branch
                        httprequest.xml
               src/documentation/xdocs/howto/xmlform-wizard Tag:
                        cocoon_2_0_3_branch howto-xmlform-wizard-5.xml
               src/documentation/xdocs/userdocs/concepts Tag:
                        cocoon_2_0_3_branch index.xml
               src/java/org/apache/cocoon/acting Tag: cocoon_2_0_3_branch
                        SessionStateAction.java
               src/java/org/apache/cocoon/selection Tag:
                        cocoon_2_0_3_branch HostSelector.java
               src/java/org/apache/cocoon/sitemap Tag: cocoon_2_0_3_branch
                        XSLTFactoryLoader.java
               src/scratchpad/webapp/mount/castor Tag: cocoon_2_0_3_branch
                        sitemap.xmap
  Log:
  Remove references to *Factories
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +2 -2      xml-cocoon2/src/documentation/xdocs/developing/httprequest.xml
  
  Index: httprequest.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/httprequest.xml,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- httprequest.xml	24 May 2002 13:46:30 -0000	1.2.2.2
  +++ httprequest.xml	30 Jun 2002 23:26:55 -0000	1.2.2.3
  @@ -66,7 +66,7 @@
   
       <map:selectors default="browser">
         <map:selector name="browser" 
  -                    factory="org.apache.cocoon.selection.BrowserSelectorFactory">
  +                    factory="org.apache.cocoon.selection.BrowserSelector">
           <browser name="explorer" useragent="MSIE"/>
           <browser name="netscape" useragent="Mozilla"/> 
         </map:selector> 
  @@ -74,7 +74,7 @@
   
       <map:matchers default="uri">
         <map:matcher name="uri" 
  -                   factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
  +                   factory="org.apache.cocoon.matching.WildcardURIMatcher"/>
       </map:matchers> 
   
     </map:components> 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +2 -2      xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard-5.xml
  
  Index: howto-xmlform-wizard-5.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard-5.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- howto-xmlform-wizard-5.xml	7 Jun 2002 19:49:00 -0000	1.2.2.1
  +++ howto-xmlform-wizard-5.xml	30 Jun 2002 23:26:55 -0000	1.2.2.2
  @@ -42,7 +42,7 @@
   <map:selectors default="browser"/>
   <map:matchers default="wildcard">
     <map:matcher name="wildcard" 
  -    src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
  +    src="org.apache.cocoon.matching.WildcardURIMatcher"/>
   </map:matchers>
   </map:components>
   ]]>
  @@ -99,7 +99,7 @@
     <map:serializers default="html"/>
     <map:selectors default="browser"/>
     <map:matchers default="wildcard">
  -	<map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
  +	<map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
     </map:matchers>
   </map:components>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-cocoon2/src/documentation/xdocs/userdocs/concepts/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/index.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- index.xml	16 Apr 2002 01:14:08 -0000	1.1.2.1
  +++ index.xml	30 Jun 2002 23:26:55 -0000	1.1.2.2
  @@ -313,8 +313,8 @@
         <p>Sitemap entries for different types of matchers</p>
   <source><![CDATA[
   <map:matchers default="wildcard">
  - <map:matcher name="wildcard" factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
  - <map:matcher name="regexp" factory="org.apache.cocoon.matching.RegexpURIMatcherFactory"/>
  + <map:matcher name="wildcard" factory="org.apache.cocoon.matching.WildcardURIMatcher"/>
  + <map:matcher name="regexp" factory="org.apache.cocoon.matching.RegexpURIMatcher"/>
   </map:matchers>
   ]]></source>
         <p>Pipeline entries in sitemap file</p>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java
  
  Index: SessionStateAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- SessionStateAction.java	22 Feb 2002 06:59:26 -0000	1.6
  +++ SessionStateAction.java	30 Jun 2002 23:26:56 -0000	1.6.2.1
  @@ -109,8 +109,8 @@
    *   </tr>
    * </table>
    *
  - * @see org.apache.cocoon.matching.WildcardSessionAttributeMatcherFactory
  - * @see org.apache.cocoon.selection.SessionAttributeSelectorFactory
  + * @see org.apache.cocoon.matching.WildcardSessionAttributeMatcher
  + * @see org.apache.cocoon.selection.SessionAttributeSelector
    *
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
    * @version CVS $Id$
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java
  
  Index: HostSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- HostSelector.java	28 Feb 2002 15:08:51 -0000	1.5
  +++ HostSelector.java	30 Jun 2002 23:26:56 -0000	1.5.2.1
  @@ -69,7 +69,7 @@
    *
    * <p>Configuration:
    * <pre>
  - * &lt;map:selector name="host" src="org.apache.cocoon.selection.HostSelectorFactory"&gt;
  + * &lt;map:selector name="host" src="org.apache.cocoon.selection.HostSelector"&gt;
    *   &lt;host name="uk-site" value="www.foo.co.uk"/&gt;
    * &lt;/map:selector&gt;
    * </pre>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +2 -4      xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
  
  Index: XSLTFactoryLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- XSLTFactoryLoader.java	29 Mar 2002 20:24:02 -0000	1.6
  +++ XSLTFactoryLoader.java	30 Jun 2002 23:26:56 -0000	1.6.2.1
  @@ -56,9 +56,7 @@
   import java.util.HashMap;
   
   /**
  - * This class is used as a XSLT extension class. It is used by the sitemap
  - * generation stylesheet to load <code>MatcherFactory</code>s or
  - * <code>SelectorFactory</code>s to get the generated source code.
  + * This class is used as a XSLT extension class.
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      xml-cocoon2/src/scratchpad/webapp/mount/castor/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/castor/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- sitemap.xmap	26 Mar 2002 08:08:49 -0000	1.1
  +++ sitemap.xmap	30 Jun 2002 23:26:56 -0000	1.1.2.1
  @@ -13,7 +13,7 @@
   		<map:selectors default="browser"/>
   
   		<map:matchers default="wildcard">
  -			<map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
  +			<map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
   		</map:matchers>
   		<map:actions>
   			
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org