Seam SVN: r7314 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-30 13:45:22 -0500 (Wed, 30 Jan 2008)
New Revision: 7314
Modified:
trunk/doc/reference/en/modules/hsearch.xml
Log:
Additional typographical changes to Hibernate Search section
Modified: trunk/doc/reference/en/modules/hsearch.xml
===================================================================
--- trunk/doc/reference/en/modules/hsearch.xml 2008-01-30 18:45:00 UTC (rev 7313)
+++ trunk/doc/reference/en/modules/hsearch.xml 2008-01-30 18:45:22 UTC (rev 7314)
@@ -34,9 +34,9 @@
<filename>META-INF/persistence.xml</filename> or
<filename>hibernate.cfg.xml</filename> file.</para>
- <para>Hibernate Search configuration has sensible defaults for most
- configuration parameters, Here is a description of the minimal
- configuration to get started.</para>
+ <para>Hibernate Search configuration has sensible defaults for most
+ configuration parameters. Here is a minimal persistence unit configuration
+ to get started.</para>
<programlisting> <persistence-unit name="sample">
<jta-data-source>java:/DefaultDS</jta-data-source>
@@ -150,7 +150,8 @@
<para>If the Java Persistence API is used, a smoother integration is
proposed.</para>
- <programlisting>@Name("search")
+ <programlisting>@Stateful
+@Name("search")
public class FullTextSearchAction implements FullTextSearch, Serializable
{
@In
@@ -174,8 +175,8 @@
same way <classname>FullTextSession</classname> extends
<classname>Session</classname>.</para>
- <para>When an EJB 3.0 Session or Message Driven Bean injection is used (ie
- Bean using @PersistenceContext), it is not possible to replace the
+ <para>When an EJB 3.0 Session or Message Driven Bean injection is used (i.e.
+ via the @PersistenceContext annotation), it is not possible to replace the
<classname>EntityManager</classname> interface by the
<classname>FullTextEntityManager</classname> interface in the declaration
statement. However, the implementation injected will be a
16 years, 9 months
Seam SVN: r7313 - branches/Seam_2_0/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-30 13:45:00 -0500 (Wed, 30 Jan 2008)
New Revision: 7313
Modified:
branches/Seam_2_0/doc/reference/en/modules/hsearch.xml
Log:
Additional typographical changes to Hibernate Search section
Modified: branches/Seam_2_0/doc/reference/en/modules/hsearch.xml
===================================================================
--- branches/Seam_2_0/doc/reference/en/modules/hsearch.xml 2008-01-30 18:37:56 UTC (rev 7312)
+++ branches/Seam_2_0/doc/reference/en/modules/hsearch.xml 2008-01-30 18:45:00 UTC (rev 7313)
@@ -34,9 +34,9 @@
<filename>META-INF/persistence.xml</filename> or
<filename>hibernate.cfg.xml</filename> file.</para>
- <para>Hibernate Search configuration has sensible defaults for most
- configuration parameters, Here is a description of the minimal
- configuration to get started.</para>
+ <para>Hibernate Search configuration has sensible defaults for most
+ configuration parameters. Here is a minimal persistence unit configuration
+ to get started.</para>
<programlisting> <persistence-unit name="sample">
<jta-data-source>java:/DefaultDS</jta-data-source>
@@ -150,7 +150,8 @@
<para>If the Java Persistence API is used, a smoother integration is
proposed.</para>
- <programlisting>@Name("search")
+ <programlisting>@Stateful
+@Name("search")
public class FullTextSearchAction implements FullTextSearch, Serializable
{
@In
@@ -174,8 +175,8 @@
same way <classname>FullTextSession</classname> extends
<classname>Session</classname>.</para>
- <para>When an EJB 3.0 Session or Message Driven Bean injection is used (ie
- Bean using @PersistenceContext), it is not possible to replace the
+ <para>When an EJB 3.0 Session or Message Driven Bean injection is used (i.e.
+ via the @PersistenceContext annotation), it is not possible to replace the
<classname>EntityManager</classname> interface by the
<classname>FullTextEntityManager</classname> interface in the declaration
statement. However, the implementation injected will be a
16 years, 9 months
Seam SVN: r7312 - branches/Seam_2_0/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-30 13:37:56 -0500 (Wed, 30 Jan 2008)
New Revision: 7312
Modified:
branches/Seam_2_0/doc/reference/en/modules/hsearch.xml
Log:
The introduction paragraph to Hibernate Search was truly horrible and needed to be rearranged at the very minimum.
Modified: branches/Seam_2_0/doc/reference/en/modules/hsearch.xml
===================================================================
--- branches/Seam_2_0/doc/reference/en/modules/hsearch.xml 2008-01-30 18:37:23 UTC (rev 7311)
+++ branches/Seam_2_0/doc/reference/en/modules/hsearch.xml 2008-01-30 18:37:56 UTC (rev 7312)
@@ -5,23 +5,26 @@
<section>
<title>Introduction</title>
- <para>Full text search engines like Apache Lucene™ are a very powerful
- technology to bring free text/efficient queries to applications. If
- suffers several mismatches when dealing with an object domain model
- (keeping the index up to date, mismatch between the index structure and
- the domain model, querying mismatch...) Hibernate Search indexes your
- domain model thanks to a few annotations, takes care of the database /
- index synchronization and brings you back regular managed objects from
- free text queries. Hibernate Search is using Apache Lucene under the
- cover.</para>
+ <para>Full text search engines like Apache Lucene™ are a very powerful
+ technology that bring full text and efficient queries to applications.
+ Hibernate Search, which uses Apache Lucene under the covers, indexes your
+ domain model with the addition of a few annotations, takes care of the
+ database / index synchronization and returns regular managed objects that
+ are matched by full text queries. Keep in mind, thought, that there are
+ mismatches that arise when dealing with an object domain model over a text
+ index (keeping the index up to date, mismatch between the index structure
+ and the domain model, and querying mismatch). But the benefits of speed
+ and efficiency far outweigh these limitations.</para>
<para>Hibernate Search has been designed to integrates nicely and as
naturally as possible with JPA and Hibernate. As a natural extension,
JBoss Seam provides an Hibernate Search integration.</para>
- <para>Please refer to the <ulink url="???">Hibernate Search
- documentation</ulink> for information specific to the Hibernate Search
- project.</para>
+ <para>Please refer to the <ulink
+ url="http://www.hibernate.org/hib_docs/search/reference/en/html_single/">Hibernate
+ Search documentation</ulink> for information specific to the Hibernate
+ Search project.</para>
+
</section>
<section>
@@ -209,4 +212,4 @@
<para>Check the DVDStore or the blog examples of the JBoss Seam
distribution for a concrete use of Hibernate Search.</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
16 years, 9 months
Seam SVN: r7311 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-30 13:37:23 -0500 (Wed, 30 Jan 2008)
New Revision: 7311
Modified:
trunk/doc/reference/en/modules/hsearch.xml
Log:
The introduction paragraph to Hibernate Search was truly horrible and needed to be rearranged at the very minimum.
Modified: trunk/doc/reference/en/modules/hsearch.xml
===================================================================
--- trunk/doc/reference/en/modules/hsearch.xml 2008-01-30 15:42:43 UTC (rev 7310)
+++ trunk/doc/reference/en/modules/hsearch.xml 2008-01-30 18:37:23 UTC (rev 7311)
@@ -5,23 +5,26 @@
<section>
<title>Introduction</title>
- <para>Full text search engines like Apache Lucene™ are a very powerful
- technology to bring free text/efficient queries to applications. If
- suffers several mismatches when dealing with an object domain model
- (keeping the index up to date, mismatch between the index structure and
- the domain model, querying mismatch...) Hibernate Search indexes your
- domain model thanks to a few annotations, takes care of the database /
- index synchronization and brings you back regular managed objects from
- free text queries. Hibernate Search is using Apache Lucene under the
- cover.</para>
+ <para>Full text search engines like Apache Lucene™ are a very powerful
+ technology that bring full text and efficient queries to applications.
+ Hibernate Search, which uses Apache Lucene under the covers, indexes your
+ domain model with the addition of a few annotations, takes care of the
+ database / index synchronization and returns regular managed objects that
+ are matched by full text queries. Keep in mind, thought, that there are
+ mismatches that arise when dealing with an object domain model over a text
+ index (keeping the index up to date, mismatch between the index structure
+ and the domain model, and querying mismatch). But the benefits of speed
+ and efficiency far outweigh these limitations.</para>
<para>Hibernate Search has been designed to integrates nicely and as
naturally as possible with JPA and Hibernate. As a natural extension,
JBoss Seam provides an Hibernate Search integration.</para>
- <para>Please refer to the <ulink url="???">Hibernate Search
- documentation</ulink> for information specific to the Hibernate Search
- project.</para>
+ <para>Please refer to the <ulink
+ url="http://www.hibernate.org/hib_docs/search/reference/en/html_single/">Hibernate
+ Search documentation</ulink> for information specific to the Hibernate
+ Search project.</para>
+
</section>
<section>
@@ -209,4 +212,4 @@
<para>Check the DVDStore or the blog examples of the JBoss Seam
distribution for a concrete use of Hibernate Search.</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
16 years, 9 months
Seam SVN: r7310 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/core/action and 9 other directories.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-01-30 10:42:43 -0500 (Wed, 30 Jan 2008)
New Revision: 7310
Modified:
trunk/examples/wiki/src/etc/messages_flash_en.properties
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java
trunk/examples/wiki/view/dirDisplay_d.xhtml
trunk/examples/wiki/view/includes/ownerSelector.xhtml
trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml
trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml
trunk/examples/wiki/view/search_d.xhtml
trunk/examples/wiki/view/themes/default/css/template.css
trunk/examples/wiki/view/userList_d.xhtml
Log:
Fixing the bugs introduced yesterday
Modified: trunk/examples/wiki/src/etc/messages_flash_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/messages_flash_en.properties 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/etc/messages_flash_en.properties 2008-01-30 15:42:43 UTC (rev 7310)
@@ -4,5 +4,5 @@
flash.preferences.Height=Height in pixels
flash.preferences.AllowedDomains=Comma-separated list of allowed domain names
-flash.msg.URLNotSupplied=[Flash Macro: Add 'flashURL' macro parameter to embed flash movie.]
+flash.msg.URLNotSupplied=[Flash Macro: Add 'url' macro parameter to embed flash movie.]
flash.msg.URLNotAllowed=[Flash Macro: The flash URL you supplied is not in the list of valid domains, please ask the system administrator to add it.]
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -99,11 +99,9 @@
}
@Override
- protected void checkPersistPermissions() {
+ public boolean isPersistAllowed(WikiComment node, WikiNode parent) {
getLog().trace("checking comment persist permissions");
- if (!Identity.instance().hasPermission("Comment", "create", documentHome.getInstance()) ) {
- throw new AuthorizationException("You don't have permission for this operation");
- }
+ return Identity.instance().hasPermission("Comment", "create", documentHome.getInstance());
}
/* -------------------------- Custom CUD ------------------------------ */
@@ -165,9 +163,9 @@
}
protected String getEditorWorkspaceDescription(boolean create) {
- return "Foo";
+ return null;
}
-
+
/* -------------------------- Internal Methods ------------------------------ */
protected void endConversation() {
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -95,7 +95,7 @@
// Set workspace description of the current conversation
String desc = getEditorWorkspaceDescription(getNodeId() == null);
WikiPreferences prefs = Preferences.getInstance(WikiPreferences.class);
- if (desc.length() > prefs.getWorkspaceSwitcherDescriptionLength()) {
+ if (desc != null && desc.length() > prefs.getWorkspaceSwitcherDescriptionLength()) {
desc = desc.substring(0, prefs.getWorkspaceSwitcherDescriptionLength().intValue()) + "...";
}
Conversation.instance().setDescription(desc);
@@ -149,7 +149,7 @@
getLog().debug("initalized with parent node: " + parentNode);
// Check write access level of the parent node, if the user wants to create a new node
- if (!Identity.instance().hasPermission("Node", "create", parentNode) )
+ if (!isPersistAllowed(node, parentNode))
throw new AuthorizationException("You don't have permission for this operation");
// Default to same access permissions as parent node
@@ -185,7 +185,7 @@
public N beforeNodeEditFound(N node) {
// Check write access level of the node the user wants to edit
- if (!Identity.instance().hasPermission("Node", "edit", node) )
+ if (!isUpdateAllowed(node, null))
throw new AuthorizationException("You don't have permission for this operation");
writeAccessLevel = getAccessLevelsList().get(
@@ -348,23 +348,19 @@
protected void checkPersistPermissions() {
getLog().trace("checking persist permissions");
- if (!Identity.instance().hasPermission("Node", "create", getParentNode()) )
+ if (!isPersistAllowed(getInstance(), getParentNode()))
throw new AuthorizationException("You don't have permission for this operation");
- if (!Identity.instance().hasPermission("Node", "changeAccessLevel", getInstance()))
- throw new AuthorizationException("You don't have permission for this operation");
}
protected void checkUpdatePermissions() {
getLog().trace("checking update permissions");
- if (!Identity.instance().hasPermission("Node", "edit", getInstance()) )
+ if (!isUpdateAllowed(getInstance(), getParentNode()))
throw new AuthorizationException("You don't have permission for this operation");
- if (!Identity.instance().hasPermission("Node", "changeAccessLevel", getInstance()))
- throw new AuthorizationException("You don't have permission for this operation");
}
protected void checkRemovePermissions() {
getLog().trace("checking remove permissions");
- if (!Identity.instance().hasPermission("Node", "edit", getInstance()) )
+ if (!isRemoveAllowed(getInstance(), getParentNode()))
throw new AuthorizationException("You don't have permission for this operation");
}
@@ -377,6 +373,18 @@
);
}
+ public boolean isPersistAllowed(N node, P parent) {
+ return Identity.instance().hasPermission("Node", "create", parent);
+ }
+
+ public boolean isUpdateAllowed(N node, P parent) {
+ return Identity.instance().hasPermission("Node", "edit", node);
+ }
+
+ public boolean isRemoveAllowed(N node, P parent) {
+ return Identity.instance().hasPermission("Node", "edit", node);
+ }
+
/* -------------------------- Optional Subclass Callbacks ------------------------------ */
protected boolean isPageRootController() { return true; }
@@ -412,6 +420,12 @@
*/
protected abstract NodeRemover getNodeRemover();
+ /**
+ * Description (i18n) of workspace switcher item.
+ *
+ * @param create true if editor is initialized to create an item, false if it's used to update an item.
+ * @return String description of workspace switcher item or <tt>null</tt> if no workspace switcher item should be shown.
+ */
protected abstract String getEditorWorkspaceDescription(boolean create);
/* -------------------------- Public Features ------------------------------ */
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiLinkResolver.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -128,9 +128,9 @@
log.debug("trying to resolve link text: " + linkText);
- Matcher wikiProtocolMatcher = Pattern.compile(REGEX_WIKI_PROTOCOL).matcher(linkText);
- Matcher knownProtocolMatcher = Pattern.compile(REGEX_KNOWN_PROTOCOL).matcher(linkText);
- Matcher customProtocolMatcher = Pattern.compile(REGEX_CUSTOM_PROTOCOL).matcher(linkText);
+ Matcher wikiProtocolMatcher = Pattern.compile(REGEX_WIKI_PROTOCOL).matcher(linkText.trim());
+ Matcher knownProtocolMatcher = Pattern.compile(REGEX_KNOWN_PROTOCOL).matcher(linkText.trim());
+ Matcher customProtocolMatcher = Pattern.compile(REGEX_CUSTOM_PROTOCOL).matcher(linkText.trim());
WikiLink wikiLink;
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -239,10 +239,12 @@
throw new RuntimeException(ex);
}
+ /* TODO: This breaks stuff...
// If the user is not logged in, we might as well destroy the session immediately, saving some memory
if (!Identity.instance().isLoggedIn()) {
Session.instance().invalidate();
}
+ */
}
public SyndFeed createSyndFeed(String baseURI, SyndFeedType syndFeedType, Feed feed, Integer currentAccessLevel) {
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -123,10 +123,12 @@
response.getOutputStream().flush();
}
+ /* TODO: This breaks stuff...
// If the user is not logged in, we might as well destroy the session immediately, saving some memory
if (!Identity.instance().isLoggedIn()) {
Session.instance().invalidate();
}
+ */
}
}
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -155,12 +155,9 @@
} else {
// Thumbnail with link display
- // I have no idea why this needs HTML entities for the & symbol -
- // Firefox complains about invalid XML if an & is in an attribute
- // value!
//TODO: Make sure we really don't need this - but it messes up the comment form conversation:
// String thumbnailUrl = WikiUtil.renderURL(image) + "&thumbnail=true&cid=" + Conversation.instance().getId();
- String thumbnailUrl = WikiUtil.renderURL(image) + "&thumbnail=true";
+ String thumbnailUrl = WikiUtil.renderURL(image) + "?thumbnail=true";
return "<a href=\""
+ (link.isBroken() ? link.getUrl() : WikiUtil.renderURL(image))
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -4,10 +4,11 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.faces.Renderer;
import org.jboss.seam.security.Identity;
-import org.jboss.seam.security.AuthorizationException;
import org.jboss.seam.annotations.*;
import org.jboss.seam.wiki.core.action.CommentHome;
import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
+import org.jboss.seam.wiki.core.model.WikiComment;
+import org.jboss.seam.wiki.core.model.WikiNode;
import org.jboss.seam.wiki.preferences.Preferences;
import static javax.faces.application.FacesMessage.SEVERITY_INFO;
@@ -64,19 +65,14 @@
return "redirectToDocument";
}
- /* Forum replies require write permissions on the forum directory */
- public boolean hasReplyPermission() {
+ @Override
+ public boolean isPersistAllowed(WikiComment node, WikiNode parent) {
+ /* Forum replies require write permissions on the forum directory */
Integer currentAccessLevel = (Integer)Component.getInstance("currentAccessLevel");
return Identity.instance().hasPermission("Comment", "create", documentHome.getInstance())
&& (documentHome.getParentNode().getWriteAccessLevel() <= currentAccessLevel);
}
- protected void checkPersistPermissions() {
- if (!hasReplyPermission()) {
- throw new AuthorizationException("You don't have permission for this operation");
- }
- }
-
protected String getFeedEntryManagerName() {
return "forumReplyFeedEntryManager";
}
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-01-30 15:42:43 UTC (rev 7310)
@@ -324,8 +324,8 @@
}
public static boolean isRegularUser(User user) {
- return !(user.getUsername().equals(User.ADMIN_USERNAME) ||
- user.getUsername().equals(User.GUEST_USERNAME));
+ return user != null &&
+ !(user.getUsername().equals(User.ADMIN_USERNAME) || user.getUsername().equals(User.GUEST_USERNAME));
}
/**
Modified: trunk/examples/wiki/view/dirDisplay_d.xhtml
===================================================================
--- trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -230,7 +230,7 @@
</s:div>
<h:panelGrid columns="5" rendered="#{childNodesList.size > 0 and directoryHome.pager.numOfRecords > directoryHome.pager.pageSize}"
- styleClass="pager"
+ styleClass="pager pagerTop"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0">
@@ -287,10 +287,10 @@
headerClass="regularHeader rightBorder alignCenter"
columnClasses="onePercentColumn rightBorder alignCenter, onePercentColumn rightBorder alignCenter,
defaultColumn rightBorder alignLeft wrapWhitespace,
- twentyPercentColumn rightBorder alignLeft wrapWhitespace,
fifteenPercentColumn rightBorder alignLeft wrapWhitespace,
- fifteenPercentColumn rightBorder alignLeft wrapWhitespace,
- fifteenPercentColumn rightBorder alignCenter wrapWhitespace"
+ tenPercentColumn rightBorder alignLeft wrapWhitespace,
+ tenPercentColumn rightBorder alignLeft wrapWhitespace,
+ twentyPercentColumn rightBorder alignCenter wrapWhitespace"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
@@ -483,14 +483,14 @@
<f:facet name="header">
<h:outputText value="#{messages['lacewiki.label.dirDisplay.ReadAccess']}"/>
</f:facet>
- <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 20, '...')}"/>
+ <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 15, '...')}"/>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{messages['lacewiki.label.dirDisplay.WriteAccess']}"/>
</f:facet>
- <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 20, '...')}"/>
+ <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 15, '...')}"/>
</h:column>
<h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
@@ -516,6 +516,57 @@
</h:dataTable>
+ <h:panelGrid columns="5" rendered="#{childNodesList.size > 0 and directoryHome.pager.numOfRecords > directoryHome.pager.pageSize}"
+ styleClass="pager pagerBottom"
+ columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
+ cellpadding="0" cellspacing="0" border="0">
+
+
+ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
+ rendered="#{directoryHome.pager.previousPageAvailable}">
+ <f:param name="page" value="0"/>
+ <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/>
+ </s:link>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
+ rendered="#{!directoryHome.pager.previousPageAvailable}"/>
+
+ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
+ rendered="#{directoryHome.pager.previousPageAvailable}">
+ <f:param name="page" value="#{directoryHome.pager.previousPage}"/>
+ <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/>
+ </s:link>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
+ rendered="#{!directoryHome.pager.previousPageAvailable}"/>
+
+ <s:span>
+ <h:outputText value="#{messages['lacewiki.label.dirDisplay.PagerShowing']}
+ #{directoryHome.pager.firstRecord} #{messages['lacewiki.label.dirDisplay.PagerTo']}
+ #{directoryHome.pager.lastRecord} #{messages['lacewiki.label.dirDisplay.PagerOf']}
+ #{directoryHome.pager.numOfRecords} #{messages['lacewiki.label.dirDisplay.PagerElements']}"/>
+ </s:span>
+
+ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
+ rendered="#{directoryHome.pager.nextPageAvailable}">
+ <f:param name="page" value="#{directoryHome.pager.nextPage}"/>
+ <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/>
+ </s:link>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
+ rendered="#{!directoryHome.pager.nextPageAvailable}"/>
+
+ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
+ rendered="#{directoryHome.pager.nextPageAvailable}">
+ <f:param name="page" value="#{directoryHome.pager.lastPage}"/>
+ <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/>
+ </s:link>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
+ rendered="#{!directoryHome.pager.nextPageAvailable}"/>
+
+ </h:panelGrid>
+
</div>
</h:form>
Modified: trunk/examples/wiki/view/includes/ownerSelector.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -67,7 +67,7 @@
</div>
<s:div id="userPager" style="margin-top:10px;">
- <h:panelGrid columns="5" styleClass="pager"
+ <h:panelGrid columns="5" styleClass="pager pagerTop"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0"
rendered="#{userSearch.rowCount > 0}">
Modified: trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -28,7 +28,7 @@
<s:div id="forumPostingControls" styleClass="forumPostingControls">
- <h:panelGroup rendered="#{not replyHome.showForm and replyHome.hasReplyPermission()}">
+ <h:panelGroup rendered="#{not replyHome.showForm and replyHome.isPersistAllowed(null,null)}">
<s:link tabindex="1"
action="#{replyHome.replyToDocument()}"
@@ -113,7 +113,7 @@
<s:fragment>
- <s:fragment rendered="#{not replyHome.showForm and replyHome.hasReplyPermission()}">
+ <s:fragment rendered="#{not replyHome.showForm and replyHome.isPersistAllowed(null,null)}">
<s:link tabindex="102"
action="#{replyHome.replyTo()}"
Modified: trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -26,14 +26,14 @@
<s:fragment rendered="#{preferences.get('LastModifiedDocuments', currentMacro).showUsernames}">
- <s:span styleClass="undecoratedLink" rendered="#{wiki:isRegularUser(doc.lastModifiedBy)}">
+ (<s:span styleClass="undecoratedLink" rendered="#{wiki:isRegularUser(doc.lastModifiedBy)}">
<h:outputLink value="#{wiki:renderUserInfoURL(doc.lastModifiedBy)}">
<h:outputText value="#{doc.lastModifiedBy.username}"/>
</h:outputLink>
</s:span>
<s:span rendered="#{not wiki:isRegularUser(doc.lastModifiedBy)}">
<h:outputText value="#{doc.lastModifiedBy.username}"/>
- </s:span>
+ </s:span>)
<h:outputText value=" "/>
</s:fragment>
Modified: trunk/examples/wiki/view/search_d.xhtml
===================================================================
--- trunk/examples/wiki/view/search_d.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/search_d.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -141,7 +141,7 @@
</s:div>
<s:div id="searchPager">
- <h:panelGrid columns="5" styleClass="pager"
+ <h:panelGrid columns="5" styleClass="pager pagerTop"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0"
rendered="#{wikiSearch.totalCount > 0}">
Modified: trunk/examples/wiki/view/themes/default/css/template.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/template.css 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/themes/default/css/template.css 2008-01-30 15:42:43 UTC (rev 7310)
@@ -876,7 +876,6 @@
width: 100%;
padding: 0;
margin: 0;
- border-top: 1px solid #C3BBB6;
border-left: 1px solid #C3BBB6;
border-right: 1px solid #C3BBB6;
background: #fff url(../img/th.bg.gif) 0 0 repeat-x;
@@ -890,6 +889,14 @@
font-size: 85%;
}
+.pagerTop {
+ border-top: 1px solid #C3BBB6;
+}
+
+.pagerBottom {
+ border-bottom: 1px solid #C3BBB6;
+}
+
/* Comments
-----------------------------------------------*/
Modified: trunk/examples/wiki/view/userList_d.xhtml
===================================================================
--- trunk/examples/wiki/view/userList_d.xhtml 2008-01-30 12:01:34 UTC (rev 7309)
+++ trunk/examples/wiki/view/userList_d.xhtml 2008-01-30 15:42:43 UTC (rev 7310)
@@ -92,7 +92,7 @@
</div>
<s:div id="userListPager">
- <h:panelGrid columns="5" styleClass="pager"
+ <h:panelGrid columns="5" styleClass="pager pagerTop"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0"
rendered="#{userSearch.rowCount > 0}">
16 years, 10 months
Seam SVN: r7309 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-30 07:01:34 -0500 (Wed, 30 Jan 2008)
New Revision: 7309
Modified:
branches/Seam_2_0/build/root.pom.xml
Log:
Backport of r7308 - JBSEAM-2555
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-01-30 11:58:01 UTC (rev 7308)
+++ branches/Seam_2_0/build/root.pom.xml 2008-01-30 12:01:34 UTC (rev 7309)
@@ -38,7 +38,7 @@
<!-- Externalize some version numbers here -->
<properties>
- <version.richfaces>3.1.3.GA</version.richfaces>
+ <version.richfaces>3.1.4.GA</version.richfaces>
</properties>
<dependencyManagement>
16 years, 10 months
Seam SVN: r7308 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-30 06:58:01 -0500 (Wed, 30 Jan 2008)
New Revision: 7308
Modified:
trunk/build/root.pom.xml
Log:
JBSEAM-2555
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-01-30 11:00:52 UTC (rev 7307)
+++ trunk/build/root.pom.xml 2008-01-30 11:58:01 UTC (rev 7308)
@@ -38,7 +38,7 @@
<!-- Externalize some version numbers here -->
<properties>
- <version.richfaces>3.1.3.GA</version.richfaces>
+ <version.richfaces>3.1.4.GA</version.richfaces>
</properties>
<dependencyManagement>
16 years, 10 months
Seam SVN: r7307 - trunk/examples/seamspace/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 06:00:52 -0500 (Wed, 30 Jan 2008)
New Revision: 7307
Modified:
trunk/examples/seamspace/resources/WEB-INF/pages.xml
Log:
suppress logging of NotLoggedInException
Modified: trunk/examples/seamspace/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-30 11:00:01 UTC (rev 7306)
+++ trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-30 11:00:52 UTC (rev 7307)
@@ -124,7 +124,7 @@
</navigation>
</page>
- <exception class="org.jboss.seam.security.NotLoggedInException">
+ <exception class="org.jboss.seam.security.NotLoggedInException" log="false">
<redirect view-id="/register.xhtml">
<message severity="warn">You must be a member to use this feature</message>
</redirect>
16 years, 10 months
Seam SVN: r7306 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 06:00:01 -0500 (Wed, 30 Jan 2008)
New Revision: 7306
Modified:
trunk/src/main/org/jboss/seam/pages-2.0.xsd
Log:
JBSEAM-2071
Modified: trunk/src/main/org/jboss/seam/pages-2.0.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.0.xsd 2008-01-30 10:58:20 UTC (rev 7305)
+++ trunk/src/main/org/jboss/seam/pages-2.0.xsd 2008-01-30 11:00:01 UTC (rev 7306)
@@ -33,6 +33,8 @@
</xs:element>
<xs:attributeGroup name="attlist.exception">
<xs:attribute name="class"/>
+ <xs:attribute name="log"/>
+ <xs:attribute name="logLevel"/>
</xs:attributeGroup>
<xs:element name="conversation">
<xs:complexType>
16 years, 10 months
Seam SVN: r7305 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 05:58:20 -0500 (Wed, 30 Jan 2008)
New Revision: 7305
Modified:
trunk/doc/reference/en/modules/events.xml
Log:
JBSEAM-2071
Modified: trunk/doc/reference/en/modules/events.xml
===================================================================
--- trunk/doc/reference/en/modules/events.xml 2008-01-30 10:52:55 UTC (rev 7304)
+++ trunk/doc/reference/en/modules/events.xml 2008-01-30 10:58:20 UTC (rev 7305)
@@ -985,7 +985,45 @@
was actually handled by an exception handler. The outermost (wrapper) exception is
also available, as <literal>org.jboss.seam.exception</literal>.
</para>
+
+ <sect3>
+ <title>Suppressing exception logging</title>
+
+ <para>
+ For the exception handlers defined in <literal>pages.xml</literal>, it is possible
+ to declare the logging level at which the exception will be logged, or to even
+ suppress the exception being logged altogether. The attributes <literal>log</literal>
+ and <literal>logLevel</literal> can be used to control exception logging. By setting
+ <literal>log="false"</literal> as per the following example, then no log message will
+ be generated when the specified exception occurs:
+ </para>
+
+ <programlisting><![CDATA[ <exception class="org.jboss.seam.security.NotLoggedInException" log="false">
+ <redirect view-id="/register.xhtml">
+ <message severity="warn">You must be a member to use this feature</message>
+ </redirect>
+ </exception>]]></programlisting>
+
+ <para>
+ If the <literal>log</literal> attribute is not specified, then it defaults to <literal>true</literal>
+ (i.e. the exception will be logged). Alternatively, you can specify the <literal>logLevel</literal>
+ to control at which log level the exception will be logged:
+ </para>
+ <programlisting><![CDATA[ <exception class="org.jboss.seam.security.NotLoggedInException" logLevel="info">
+ <redirect view-id="/register.xhtml">
+ <message severity="warn">You must be a member to use this feature</message>
+ </redirect>
+ </exception>]]></programlisting>
+
+ <para>
+ The acceptable values for <literal>logLevel</literal> are: <literal>fatal, error, warn, info, debug</literal>
+ or <literal>trace</literal>. If the <literal>logLevel</literal> is not specified, or if an invalid value is
+ configured, then it will default to <literal>error</literal>.
+ </para>
+
+ </sect3>
+
</sect2>
<sect2>
16 years, 10 months