[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...

[Christian Bauer]

  User: cbauer  
  Date: 07/12/29 21:33:26

  Modified:    examples/wiki/src/etc/WEB-INF  components.xml
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.34      +20 -5     jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- components.xml	19 Dec 2007 04:29:28 -0000	1.33
  +++ components.xml	30 Dec 2007 02:33:26 -0000	1.34
  @@ -60,7 +60,9 @@
               <value>#{accessLevelFilter}</value>
           </property>
       </component>
  -<!--
  +    <!-- TODO: I want to reset the filter argument when a user logs in, so had to write my own SMPC, this is only
  +               "safe" because a logged-in user means higher access privileges than before, so anything that was
  +               cached in the SMPC before the filter argument is reset has to be still valid. We hope... 
       <persistence:managed-persistence-context name="restrictedEntityManager"
                                         auto-create="true"
                                         entity-manager-factory="#{wikiEntityManagerFactory}"
  @@ -126,12 +128,25 @@
           </property>
       </component>
   
  -    <factory name="themePath" scope="APPLICATION"
  -             value="#{facesContext.externalContext.request.contextPath}/themes/#{wikiPreferences.themeName}"/>
  +    <component name="themePreferenceValueTemplate"
  +               class="org.jboss.seam.wiki.core.preferences.template.ThemeTemplate"
  +               scope="CONVERSATION">
  +        <property name="templateValues">
  +            <value>default</value>
  +            <value>sfwkorg</value>
  +            <!--<value>inrelationto</value>-->
  +        </property>
  +    </component>
  +
  +    <factory name="themePath" scope="CONVERSATION"
  +             value="#{facesContext.externalContext.request.contextPath}/themes/#{preferences.get('Wiki').themeName}"/>
   
       <factory name="skin" scope="SESSION" value="d"/>
   
       <factory name="sessionTimeoutSeconds" scope="SESSION"
                value="#{facesContext.externalContext.getSession(true).getMaxInactiveInterval()}"/>
       
  +    <factory name="currentPreferencesUser" scope="EVENT"
  +             value="#{currentUser}"/>
  +
   </components>