[seam-commits] Seam SVN: r8433 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/core/plugin/metamodel and 3 other directories.

[seam-commits at lists.jboss.org]

Author: christian.bauer at jboss.com
Date: 2008-07-04 13:11:26 -0400 (Fri, 04 Jul 2008)
New Revision: 8433

Modified:
   trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
   trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/PluginModule.java
   trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java
   trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/search/WikiSearch.java
   trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/feed/FeedAggregatorPreferences.java
   trunk/examples/wiki/view/userProfile_d.xhtml
Log:
Minor bugfixes

Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java	2008-07-04 17:11:26 UTC (rev 8433)
@@ -197,12 +197,15 @@
 
     @Observer("org.jboss.seam.security.loggedOut")
     public void resetSessionTime() {
-        // Don't rely on that, do a null check
+        // Don't rely on that, do a null check - this should never be null but sometimes it is... *sigh*
         Object o = Contexts.getSessionContext().get(REGULAR_SESSION_MAX_INACTIVE_SECONDS);
         if (o != null) {
             int regularSessionTimeout = (Integer) o;
             log.debug("resetting timeout of user session after logout to minutes: " + regularSessionTimeout/60);
             ServletContexts.getInstance().getRequest().getSession().setMaxInactiveInterval(regularSessionTimeout);
+        } else {
+            // Safety, reset to a low value, 10 minutes
+            ServletContexts.getInstance().getRequest().getSession().setMaxInactiveInterval(600);
         }
     }
 }

Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/PluginModule.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/PluginModule.java	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/PluginModule.java	2008-07-04 17:11:26 UTC (rev 8433)
@@ -108,4 +108,6 @@
     public String getQualifiedCacheRegionName(String name) {
         return getFullyQualifiedKey() + "." + name;
     }
+
+    public abstract String getModuleTypeLabel();
 }

Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java	2008-07-04 17:11:26 UTC (rev 8433)
@@ -50,4 +50,8 @@
             : result;
     }
 
+    // TODO: This is only used in the Administration UI
+    public String getModuleTypeLabel() {
+        return "Profile";
+    }
 }

Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/search/WikiSearch.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/search/WikiSearch.java	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/search/WikiSearch.java	2008-07-04 17:11:26 UTC (rev 8433)
@@ -74,11 +74,11 @@
 
         // Initialize the value holders used for UI binding
         for (SearchableEntity searchableEntity : searchRegistry.getSearchableEntities()) {
-            log.debug("preparing search value holder for entity: " + searchableEntity.getDescription());
+            log.trace("preparing search value holder for entity: " + searchableEntity.getDescription());
 
             List<PropertySearch> searchesForEntity = new ArrayList<PropertySearch>();
             for (SearchableProperty prop : searchableEntity.getProperties()) {
-                log.debug("preparing search value holder for property: " + prop.getDescription());
+                log.trace("preparing search value holder for property: " + prop.getDescription());
                 searchesForEntity.add(new PropertySearch(prop));
             }
             searches.put(searchableEntity, searchesForEntity);

Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/feed/FeedAggregatorPreferences.java
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/feed/FeedAggregatorPreferences.java	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/feed/FeedAggregatorPreferences.java	2008-07-04 17:11:26 UTC (rev 8433)
@@ -19,7 +19,7 @@
  */
 @Preferences(
     name = "FeedAggregator",
-    description = "#{messages['feed.aggregator.preferences.property.description']}",
+    description = "#{messages['feed.aggregator.preferences.description']}",
     mappedTo = "feed.aggregator"
 )
 public class FeedAggregatorPreferences {

Modified: trunk/examples/wiki/view/userProfile_d.xhtml
===================================================================
--- trunk/examples/wiki/view/userProfile_d.xhtml	2008-07-03 11:12:59 UTC (rev 8432)
+++ trunk/examples/wiki/view/userProfile_d.xhtml	2008-07-04 17:11:26 UTC (rev 8433)
@@ -10,7 +10,7 @@
                 xmlns:c="http://java.sun.com/jstl/core"
                 template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
 
-<ui:param name="hideControls" value="#{not s:hasPermission('User', 'isAdmin', currentUser)}"/>
+<ui:param name="hideControls" value="#{not s:hasPermission('User', 'isAdmin', currentUser) and userHome.instance.id != currentUser.id}"/>
 
 <ui:define name="screenname">
     <h:outputText value="#{messages['lacewiki.label.userProfile.UserProfile']} '#{userHome.instance.username}'"/>