weaver      2003/08/13 14:32:04

  Modified:    portal/src/webapp/WEB-INF/conf jetspeed.properties
                        persistence-plugins.xml
               portal/src/webapp/WEB-INF/conf/test jetspeed.properties
  Added:       portal/src/webapp/WEB-INF/conf plugins.dtd
  Log:
  changes due to name changes in plugin api
  
  Revision  Changes    Path
  1.4       +11 -2     
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jetspeed.properties       8 Aug 2003 22:05:55 -0000       1.3
  +++ jetspeed.properties       13 Aug 2003 21:32:04 -0000      1.4
  @@ -21,6 +21,14 @@
   supported.windowstate = maximized
   supported.windowstate = minimzed
   
  +# -------------------------------------------------------------------
  +#  Security Information
  +# -------------------------------------------------------------------
  +
  +# if no user ahs been setup, default.user.principal will be
  +# automatically added via HttpRequestContext.setUserPrincpal()
  +default.user.principal=anon
  +
   
   # -------------------------------------------------------------------
   #  L O G 4 J - L O G G I N G
  @@ -217,8 +225,9 @@
   #--------------------------------------------------------------------
   # P E R S I S T E N C E    S E R V I C E
   #--------------------------------------------------------------------
  
-services.PersistenceService.classname=org.apache.jetspeed.services.persistence.JetspeedPersistenceService
  
+services.PersistenceService.classname=org.apache.jetspeed.persistence.JetspeedPersistenceService
   services.PersistenceService.plugin.file=WEB-INF/conf/persistence-plugins.xml
  
+services.PersistenceService.path.resolver.class=org.apache.jetspeed.util.JetspeedPathResloverImpl
   
   #--------------------------------------------------------------------
   # P O R T L E T  D E P L O Y M E N T  D E S C R I P T O R
  
  
  
  1.3       +16 -16    
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/persistence-plugins.xml
  
  Index: persistence-plugins.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/persistence-plugins.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- persistence-plugins.xml   1 Aug 2003 20:15:29 -0000       1.2
  +++ persistence-plugins.xml   13 Aug 2003 21:32:04 -0000      1.3
  @@ -1,50 +1,50 @@
  -<!DOCTYPE plugins SYSTEM "persistence-plugins.dtd">
  +<!DOCTYPE plugins SYSTEM "plugins.dtd">
   <plugins>
        <!-- This is the system default plugin for Jetspeed -->
   
   
        <plugin name="jetspeed" default="true">
                <classname>
  -             org.apache.jetspeed.services.persistence.impl.OJBODMGPersistencePlugin
  +             org.apache.jetspeed.persistence.impl.OJBODMGPersistencePlugin
         </classname>
    
  -      <property name="OJB.path">
  +      <OJB.path>
                WEB-INF/conf/ojb
  -      </property>
  +      </OJB.path>    
         <!-- 
                 - The plugin will resolve the alias based on the
                 - application's root.  Only use use this with
                 - file-system based RDBMSes like HSQL
                 - in stand-alone mode.
          -->
  -      <property name="resolve.db.alias">true</property>
  -     </plugin>
  +      <resolveDbAlias>true</resolveDbAlias>
  +   </plugin>
   
        <!-- Plugin that points to the test DB -->      
        <plugin name="jetspeed-test" >
                <classname>
  -             org.apache.jetspeed.services.persistence.impl.OJBODMGPersistencePlugin
  +             org.apache.jetspeed.persistence.impl.OJBODMGPersistencePlugin
         </classname>
  -      <property name="OJB.path">
  +      <OJB.path>
             WEB-INF/conf/ojb
  -       </property>
  -       <property name="override.default.jcd">
  +       </OJB.path>
  +       <override.default.jcd>
                jetspeed-test
  -      </property>
  +      </override.default.jcd>
        </plugin>
        <!-- Deployment plugin -->
   
   
       <plugin name="jetspeed-deploy" >
                <classname>
  -             org.apache.jetspeed.services.persistence.impl.OJBODMGPersistencePlugin
  +             org.apache.jetspeed.persistence.impl.OJBODMGPersistencePlugin
         </classname>
  -      <property name="OJB.path">
  +      <OJB.path>
             WEB-INF/conf/ojb
  -       </property>
  -       <property name="override.default.jcd">
  +       </OJB.path>
  +       <override.default.jcd>
                jetspeed-deploy
  -      </property>
  +       </override.default.jcd>
        </plugin>       
   
   </plugins>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/plugins.dtd
  
  Index: plugins.dtd
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Art Vandelay (Vendelay 
Industries) -->
  <!--DTD generated by XML Spy v4.4 U (http://www.xmlspy.com)-->
  <!ELEMENT classname (#PCDATA)>
  <!ELEMENT plugin (classname, property*)>
  <!ATTLIST plugin
        name CDATA #REQUIRED
        default CDATA #IMPLIED
  >
  <!ELEMENT plugins (plugin)>
  <!ELEMENT property (#PCDATA)>
  <!ATTLIST property
        name CDATA #REQUIRED
  >
  
  
  
  1.4       +1 -7      
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jetspeed.properties       8 Aug 2003 22:05:55 -0000       1.3
  +++ jetspeed.properties       13 Aug 2003 21:32:04 -0000      1.4
  @@ -19,12 +19,6 @@
   
   
   
  -#--------------------------------------------------------------------
  -# P E R S I S T E N C E    S E R V I C E
  -#--------------------------------------------------------------------
  
-services.PersistenceService.classname=org.apache.jetspeed.services.persistence.JetspeedPersistenceService
  -
  -
   # -------------------------------------------------------------------
   # Page Manager (Castor based)            
   # -------------------------------------------------------------------
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to