You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/05 11:01:33 UTC

cvs commit: cocoon-2.1 blocks.properties

unico       2003/12/05 02:01:33

  Modified:    src/blocks/ojb/conf ojb.xconf
               .        blocks.properties
  Log:
  fix default exclusion of ojb block. commenting out the jdo-ojb factory component will prevent it from being loaded during startup.
  Apparently, because ECM still has a role mapping for it, it isn't even neccessary to uncomment the component to use it. ECM will 
  attempt to create a new instance at access time (off course without any configuration and with a default logger category)
  
  Revision  Changes    Path
  1.2       +2 -0      cocoon-2.1/src/blocks/ojb/conf/ojb.xconf
  
  Index: ojb.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/ojb/conf/ojb.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ojb.xconf	28 Sep 2003 04:31:11 -0000	1.1
  +++ ojb.xconf	5 Dec 2003 10:01:33 -0000	1.2
  @@ -2,5 +2,7 @@
   
   <xconf xpath="/cocoon" unless="ojb-jdo">
     <!-- Persistent Manager Factory for JDO -->
  +  <!-- uncomment in order to set the logger to a category other than core.startup
     <ojb-jdo class="org.apache.cocoon.ojb.jdo.components.JdoPMFImpl" logger="core.ojb-jdo"/>
  +  -->
   </xconf>
  
  
  
  1.51      +1 -1      cocoon-2.1/blocks.properties
  
  Index: blocks.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- blocks.properties	21 Nov 2003 22:32:57 -0000	1.50
  +++ blocks.properties	5 Dec 2003 10:01:33 -0000	1.51
  @@ -85,7 +85,7 @@
   #exclude.block.mail=true
   #exclude.block.midi=true
   #-----[warning]: Before including the "ojb" block, see: http://wiki.cocoondev.org/Wiki.jsp?page=OJBBlock
  -exclude.block.ojb=true
  +#exclude.block.ojb=true
   #-----[dependency]: "petstore" depends on "databases", "hsqldb", "velocity", "woody".
   #exclude.block.petstore=true
   #-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".