January 2008 - seam-commits - Jboss List Archives

Seam SVN: r7234 - in branches/Seam_1_2_1_AP: src/main/org/jboss/seam/framework and 1 other directory.

by seam-commits＠lists.jboss.org

Author: permaine Date: 2008-01-25 09:21:26 -0500 (Fri, 25 Jan 2008) New Revision: 7234 Added: branches/Seam_1_2_1_AP/examples/remoting/chatroom/resources/chatroom-service.xml.mq Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/framework/Query.java Log: JBPAPP-512 Added: branches/Seam_1_2_1_AP/examples/remoting/chatroom/resources/chatroom-service.xml.mq =================================================================== --- branches/Seam_1_2_1_AP/examples/remoting/chatroom/resources/chatroom-service.xml.mq (rev 0) +++ branches/Seam_1_2_1_AP/examples/remoting/chatroom/resources/chatroom-service.xml.mq 2008-01-25 14:21:26 UTC (rev 7234) @@ -0,0 +1,18 @@ +<server> + + <mbean code="org.jboss.mq.server.jmx.Topic" + name="jboss.mq.destination:service=Topic,name=chatroomTopic"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends> + <attribute name="SecurityConf"> + <security> + <role name="guest" read="true" write="true"/> + <role name="publisher" read="true" write="true" create="false"/> + + <role name="durpublisher" read="true" write="true" create="true"/> + </security> + </attribute> + </mbean> + +</server> + Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/framework/Query.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/framework/Query.java 2008-01-25 13:45:17 UTC (rev 7233) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/framework/Query.java 2008-01-25 14:21:26 UTC (rev 7234) @@ -30,6 +30,9 @@ private static final Pattern ORDER_PATTERN = Pattern.compile("\\s(order)(\\s)+by\\s", Pattern.CASE_INSENSITIVE); private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE); + private static final Pattern ORDER_CLAUSE_PATTERN = Pattern.compile("^[\\w\\.,\\s]*$"); + + private String ejbql; private Integer firstResult; private Integer maxResults; @@ -259,7 +262,11 @@ public void setOrder(String order) { + if (order!= null && !ORDER_CLAUSE_PATTERN.matcher(order).find()) { + throw new IllegalArgumentException("invalid order clause"); + } this.order = order; + refresh(); } protected List<ValueBinding> getQueryParameters()

16 years, 3 months

1
0
0 / 0

Seam SVN: r7233 - trunk/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-25 08:45:17 -0500 (Fri, 25 Jan 2008) New Revision: 7233 Modified: trunk/doc/reference/en/modules/conversations.xml Log: Remove explicit conversation id docs, merge in blog article to natural conversation docs Modified: trunk/doc/reference/en/modules/conversations.xml =================================================================== --- trunk/doc/reference/en/modules/conversations.xml 2008-01-25 12:56:35 UTC (rev 7232) +++ trunk/doc/reference/en/modules/conversations.xml 2008-01-25 13:45:17 UTC (rev 7233) @@ -559,61 +559,71 @@ </section> <section> - <title>Using an "explicit" conversation id</title> - <para> - Ordinarily, Seam generates a meaningless unique id for each conversation - in each session. You can customize the id value when you begin the - conversation. - </para> - - <para> - This feature can be used to customize the conversation id generation - algorithm like so: - </para> - - <programlisting><![CDATA[@Begin(id="#{myConversationIdGenerator.nextId}") -public void editHotel() { ... }]]></programlisting> - - <para> - Or it can be used to assign a meaningful conversation id: - </para> - - <programlisting><![CDATA[@Begin(id="hotel#{hotel.id}") -public String editHotel() { ... }]]></programlisting> - - <programlisting><![CDATA[@Begin(id="hotel#{hotelsDataModel.rowData.id}") -public String selectHotel() { ... }]]></programlisting> - - <programlisting><![CDATA[@Begin(id="entry#{params['blogId']}") -public String viewBlogEntry() { ... }]]></programlisting> - - <programlisting><![CDATA[@BeginTask(id="task#{taskInstance.id}") -public String approveDocument() { ... }]]></programlisting> - - <para> - Clearly, these example result in the same conversation id every time - a particular hotel, blog or task is selected. So what happens if a conversation - with the same conversation id already exists when the new conversation - begins? Well, Seam detects the existing conversation and redirects - to that conversation without running the <literal>@Begin</literal> - method again. This feature helps control the number of workspaces - that are created when using workspace management. - </para> - - </section> - - <section> <title>Natural conversation ids</title> <para> When working with conversations that deal with persistent objects, it may be desirable to use the natural business key of the object instead of the standard, - "surrogate" conversation id. + "surrogate" conversation id: </para> + <itemizedlist> + <listitem> + <para> + <emphasis>Easy redirect to existing conversation</emphasis> + </para> + <para> + It can be useful to redirect to an existing conversation if + the user requests the same operation twice. Take this example: + </para> + <quote> + You are on ebay, half way through paying for an item you just + won as a Christmas present for your parents. Lets say you're + sending it straight to them - you enter your payment details + but you can't remember their address. You accidentally reuse + the same browser window finding out their address. Now you + need to return to the payment for the item. + </quote> + <para> + With a natural conversation its really easy to have the user + rejoin the existing conversation, and pick up where they left + off - just have them to rejoin the payForItem conversation + with the itemId as the conversation id. + </para> + </listitem> + <listitem> + <para> + <emphasis>User friendly URLs</emphasis> + </para> + + <para> + For me this consists of a navigable + hierarchy (I can navigate by editing the url) and a meaningful + URL (like this Wiki uses - so don't identify things by random + ids). For some applications user friendly URLs are less + important, of course. + </para> + + <para> + With a natural conversations, when you are building your hotel + booking system (or, of course, whatever your app is) you can + generate a URL like + <literal>http://seam-hotels/book.seam?hotel=BestWesternAntwerpen</literal> + (of course, whatever parameter <literal>hotel</literal> maps + to on your domain model must be unique) and with URLRewrite + easily transform this to + http://seam-hotels/book/BestWesternAntwerpen. + </para> + + <para> + Much better! + </para> + </listitem> + </itemizedlist> + <section> - <title>Configuration</title> + <title>Creating a natural conversation</title> <para> - Natural conversations are configured in <literal>pages.xml</literal>: + Natural conversations are defined in <literal>pages.xml</literal>: </para> <programlisting><![CDATA[ <conversation name="PlaceBid" @@ -621,7 +631,7 @@ parameter-value="#{auction.auctionId}"/>]]></programlisting> <para> - The first thing to note from the above configuration is that the conversation + The first thing to note from the above definition is that the conversation has a name, in this case <literal>PlaceBid</literal>. This name uniquely identifies this particular named conversation, and is used by the <literal>page</literal> definition to identify a named conversation to participate @@ -631,8 +641,7 @@ <para> The next attribute, <literal>parameter-name</literal> defines the request parameter that will contain the natural conversation id, in place of the default conversation - id parameter (which is typically either <literal>cid</literal> or <literal>conversationId</literal>). - In this example, the <literal>parameter-name</literal> is <literal>auctionId</literal>. + id parameter. In this example, the <literal>parameter-name</literal> is <literal>auctionId</literal>. This means that instead of a conversation parameter like <literal>cid=123</literal> appearing in the URL for your page, it will contain <literal>auctionId=765432</literal> instead. @@ -646,7 +655,7 @@ </para> <para> - The next step is to configure which pages will participate in the named conversation. + Next, we define which pages will participate in the named conversation. This is done by specifying the <literal>conversation</literal> attribute for a <literal>page</literal> definition: </para> @@ -669,7 +678,7 @@ <para> When starting, or redirecting to, a natural conversation there are a number of options for specifying the natural conversation name. Let's start by looking at - the following page configuration: + the following page definition: </para> <programlisting><![CDATA[ <page view-id="/auction.xhtml"> @@ -683,7 +692,7 @@ <para> From here, we can see that invoking the action <literal>#{bidAction.placeBid}</literal> from our auction view (by the way, all these examples are taken from the seamBay example in Seam), - that we will be redirected to <literal>/bid.xhtml</literal>, which as we saw previously + that we will be redirected to <literal>/bid.xhtml</literal>, which, as we saw previously, is configured with the natural conversation <literal>PlaceBid</literal>. The declaration for our action method looks like this: </para> @@ -696,7 +705,7 @@ redirection to the named conversation occurs as part of navigation rules, after the action method has already been invoked. This is a problem when redirecting to an existing conversation, as redirection needs to be occur before the action method is - invoked. To cater for this, it is necessary to specify the conversation name when + invoked. Therefore it is necessary to specify the conversation name when the action is invoked. One way of doing this is by using the <literal>s:conversationName</literal> tag: </para>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7232 - in trunk/src: main/META-INF and 3 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-25 07:56:35 -0500 (Fri, 25 Jan 2008) New Revision: 7232 Added: trunk/src/jbas5/META-INF/seam-deployment.properties trunk/src/main/META-INF/seam-deployment.properties trunk/src/main/org/jboss/seam/bpm/JbpmDeploymentHandler.java Removed: trunk/src/jbas5/META-INF/seam-scanner.properties Modified: trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/DeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java trunk/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java trunk/src/main/org/jboss/seam/deployment/NamespaceDeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java trunk/src/main/org/jboss/seam/init/Initialization.java Log: JBSEAM-1342 Copied: trunk/src/jbas5/META-INF/seam-deployment.properties (from rev 7222, trunk/src/jbas5/META-INF/seam-scanner.properties) =================================================================== --- trunk/src/jbas5/META-INF/seam-deployment.properties (rev 0) +++ trunk/src/jbas5/META-INF/seam-deployment.properties 2008-01-25 12:56:35 UTC (rev 7232) @@ -0,0 +1 @@ +org.jboss.seam.deployment.scanners=org.jboss.seam.as5.vfs.VFSScanner Deleted: trunk/src/jbas5/META-INF/seam-scanner.properties =================================================================== --- trunk/src/jbas5/META-INF/seam-scanner.properties 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/jbas5/META-INF/seam-scanner.properties 2008-01-25 12:56:35 UTC (rev 7232) @@ -1 +0,0 @@ -org.jboss.seam.deployment.scanners=org.jboss.seam.as5.vfs.VFSScanner:org.jboss.seam.deployment.URLScanner Added: trunk/src/main/META-INF/seam-deployment.properties =================================================================== Property changes on: trunk/src/main/META-INF/seam-deployment.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/org/jboss/seam/bpm/JbpmDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/bpm/JbpmDeploymentHandler.java (rev 0) +++ trunk/src/main/org/jboss/seam/bpm/JbpmDeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -0,0 +1,46 @@ +package org.jboss.seam.bpm; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.deployment.AbstractDeploymentHandler; + +/** + * Handles jBPM resources discovered on scan + * + * TODO Hook this into the Jbpm component + * + * @author Pete Muir + * + */ +public class JbpmDeploymentHandler extends AbstractDeploymentHandler +{ + + private List<String> jpdlResources; + + public JbpmDeploymentHandler() + { + jpdlResources = new ArrayList<String>(); + } + + public static final String NAME = "org.jboss.seam.bpm.JbpmDeploymentHandler"; + + public String getName() + { + return NAME; + } + + public void handle(String name, ClassLoader classLoader) + { + if ( name.endsWith(".jpdl.xml") && !name.startsWith(".gpd") ) + { + jpdlResources.add(name); + } + } + + public List<String> getJpdlResources() + { + return jpdlResources; + } + +} Property changes on: trunk/src/main/org/jboss/seam/bpm/JbpmDeploymentHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -93,6 +93,10 @@ } - + @Override + public String toString() + { + return getName(); + } } Modified: trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -105,4 +105,9 @@ return name.substring( 0, name.lastIndexOf(".class") ) + ".component.xml"; } + public String getName() + { + return NAME; + } + } Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/DeploymentHandler.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/DeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -17,4 +17,10 @@ * @param classLoader The ClassLoader on which the resource was found */ public void handle(String name, ClassLoader classLoader); + + /** + * A key used to identify the deployment handler + */ + public String getName(); + } Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -2,19 +2,22 @@ import static org.jboss.seam.util.Strings.split; +import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashMap; -import java.util.Locale; +import java.util.List; import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import java.util.Properties; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; /** - * A {@link DeploymentStrategy} coordinates the deploy of resources for a Seam + * A {@link DeploymentStrategy} coordinates the deployment of resources for a Seam * application. * * @author Pete Muir @@ -29,25 +32,104 @@ private Map<String, DeploymentHandler> deploymentHandlers; - public DeploymentStrategy() + /** + * The key under which to list possible scanners. System properties take + * precedence over /META-INF/seam-scanner.properties. Entries will be tried + * in sequential order until a Scanner can be loaded. + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + public static final String SCANNERS_KEY = "org.jboss.seam.deployment.scanners"; + + + + /** + * The resource bundle used to control Seam deployment + */ + public static final String RESOURCE_BUNDLE = "META-INF/seam-deployment.properties"; + + // All resource bundles to use, including legacy names + private static final String[] RESOURCE_BUNDLES = { RESOURCE_BUNDLE, "META-INF/seam-scanner.properties" }; + + /** + * Get a list of possible values for a given key. + * + * First, System properties are tried, followed by the specified resource + * bundle (first in classpath only). + * + * Colon (:) deliminated lists are split out. + * + */ + protected List<String> getPropertyValues(String key) { - this.deploymentHandlers = new HashMap<String, DeploymentHandler>(); + List<String>values = new ArrayList<String>(); + addPropertyFromSystem(key, values); + addPropertyFromResourceBundle(key, values); + return values; } + private void addPropertyFromSystem(String key, List<String> values) + { + addProperty(key, System.getProperty(key), values); + } + + private void addPropertyFromResourceBundle(String key, List<String> values) + { + for (String resourceName : RESOURCE_BUNDLES) + { + try + { + // Hard to cache as we have to get it off the correct classloader + Enumeration<URL> urlEnum = getClassLoader().getResources(resourceName); + while ( urlEnum.hasMoreElements() ) + { + URL url = urlEnum.nextElement(); + Properties properties = new Properties(); + properties.load(url.openStream()); + addProperty(key, properties.getProperty(key), values); + } + } + catch (IOException e) + { + // No-op, optional file + } + } + } + + /* + * Add the property to the set of properties only if it hasn't already been added + */ + private void addProperty(String key, String value, List<String> values) + { + if (value != null) + { + String[] properties = split(value, ":"); + for (String property : properties) + { + values.add(property); + } + + } + } + /** * Do the scan for resources * + * Should only be called by Seam + * */ public abstract void scan(); /** * Get the scanner being used + * */ protected Scanner getScanner() { if (scanner == null) { - scanner = createScanner(); + initScanner(); } return scanner; } @@ -65,9 +147,21 @@ */ public Map<String, DeploymentHandler> getDeploymentHandlers() { + if (deploymentHandlers == null) + { + initDeploymentHandlers(); + } return this.deploymentHandlers; } + + private void initDeploymentHandlers() + { + this.deploymentHandlers = new HashMap<String, DeploymentHandler>(); + addHandlers(getPropertyValues(getDeploymentHandlersKey())); + } + protected abstract String getDeploymentHandlersKey(); + /** * Handle a resource using any registered {@link DeploymentHandler}s * @@ -77,78 +171,27 @@ { for (String key: getDeploymentHandlers().keySet()) { - DeploymentHandler deploymentHandler = getDeploymentHandlers().get(key); - deploymentHandler.handle(name, getClassLoader()); + getDeploymentHandlers().get(key).handle(name, getClassLoader()); } } - - private Scanner createScanner() + + private void initScanner() { - Scanner scanner = getScannerFromResource(); - if (scanner == null) + List<String> scanners = getPropertyValues(SCANNERS_KEY); + for ( String className : scanners ) { - scanner = getScannerFromSystemProperty(); - } - if (scanner == null) - { - log.debug("Using default URLScanner"); - scanner = new URLScanner(this); - } - return scanner; - } - - private Scanner getScannerFromSystemProperty() - { - String scanners = System.getProperty("org.jboss.seam.deployment.scanners"); - if (scanners != null) - { - log.debug("Tring to load scanner from system property"); - Scanner scanner = loadScanner(scanners); + Scanner scanner = instantiateScanner(className); if (scanner != null) { - log.debug("Using " + scanner.getClass().getName() + " specified in /META-INF/seam-scanner.properties"); - return scanner; - } + log.debug("Using " + scanner.toString()); + this.scanner = scanner; + return; + } } - return null; + log.debug("Using default URLScanner"); + this.scanner = new URLScanner(this); } - private Scanner getScannerFromResource() - { - // Load seam-scanner.properties from the classpath, try to - // load any scanners specified there - try - { - String scanners = ResourceBundle.getBundle("META-INF/seam-scanner", Locale.getDefault(), getClassLoader()).getString("org.jboss.seam.deployment.scanners"); - log.debug("Tring to load scanner from /META-INF/seam-scanner.properties"); - Scanner scanner = loadScanner(scanners); - if (scanner != null) - { - log.debug("Using " + scanner.getClass().getName() + " specified in /META-INF/seam-scanner.properties"); - return scanner; - } - log.debug("Unable to load any scanner from /META-INF/seam-scanner.properties"); - } - catch (MissingResourceException e) - { - // no-op - } - return null; - } - - private Scanner loadScanner(String scanners) - { - for (String className : split(scanners, ":")) - { - Scanner scanner = instantiateScanner(className); - if (scanner != null) - { - return scanner; - } - } - return null; - } - private Scanner instantiateScanner(String className) { try @@ -196,4 +239,48 @@ return null; } + private void addHandlers(List<String> handlers) + { + for (String handler : handlers) + { + addHandler(handler); + } + } + + private void addHandler(String className) + { + DeploymentHandler deploymentHandler = instantiateDeploymentHandler(className); + if (deploymentHandler != null) + { + log.debug("Adding " + deploymentHandler + " as a deployment handler"); + deploymentHandlers.put(deploymentHandler.getName(), deploymentHandler); + } + } + + private DeploymentHandler instantiateDeploymentHandler(String className) + { + try + { + Class<DeploymentHandler> clazz = (Class<DeploymentHandler>) getClassLoader().loadClass(className); + return clazz.newInstance(); + } + catch (ClassNotFoundException e) + { + log.trace("Unable to use " + className + " as a deployment handler (class not found)", e); + } + catch (NoClassDefFoundError e) + { + log.trace("Unable to use " + className + " as a deployment handler (dependency not found)", e); + } + catch (InstantiationException e) + { + log.trace("Unable to instantiate deployment handler " + className, e); + } + catch (IllegalAccessException e) + { + log.trace("Unable to instantiate deployment handler " + className, e); + } + return null; + } + } Modified: trunk/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -133,5 +133,10 @@ { return name.substring(0, name.lastIndexOf(groovyFileExtension)) + ".component.xml"; } + + public String getName() + { + return NAME; + } } Modified: trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -7,6 +7,7 @@ import java.net.URLClassLoader; import java.util.Set; +import org.jboss.seam.contexts.Contexts; import org.jboss.seam.util.Reflections; /** @@ -20,8 +21,30 @@ /** * The default path at which hot deployable Seam components are placed */ - public static final String HOT_DEPLOYMENT_DIRECTORY_PATH = "WEB-INF/dev"; + public static final String DEFAULT_HOT_DEPLOYMENT_DIRECTORY_PATH = "WEB-INF/dev"; + /** + * The contextual variable name this deployment strategy is made available at + * during Seam startup. + */ + public static final String NAME = "org.jboss.seam.deployment.hotDeploymentStrategy"; + + /** + * The key under which to list extra hot deployment directories + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + //public static final String HOT_DEPLOY_DIRECTORIES_KEY = "org.jboss.seam.deployment.hotDeploymentDirectories"; + + /** + * The key under which to list extra deployment handlers. + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + public static final String HANDLERS_KEY = "org.jboss.seam.deployment.hotDeploymentHandlers"; + private ClassLoader hotDeployClassLoader; private File[] hotDeploymentPaths; @@ -37,7 +60,7 @@ { initHotDeployClassLoader(classLoader, hotDeployDirectory); componentDeploymentHandler = new ComponentDeploymentHandler(); - getDeploymentHandlers().put(ComponentDeploymentHandler.NAME, componentDeploymentHandler); + getDeploymentHandlers().put(ComponentDeploymentHandler.NAME, componentDeploymentHandler); } private void initHotDeployClassLoader(ClassLoader classLoader, File hotDeployDirectory) @@ -58,6 +81,12 @@ throw new RuntimeException(mue); } } + + @Override + protected String getDeploymentHandlersKey() + { + return HANDLERS_KEY; + } /** * Get all hot deployable paths @@ -118,4 +147,14 @@ getScanner().scanDirectories(getHotDeploymentPaths()); } + + public static HotDeploymentStrategy instance() + { + if (Contexts.getEventContext().isSet(NAME)) + { + return (HotDeploymentStrategy) Contexts.getEventContext().get(NAME); + } + return null; + } + } Modified: trunk/src/main/org/jboss/seam/deployment/NamespaceDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/NamespaceDeploymentHandler.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/NamespaceDeploymentHandler.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -74,5 +74,10 @@ return null; } } + + public String getName() + { + return NAME; + } } Modified: trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -2,6 +2,8 @@ import java.util.Set; +import org.jboss.seam.contexts.Contexts; + /** * The standard deployment strategy used with Seam, deploys non-hot-deployable * Seam components and namespaces @@ -14,7 +16,24 @@ private ClassLoader classLoader; + /** + * The files used to identify a Seam archive + */ public static final String[] RESOURCE_NAMES = {"seam.properties", "META-INF/seam.properties", "META-INF/components.xml"}; + + /** + * The contextual variable name this deployment strategy is made available at + * during Seam startup. + */ + public static final String NAME = "org.jboss.seam.deployment.deploymentStrategy"; + + /** + * The key under which to list extra deployment handlers. + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + public static final String HANDLERS_KEY = "org.jboss.seam.deployment.deploymentHandlers"; private ComponentDeploymentHandler componentDeploymentHandler; private NamespaceDeploymentHandler namespaceDeploymentHandler; @@ -36,6 +55,12 @@ { return classLoader; } + + @Override + protected String getDeploymentHandlersKey() + { + return HANDLERS_KEY; + } /** * Get all scanned and handled annotated components known to this strategy @@ -67,4 +92,12 @@ getScanner().scanResources(RESOURCE_NAMES); } + public static StandardDeploymentStrategy instance() + { + if (Contexts.getEventContext().isSet(NAME)) + { + return (StandardDeploymentStrategy) Contexts.getEventContext().get(NAME); + } + return null; + } } Modified: trunk/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-01-25 12:54:42 UTC (rev 7231) +++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-01-25 12:56:35 UTC (rev 7232) @@ -5,6 +5,7 @@ */ package org.jboss.seam.init; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -75,7 +76,7 @@ private Map<String, EventListenerDescriptor> eventListenerDescriptors = new HashMap<String, EventListenerDescriptor>(); private Collection<String> globalImports = new ArrayList<String>(); - private StandardDeploymentStrategy deploymentStrategy; + private StandardDeploymentStrategy standardDeploymentStrategy; private HotDeploymentStrategy hotDeploymentStrategy; private Set<String> nonPropertyAttributes = new HashSet<String>(); @@ -98,8 +99,8 @@ public Initialization create() { - deploymentStrategy = new StandardDeploymentStrategy(Thread.currentThread().getContextClassLoader()); - deploymentStrategy.scan(); + standardDeploymentStrategy = new StandardDeploymentStrategy(Thread.currentThread().getContextClassLoader()); + standardDeploymentStrategy.scan(); addNamespaces(); initComponentsFromXmlDocument("/WEB-INF/components.xml"); initComponentsFromXmlDocument("/WEB-INF/events.xml"); //deprecated @@ -552,7 +553,7 @@ public Initialization init() { log.info("initializing Seam"); - if (deploymentStrategy == null) + if (standardDeploymentStrategy == null) { throw new IllegalStateException("No deployment strategy!"); } @@ -573,6 +574,14 @@ init.setHotDeployPaths( hotDeploymentStrategy.getHotDeploymentPaths() ); } addSpecialComponents(init); + + // Make the deployment strategies available in the contexts. This gives + // access to custom deployment handlers for processing custom annotations + // etc. + + Contexts.getEventContext().set(StandardDeploymentStrategy.NAME, standardDeploymentStrategy); + Contexts.getEventContext().set(HotDeploymentStrategy.NAME, hotDeploymentStrategy); + installComponents(init); for (String globalImport: globalImports) @@ -647,10 +656,10 @@ private static File getHotDeployDirectory(ServletContext servletContext) { - String path = servletContext.getRealPath(HotDeploymentStrategy.HOT_DEPLOYMENT_DIRECTORY_PATH); + String path = servletContext.getRealPath(HotDeploymentStrategy.DEFAULT_HOT_DEPLOYMENT_DIRECTORY_PATH); if (path==null) //WebLogic! { - log.debug("Could not find path for " + HotDeploymentStrategy.HOT_DEPLOYMENT_DIRECTORY_PATH); + log.debug("Could not find path for " + HotDeploymentStrategy.DEFAULT_HOT_DEPLOYMENT_DIRECTORY_PATH); } else { @@ -684,15 +693,15 @@ private void scanForComponents() { - for ( Class<Object> scannedClass: deploymentStrategy.getScannedComponentClasses() ) + for ( Class<Object> scannedClass: standardDeploymentStrategy.getScannedComponentClasses() ) { installScannedComponentAndRoles(scannedClass); } - for ( String name: deploymentStrategy.getScannedComponentResources() ) + for ( String name: standardDeploymentStrategy.getScannedComponentResources() ) { - installComponentsFromDescriptor( name, deploymentStrategy.getClassLoader() ); + installComponentsFromDescriptor( name, standardDeploymentStrategy.getClassLoader() ); } } @@ -783,7 +792,7 @@ private void addNamespaces() { - for ( Package pkg : deploymentStrategy.getScannedNamespaces() ) + for ( Package pkg : standardDeploymentStrategy.getScannedNamespaces() ) { addNamespace(pkg); } @@ -871,7 +880,7 @@ { try { - Reflections.classForName("org.jboss.cache.aop.PojoCache"); + Reflections.classForName("org.jboss.cache.pojo.PojoCache"); addComponentDescriptor( new ComponentDescriptor(PojoCache.class, true) ); } catch (ClassNotFoundException e) {}

16 years, 3 months

1
0
0 / 0

Seam SVN: r7231 - trunk/src/main/org/jboss/seam/deployment.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-25 07:54:42 -0500 (Fri, 25 Jan 2008) New Revision: 7231 Modified: trunk/src/main/org/jboss/seam/deployment/URLScanner.java Log: Better error handling Modified: trunk/src/main/org/jboss/seam/deployment/URLScanner.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-01-25 12:52:56 UTC (rev 7230) +++ trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-01-25 12:54:42 UTC (rev 7231) @@ -9,6 +9,7 @@ import java.util.HashSet; import java.util.Set; import java.util.zip.ZipEntry; +import java.util.zip.ZipException; import java.util.zip.ZipFile; import org.jboss.seam.log.LogProvider; @@ -107,15 +108,22 @@ private void handleArchiveByFile(File file) throws IOException { - log.debug("archive: " + file); - ZipFile zip = new ZipFile(file); - Enumeration<? extends ZipEntry> entries = zip.entries(); - while ( entries.hasMoreElements() ) + try { - ZipEntry entry = entries.nextElement(); - String name = entry.getName(); - handleItem(name); + log.debug("archive: " + file); + ZipFile zip = new ZipFile(file); + Enumeration<? extends ZipEntry> entries = zip.entries(); + while ( entries.hasMoreElements() ) + { + ZipEntry entry = entries.nextElement(); + String name = entry.getName(); + handleItem(name); + } } + catch (ZipException e) + { + throw new RuntimeException("Error handling file " + file, e); + } } private void handleDirectory(File file, String path)

16 years, 3 months

1
0
0 / 0

Seam SVN: r7230 - trunk/bootstrap.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-01-25 07:52:56 -0500 (Fri, 25 Jan 2008) New Revision: 7230 Modified: trunk/bootstrap/ Log: ignores Property changes on: trunk/bootstrap ___________________________________________________________________ Name: svn:ignore + data tmp

16 years, 3 months

1
0
0 / 0

Seam SVN: r7229 - in trunk/examples/wiki: src/etc/WEB-INF and 18 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-01-25 06:24:26 -0500 (Fri, 25 Jan 2008) New Revision: 7229 Added: trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopPostersPreferences.java trunk/examples/wiki/view/plugins/forumTopPosters/ trunk/examples/wiki/view/plugins/forumTopPosters/plugin.xhtml trunk/examples/wiki/view/themes/default/img/star.gif trunk/examples/wiki/view/themes/default/img/star_grey.gif trunk/examples/wiki/view/themes/sfwkorg/img/star.gif trunk/examples/wiki/view/themes/sfwkorg/img/star_grey.gif Modified: trunk/examples/wiki/src/etc/WEB-INF/components.xml trunk/examples/wiki/src/etc/import-prod.sql trunk/examples/wiki/src/etc/messages_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/NodeRemover.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumDAO.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/KnowledgeBase.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/UploadData.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java trunk/examples/wiki/view/docDisplay_d.xhtml trunk/examples/wiki/view/includes/commentsDisplay.xhtml trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml trunk/examples/wiki/view/themes/default/css/forumReplies.css trunk/examples/wiki/view/themes/default/css/template.css trunk/examples/wiki/view/themes/default/template.xhtml trunk/examples/wiki/view/themes/sfwkorg/css/forumReplies.css trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css trunk/examples/wiki/view/themes/sfwkorg/template.xhtml trunk/examples/wiki/view/userInfo_d.xhtml Log: Rating system for comments and top posters plugin Modified: trunk/examples/wiki/src/etc/WEB-INF/components.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -120,6 +120,7 @@ <value>messages_jiraConnector</value> <value>messages_feedAggregator</value> <value>messages_feedConnector</value> + <value>messages_forumTopPosters</value> </core:bundle-names> </core:resource-loader> Modified: trunk/examples/wiki/src/etc/import-prod.sql =================================================================== --- trunk/examples/wiki/src/etc/import-prod.sql 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/etc/import-prod.sql 2008-01-25 11:24:26 UTC (rev 7229) @@ -19,38 +19,69 @@ INSERT INTO PREFERENCE VALUES(16,'Wiki','showTags',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(17,'Wiki','showEmailToLoggedInOnly',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(18,'Wiki','trashArea',NULL,NULL,NULL,NULL,'Trash',0,NULL) +INSERT INTO PREFERENCE VALUES(19,'Wiki','showSiteFeedInMenu',NULL,NULL,NULL,TRUE,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(20,'DocEditor','minorRevisionEnabled',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(21,'DocEditor','regularEditAreaRows',15,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(22,'DocEditor','regularEditAreaColumns',65,NULL,NULL,NULL,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(30,'UserManagement','activationCodeSalt',NULL,NULL,NULL,NULL,'MySecretSalt123',0,NULL) INSERT INTO PREFERENCE VALUES(31,'UserManagement','passwordRegex',NULL,NULL,NULL,NULL,'^[0-9A-Za-z]{6,15}',0,NULL) INSERT INTO PREFERENCE VALUES(32,'UserManagement','newUserInRole',NULL,NULL,NULL,NULL,'member',0,NULL) INSERT INTO PREFERENCE VALUES(33,'UserManagement','enableRegistration',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(34,'UserManagement','createHomeAfterUserActivation',NULL,NULL,NULL,FALSE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(35,'UserManagement','homepageDefaultContent',NULL,NULL,NULL,NULL,'This is your homepage, login to edit it.',0,NULL) + INSERT INTO PREFERENCE VALUES(40,'Comments','listAscending',NULL,NULL,NULL,FALSE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(41,'Comments','enableByDefault',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(42,'Comments','threaded',NULL,NULL,NULL,TRUE,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(110,'LastModifiedDocuments','numberOfItems',5,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(111,'LastModifiedDocuments','showUsernames',NULL,NULL,NULL,TRUE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(112,'LastModifiedDocuments','documentTitleLength',20,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(113,'LastModifiedDocuments','title',NULL,NULL,NULL,NULL,'Last Site Updates',0,NULL) + INSERT INTO PREFERENCE VALUES(120,'Blog','pageSize',5,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(121,'Blog','archiveSubscribeIcon',NULL,NULL,NULL,FALSE,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(122,'Blog','recentEntriesItems',10,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(123,'Blog','recentEntriesTruncateTitle',40,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(124,'Blog','recentEntriesSubscribeIcon',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(130,'FeedTeasers','title',NULL,NULL,NULL,NULL,'Site news feed:',0,NULL) + +INSERT INTO PREFERENCE VALUES(130,'FeedTeasers','title',NULL,NULL,NULL,NULL,'Site news feed',0,NULL) INSERT INTO PREFERENCE VALUES(131,'FeedTeasers','numberOfTeasers',5,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(132,'FeedTeasers','truncateDescription',200,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(133,'FeedTeasers','showAuthor',NULL,NULL,NULL,TRUE,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(140,'Flash','allowedDomains',NULL,NULL,NULL,NULL,'video.google.com,www.youtube.com',0,NULL) + INSERT INTO PREFERENCE VALUES(150,'DirMenu','title',NULL,NULL,NULL,NULL,'Directory Menu',0,NULL) INSERT INTO PREFERENCE VALUES(151,'DirMenu','menuLevels',3,NULL,NULL,NULL,NULL,0,NULL) INSERT INTO PREFERENCE VALUES(152,'DirMenu','menuDepth',3,NULL,NULL,NULL,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(160,'Tags','linkToCurrentDocument',NULL,NULL,NULL,TRUE,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(170,'DocPager','showNames',NULL,NULL,NULL,TRUE,NULL,0,NULL) + INSERT INTO PREFERENCE VALUES(180,'Forum','topicsPerPage',20,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(190,'JiraIssueList','title',NULL,NULL,NULL,NULL,'JIRA Issues',0,NULL) +INSERT INTO PREFERENCE VALUES(191,'JiraIssueList','truncateSummary',35,NULL,NULL,NULL,NULL,0,NULL) + +INSERT INTO PREFERENCE VALUES(200,'FeedAggregator','title',NULL,NULL,NULL,NULL,'Aggregated Feeds',0,NULL) +INSERT INTO PREFERENCE VALUES(201,'FeedAggregator','truncateDescription',100,NULL,NULL,NULL,NULL,0,NULL) + +INSERT INTO PREFERENCE VALUES(210,'ForumTopPosters','title',NULL,NULL,NULL,NULL,'Top Forum Posters',0,NULL) +INSERT INTO PREFERENCE VALUES(211,'ForumTopPosters','numberOfPosters',10,NULL,NULL,NULL,NULL,0,NULL) + +INSERT INTO PREFERENCE VALUES(300,'JiraConnector','connectionTimeoutSeconds',15,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(301,'JiraConnector','replyTimeoutSeconds',10,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(302,'JiraConnector','issueListCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(303,'JiraConnector','issueListCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL) + +INSERT INTO PREFERENCE VALUES(310,'FeedConnector','connectionTimeoutSeconds',30,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(311,'FeedConnector','feedCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL) +INSERT INTO PREFERENCE VALUES(312,'FeedConnector','feedCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL) + INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (1,1000,'2006-06-27 13:45:00','Administrator','admin',0) INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (2,0,'2006-06-27 13:45:00','Guest','guest',0) INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (3,1,'2006-06-27 13:45:00','Member','member',0) @@ -65,28 +96,31 @@ INSERT INTO `USER_ROLE` (`USER_ID`, `ROLE_ID`) VALUES (2,2) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES (1,1,'2006-09-23 13:45:00',NULL,'ROOT',0,0,'ROOT',1000,'',1,NULL,NULL) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (1,1,'2006-09-23 13:45:00',NULL,'ROOT',0,0,'ROOT',1000,'',1,NULL,NULL,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES (2,2,'2006-09-23 13:45:00',NULL,'Start',0,0,'Start',0,false,1,NULL,1) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (2,2,'2006-09-23 13:45:00',NULL,'Start',0,0,'Start',0,false,1,NULL,1,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES(3,2,'2006-09-23 13:45:00',NULL,'Welcome!',0,1,'Welcome',0,false,1,NULL,2) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(3,2,'2006-09-23 13:45:00',NULL,'Welcome!',0,1,'Welcome',0,false,1,NULL,2,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES(4,4,'2006-09-23 13:45:00',NULL,'Members',0,0,'Members',1000,'',1,NULL,1) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(4,4,'2006-09-23 13:45:00',NULL,'Members',0,0,'Members',1000,'',1,NULL,1,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES (5,5,'2006-09-23 13:45:00',NULL,'Help',0,0,'Help',1000,'',1,NULL,1) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (5,5,'2006-09-23 13:45:00',NULL,'Help',0,0,'Help',1000,'',1,NULL,1,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES (6,5,'2006-09-23 13:45:00',NULL,'Working with documents',0,0,'WorkingWithDocuments',1000,'',1,NULL,5) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (6,5,'2006-09-23 13:45:00',NULL,'Working with documents',0,0,'WorkingWithDocuments',1000,'',1,NULL,5,0) -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`) VALUES (7,5,'2006-09-23 13:45:00',NULL,'Wiki Text Markup',0,0,'WikiTextMarkup',1000,'',1,NULL,6) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (7,5,'2006-09-23 13:45:00',NULL,'Wiki Text Markup',0,0,'WikiTextMarkup',1000,'',1,NULL,6,0) +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (8,8,'2006-09-23 13:45:00',NULL,'Trash',0,0,'Trash',1000,'',1,NULL,1,0) + INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (3,0) INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (7,0) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (1,NULL,1,10,1,NULL) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (2,NULL,2,3,1,3) +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (1,'Root Area',1,12,1,NULL) +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (2,'Start Area',2,3,1,3) INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (4,'Default member area',8,9,1,NULL) INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (5,'Help documents',4,7,1,NULL) INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (6,'Creating and editing wiki documents',5,6,1,NULL) +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (8,'Trash Area',10,11,1,NULL) INSERT INTO `WIKI_DOCUMENT` (`NODE_ID`, `CONTENT`, `CONTENT_MACROS`, `ENABLE_COMMENT_FORM`, `ENABLE_COMMENTS`, `ENABLE_COMMENTS_ON_FEEDS`, `FOOTER`, `FOOTER_MACROS`, `HEADER`, `HEADER_MACROS`, `NAME_AS_TITLE`) VALUES (3,'Welcome to LaceWiki.\n\nLogin with admin-admin and rebuild the search index in the administration area.',NULL,true,true,true,NULL,NULL,NULL,NULL,true) Modified: trunk/examples/wiki/src/etc/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_en.properties 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/etc/messages_en.properties 2008-01-25 11:24:26 UTC (rev 7229) @@ -282,6 +282,8 @@ lacewiki.button.commentForm.Post=Post lacewiki.label.comment.FeedEntryTitlePrefix=[Comment] lacewiki.msg.comment.FeedIntro=This is a comment written in reply to +lacewiki.label.comment.RateThisPosting=Rate this posting +lacewiki.label.comment.Rating=Rating # User Control @@ -430,6 +432,7 @@ lacewiki.label.userInfo.Name=Name lacewiki.label.userInfo.JoinedOn=Joined lacewiki.label.userInfo.LastLoginOn=Last Login +lacewiki.label.userInfo.RatingPoints=Rating Points lacewiki.button.userInfo.EditAccount=<u>E</u>dit Account lacewiki.button.userInfo.EditAccount.accesskey=E Added: trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties 2008-01-25 11:24:26 UTC (rev 7229) @@ -0,0 +1,12 @@ +forumTopPosters.preferences.Name=Plugin: Forum Top Posters +forumTopPosters.preferences.Title=Title of box +forumTopPosters.preferences.NumberOfPosters=Number of posters in list +forumTopPosters.preferences.ForumLink=Wiki link to forum start page (topic list) +forumTopPosters.preferences.ExcludeRoles=Exclude users with role name (space separated) + +forumTopPosters.label.Position=Position +forumTopPosters.label.User=User +forumTopPosters.label.JoinedOn=Joined On +forumTopPosters.label.RatingPoints=Rating Points + +forumTopPosters.label.NoPostersFound=No posters with rating points found. 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-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -257,6 +257,30 @@ return "redirectToDocument"; } + public void rate(Long commentId, int rating) { + + // Only the owner of the document can rate comments of that document + if ( !currentUser.getId().equals(documentHome.getInstance().getCreatedBy().getId()) ) { + throw new AuthorizationException("You don't have permission for this operation"); + } + + // Guest can't rate + if (currentUser.isGuest()) { + throw new IllegalStateException("Guests can't rate comments"); + } + + setId(commentId); + if (isManaged()) { + + if (getInstance().getRating() != 0) + return; // Already rated + if (getInstance().getCreatedBy().getId() == currentUser.getId()) + return; // Can't rate my own stuff + + getInstance().setRating(rating); + } + } + public void cancel() { endConversation(); } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeRemover.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeRemover.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeRemover.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -7,16 +7,15 @@ package org.jboss.seam.wiki.core.action; import org.jboss.seam.ScopeType; -import org.jboss.seam.log.Log; import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.log.Log; import org.jboss.seam.wiki.core.dao.UserDAO; import org.jboss.seam.wiki.core.dao.WikiNodeDAO; import org.jboss.seam.wiki.core.feeds.FeedDAO; -import org.jboss.seam.wiki.core.model.WikiNode; import org.jboss.seam.wiki.core.model.WikiDirectory; +import org.jboss.seam.wiki.core.model.WikiNode; import org.jboss.seam.wiki.util.WikiUtil; import javax.persistence.EntityManager; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -406,6 +406,10 @@ passwordMatchesControl(); } + public long getRatingPoints() { + return userDAO.findRatingPoints(getInstance().getId()); + } + // ####################### PREFERENCES ################################## PreferenceEditor preferenceEditor; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -40,7 +40,7 @@ exampleUser = new User(); orderByProperty = "username"; orderDescending = false; - ignoreProperties = new String[]{"passwordHash", "activated", "createdOn", "lastLoginOn" }; + ignoreProperties = new String[]{"passwordHash", "activated", "createdOn", "lastLoginOn", "ratingScore" }; } public void find() { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserDAO.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -64,6 +64,13 @@ return null; } + public long findRatingPoints(Long userId) { + return (Long)entityManager + .createQuery("select sum(n.rating) from WikiNode n where n.createdBy.id = :userId") + .setParameter("userId", userId) + .getSingleResult(); + } + public void resetNodeCreatorToAdmin(User user) { User adminUser = (User) Component.getInstance("adminUser"); Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -285,6 +285,16 @@ <database-object> <create> + create index IDX_WIKI_NODE_RATING on WIKI_NODE (RATING) + </create> + <drop> + drop index IDX_WIKI_NODE_RATING + </drop> + <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + </database-object> + + <database-object> + <create> create index IDX_WIKI_NODE_READ_ACCESS_LEVEL on WIKI_NODE (READ_ACCESS_LEVEL) </create> <drop> Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -102,6 +102,9 @@ @org.hibernate.annotations.ForeignKey(name = "FK_USER_USER_PROFILE_ID") private UserProfile profile = new UserProfile(); + @Transient + private long ratingPoints = 0; + public User() {} public User(String firstname, String lastname, @@ -163,6 +166,9 @@ public UserProfile getProfile() { return profile; } public void setProfile(UserProfile profile) { this.profile = profile; } + public long getRatingPoints() { return ratingPoints; } + public void setRatingPoints(long ratingPoints) { this.ratingPoints = ratingPoints; } + // Misc methods public boolean isGuest() { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -116,7 +116,7 @@ public String[] getPropertiesForGroupingInQueries() { return new String[]{ - "version", "parent", + "version", "parent", "rating", "areaNumber", "name", "wikiname", "createdBy", "createdOn", "lastModifiedBy", "lastModifiedOn", "readAccessLevel", "writeAccessLevel", "writeProtected", "subject", "fromUserName", "fromUserEmail", "fromUserHomepage", "useWikiText", Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -82,7 +82,7 @@ public String[] getPropertiesForGroupingInQueries() { return new String[]{ - "version", "parent", + "version", "parent", "rating", "areaNumber", "name", "wikiname", "createdBy", "createdOn", "lastModifiedBy", "lastModifiedOn", "readAccessLevel", "writeAccessLevel", "writeProtected", "defaultFile", "description" Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -2,6 +2,7 @@ import org.hibernate.validator.Pattern; import org.hibernate.validator.Length; +import org.hibernate.validator.Range; import org.jboss.seam.wiki.core.search.annotations.Searchable; import org.jboss.seam.wiki.core.search.annotations.SearchableType; import org.jboss.seam.wiki.core.search.PaddedIntegerBridge; @@ -26,7 +27,7 @@ public abstract class WikiNode<N extends WikiNode> implements Comparable { public static enum SortableProperty { - name, createdOn, lastModifiedOn; + name, createdOn, lastModifiedOn, rating; } @Id @@ -106,6 +107,10 @@ @org.hibernate.annotations.Fetch(org.hibernate.annotations.FetchMode.JOIN) protected WikiNode parent; + @Range(min = 0l, max = 5) + @Column(name = "RATING", nullable = false) + private int rating = 0; + protected WikiNode() {} protected WikiNode(String name) { @@ -148,6 +153,9 @@ public WikiNode getParent() { return parent; } public void setParent(WikiNode parent) { this.parent = parent; } + public int getRating() { return rating; } + public void setRating(int rating) { this.rating = rating; } + public WikiNode getArea() { if (this.getParent() != null && this.getParent().getParent() == null) return this; // This is an area // Else, walk up the tree until we find the area Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumDAO.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -3,10 +3,8 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.wiki.core.model.WikiDirectory; -import org.jboss.seam.wiki.core.model.WikiDocument; -import org.jboss.seam.wiki.core.model.WikiComment; -import org.jboss.seam.wiki.core.model.WikiMenuItem; +import org.jboss.seam.wiki.core.model.*; +import org.jboss.seam.Component; import org.hibernate.Session; import org.hibernate.ScrollableResults; import org.hibernate.transform.ResultTransformer; @@ -230,6 +228,34 @@ return topicInfoMap; } + public List<User> findPostersAndRatingPoints(Long forumId, int maxResults, List<String> excludeRoles) { + + if (excludeRoles.size() == 0) { + excludeRoles.add("guest"); // By default, don't show guests, query requires _some_ exclude + } + + final List<User> postersAndRatingPoints = new ArrayList<User>(); + + getSession(true).getNamedQuery("forumPostersAndRatingPoints") + .setParameter("parentDirId", forumId) + .setParameterList("ignoreUserInRoles", excludeRoles ) + .setMaxResults(maxResults) + .setComment("Retrieving forum posters and rating points") + .setCacheable(true) + .setResultTransformer( + new ResultTransformer() { + public Object transformTuple(Object[] result, String[] strings) { + ((User)result[0]).setRatingPoints((Long)result[1]); + postersAndRatingPoints.add((User)result[0]); + return null; + } + public List transformList(List list) { return list; } + } + ) + .list(); + return postersAndRatingPoints; + } + private Session getSession(boolean restricted) { if (restricted) { return ((Session)((org.jboss.seam.persistence.EntityManagerProxy) restrictedEntityManager).getDelegate()); Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -22,6 +22,7 @@ public Set<PreferenceEntity> getPreferenceEntities() { return new HashSet<PreferenceEntity>() {{ add( createPreferenceEntity(ForumPreferences.class) ); + add( createPreferenceEntity(ForumTopPostersPreferences.class) ); }}; } } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQueries.hbm.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -149,6 +149,7 @@ select distinct doc2.NODE_ID as NODE_ID, doc2.OBJ_VERSION as OBJ_VERSION, + doc2.RATING as RATING, doc2.AREA_NR as AREA_NR, doc2.NAME as NAME, doc2.WIKINAME as WIKINAME, @@ -220,4 +221,45 @@ ]]></query> +  + <sql-query name="forumPostersAndRatingPoints"> + <return class="org.jboss.seam.wiki.core.model.User"/> + <return-scalar column="RATING_POINTS" type="long"/> + <![CDATA[ + select + ur.USER_ID, ur.ACTIVATED, ur.ACTIVATION_CODE, ur.CREATED_ON, ur.EMAIL, ur.FIRSTNAME, ur.LAST_LOGIN_ON, + ur.LASTNAME, ur.MEMBER_HOME_WIKI_DIRECTORY_ID, ur.PASSWORDHASH, ur.USER_PROFILE_ID, ur.USERNAME, ur.OBJ_VERSION, + sum(ur.RATING) as RATING_POINTS + from + (select distinct + user2.*, + com2.NODE_ID, + com2.RATING + from + WIKI_DOCUMENT doc0 + inner join WIKI_FILE doc1 on doc0.NODE_ID=doc1.NODE_ID + inner join WIKI_NODE doc2 on doc0.NODE_ID=doc2.NODE_ID, + WIKI_COMMENT com1 + inner join WIKI_NODE com2 on com1.NODE_ID=com2.NODE_ID + inner join USERS user2 on com2.CREATED_BY_USER_ID=user2.USER_ID + inner join USER_ROLE roles1 on user2.USER_ID=roles1.USER_ID + inner join ROLES roles2 on roles1.ROLE_ID=roles2.ROLE_ID + where + doc2.PARENT_NODE_ID=:parentDirId + and (com1.NS_THREAD in + (select com3.NS_THREAD from WIKI_COMMENT com3 + inner join WIKI_NODE com4 on com3.NODE_ID=com4.NODE_ID + where com4.PARENT_NODE_ID=doc0.NODE_ID + ) + ) + and (roles2.NAME not in (:ignoreUserInRoles)) + and com2.RATING<>0 + ) as ur + group by + ur.USER_ID, ur.ACTIVATED, ur.ACTIVATION_CODE, ur.CREATED_ON, ur.EMAIL, ur.FIRSTNAME, ur.LAST_LOGIN_ON, + ur.LASTNAME, ur.MEMBER_HOME_WIKI_DIRECTORY_ID, ur.PASSWORDHASH, ur.USER_PROFILE_ID, ur.USERNAME, + ur.OBJ_VERSION + order by sum(ur.RATING) desc + ]]></sql-query> + </hibernate-mapping> \ No newline at end of file Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -1,18 +1,20 @@ package org.jboss.seam.wiki.plugin.forum; -import org.jboss.seam.wiki.core.model.WikiDirectory; -import org.jboss.seam.wiki.core.model.User; -import org.jboss.seam.wiki.core.action.Pager; +import org.jboss.seam.Component; +import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.*; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.ScopeType; -import org.jboss.seam.Component; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.log.Log; +import org.jboss.seam.wiki.core.action.Pager; +import org.jboss.seam.wiki.core.engine.WikiLink; +import org.jboss.seam.wiki.core.engine.WikiLinkResolver; +import org.jboss.seam.wiki.core.model.User; +import org.jboss.seam.wiki.core.model.WikiDirectory; +import java.io.Serializable; import java.util.*; -import java.io.Serializable; @Name("forumQuery") @Scope(ScopeType.CONVERSATION) @@ -26,11 +28,14 @@ private Pager pager; @In("#{preferences.get('Forum')}") - ForumPreferences prefs; + ForumPreferences forumPrefs; + @In("#{preferences.get('ForumTopPosters', currentMacro)}") + ForumTopPostersPreferences forumTopPostersPrefs; + @RequestParameter public void setPage(Integer page) { - if (pager == null) pager = new Pager(prefs.getTopicsPerPage()); + if (pager == null) pager = new Pager(forumPrefs.getTopicsPerPage()); pager.setPage(page); Contexts.getSessionContext().set(TOPIC_PAGE, page); } @@ -128,4 +133,58 @@ topics.addAll(topicInfo.values()); } + /* ####################### POSTERS ########################## */ + + private Map<Long, List<User>> forumsTopPosters = new HashMap<Long, List<User>>(); + + public List<User> getTopPosters() { + Long forumId = resolveForumId(forumTopPostersPrefs.getForumLink()); + return forumId != null ? forumsTopPosters.get(forumId) : null; + } + + @Observer(value = "Macro.render.forumTopPosters", create = true) + public void loadForumTopPosters() { + log.debug("loading top posters of forum: " + forumTopPostersPrefs.getForumLink()); + + Long forumId = resolveForumId(forumTopPostersPrefs.getForumLink()); + if (forumId == null) { + log.debug("could not resolve forum id for forum start page link: " + forumTopPostersPrefs.getForumLink()); + return; + } + + log.debug("resolved forum id: " + forumId); + + List<String> excludeRoles = new ArrayList<String>(); + if (forumTopPostersPrefs.getExcludeRoles() != null && + forumTopPostersPrefs.getExcludeRoles().length() > 0) { + log.debug("excluding posters with roles: " + forumTopPostersPrefs.getExcludeRoles()); + excludeRoles = Arrays.asList(forumTopPostersPrefs.getExcludeRoles().split(" ")); + } + + log.debug("loading top " + forumTopPostersPrefs.getNumberOfPosters() + " posters of forum id: " + forumId); + List<User> topPosters = + forumDAO.findPostersAndRatingPoints( + forumId, + forumTopPostersPrefs.getNumberOfPosters().intValue(), + excludeRoles + ); + log.debug("found top posters: " + topPosters.size()); + forumsTopPosters.put(forumId, topPosters); + } + + private Long resolveForumId(String forumLink) { + if (forumLink == null || forumLink.length() == 0) return null; + WikiLinkResolver resolver = (WikiLinkResolver)Component.getInstance("wikiLinkResolver"); + Map<String, WikiLink> resolvedLinks = new HashMap<String, WikiLink>(); + resolver.resolveLinkText(currentDirectory.getAreaNumber(), resolvedLinks, forumLink); + WikiLink resolvedLink = resolvedLinks.get(forumLink); + if (resolvedLink.isBroken() || resolvedLink.getFile().getId() == null) { + return null; + } else { + // Parent of forum start page is the forum directory + return resolvedLink.getFile().getParent().getId(); + } + } + + } Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopPostersPreferences.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopPostersPreferences.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopPostersPreferences.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.plugin.forum; + +import org.jboss.seam.wiki.preferences.annotations.Preferences; +import org.jboss.seam.wiki.preferences.annotations.PreferenceProperty; +import org.jboss.seam.wiki.preferences.PreferenceVisibility; +import org.hibernate.validator.Range; +import org.hibernate.validator.NotNull; +import org.hibernate.validator.Length; + +/** + * @author Christian Bauer + */ +@Preferences(name = "ForumTopPosters", description = "#{messages['forumTopPosters.preferences.Name']}") +public class ForumTopPostersPreferences { + + @PreferenceProperty( + description = "#{messages['forumTopPosters.preferences.Title']}", + visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE}, + editorIncludeName = "AdaptiveTextInput" + ) + @Length(min = 0, max = 255) + @NotNull + private String title; + + @PreferenceProperty( + description = "#{messages['forumTopPosters.preferences.NumberOfPosters']}", + visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE}, + editorIncludeName = "NumberRange" + ) + @Range(min = 3l, max = 100l) + @NotNull + private Long numberOfPosters; + + @PreferenceProperty( + description = "#{messages['forumTopPosters.preferences.ForumLink']}", + visibility = PreferenceVisibility.INSTANCE, + editorIncludeName = "AdaptiveTextInput" + ) + @Length(min = 3, max = 255) + private String forumLink; + + @PreferenceProperty( + description = "#{messages['forumTopPosters.preferences.ExcludeRoles']}", + visibility = PreferenceVisibility.INSTANCE, + editorIncludeName = "AdaptiveTextInput" + ) + @Length(min = 3, max = 255) + private String excludeRoles; + + public String getTitle() { + return title; + } + + public Long getNumberOfPosters() { + return numberOfPosters; + } + + public String getForumLink() { + return forumLink; + } + + public String getExcludeRoles() { + return excludeRoles; + } +} Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -4,7 +4,7 @@  <WIKI_NODE - NODE_ID="300" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="300" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="300" NAME="FAQs" WIKINAME="FAQs" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -15,7 +15,7 @@  <WIKI_NODE - NODE_ID="301" OBJ_VERSION="0" PARENT_NODE_ID="300" + NODE_ID="301" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="300" AREA_NR="300" NAME="FAQ Browser" WIKINAME="FAQBrowser" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -34,7 +34,7 @@  <WIKI_NODE - NODE_ID="302" OBJ_VERSION="0" PARENT_NODE_ID="300" + NODE_ID="302" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="300" AREA_NR="300" NAME="Seam Product" WIKINAME="SeamProduct" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -44,7 +44,7 @@  <WIKI_NODE - NODE_ID="303" OBJ_VERSION="0" PARENT_NODE_ID="302" + NODE_ID="303" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="302" AREA_NR="300" NAME="Seam License" WIKINAME="SeamLicense" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -54,7 +54,7 @@  <WIKI_NODE - NODE_ID="304" OBJ_VERSION="0" PARENT_NODE_ID="300" + NODE_ID="304" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="300" AREA_NR="300" NAME="Seam Core" WIKINAME="SeamCore" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -64,7 +64,7 @@  <WIKI_NODE - NODE_ID="305" OBJ_VERSION="0" PARENT_NODE_ID="304" + NODE_ID="305" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="304" AREA_NR="300" NAME="Expression Language" WIKINAME="ExpressionLanguage" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -74,7 +74,7 @@  <WIKI_NODE - NODE_ID="306" OBJ_VERSION="0" PARENT_NODE_ID="304" + NODE_ID="306" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="304" AREA_NR="300" NAME="Component Design" WIKINAME="ComponentDesign" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -86,7 +86,7 @@  <WIKI_NODE - NODE_ID="307" OBJ_VERSION="0" PARENT_NODE_ID="303" + NODE_ID="307" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="303" AREA_NR="300" NAME="Can I use Seam in my proprietary product?" WIKINAME="CanIUseSeamInMyProprietaryProduct" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="2006-09-23 13:45:00" LAST_MODIFIED_BY_USER_ID="3" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -103,7 +103,7 @@ NAME_AS_TITLE="false" ENABLE_COMMENTS="true" ENABLE_COMMENT_FORM="true" ENABLE_COMMENTS_ON_FEEDS="false"/> <WIKI_NODE - NODE_ID="308" OBJ_VERSION="0" PARENT_NODE_ID="303" + NODE_ID="308" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="303" AREA_NR="300" NAME="Do I have to pay to use Seam?" WIKINAME="DoIHaveToPayToUseSeam" CREATED_ON="2006-09-24 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -123,7 +123,7 @@  <WIKI_NODE - NODE_ID="309" OBJ_VERSION="0" PARENT_NODE_ID="308" + NODE_ID="309" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="308" AREA_NR="3" NAME="Do I have to pay to use Seam?.Comment11967298211844" WIKINAME="DoIHaveToPayToUseSeamComment11967298211844" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -4,7 +4,7 @@  <WIKI_NODE - NODE_ID="100" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="100" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="100" NAME="Forums" WIKINAME="Forums" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -23,7 +23,7 @@  <WIKI_NODE - NODE_ID="101" OBJ_VERSION="0" PARENT_NODE_ID="100" + NODE_ID="101" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="100" AREA_NR="100" NAME="Seam Forums" WIKINAME="SeamForums" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -42,7 +42,7 @@  <WIKI_NODE - NODE_ID="102" OBJ_VERSION="0" PARENT_NODE_ID="100" + NODE_ID="102" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="100" AREA_NR="100" NAME="Seam Users" WIKINAME="SeamUsers" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="true"/> @@ -61,7 +61,7 @@  <WIKI_NODE - NODE_ID="103" OBJ_VERSION="0" PARENT_NODE_ID="102" + NODE_ID="103" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102" AREA_NR="100" NAME="Seam Users Forum" WIKINAME="SeamUsersForum" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -80,7 +80,7 @@  <WIKI_NODE - NODE_ID="104" OBJ_VERSION="0" PARENT_NODE_ID="102" + NODE_ID="104" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102" AREA_NR="100" NAME="The first posting" WIKINAME="TheFirstPosting" CREATED_ON="2007-04-01 13:02:03" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -98,7 +98,7 @@  <WIKI_NODE - NODE_ID="105" OBJ_VERSION="0" PARENT_NODE_ID="104" + NODE_ID="105" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="104" AREA_NR="100" NAME="The First Posting.Comment119672933218230" WIKINAME="TheFirstPostingComment119672933218230" CREATED_ON="2007-04-02 13:02:03" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -112,7 +112,7 @@  <WIKI_NODE - NODE_ID="106" OBJ_VERSION="0" PARENT_NODE_ID="105" + NODE_ID="106" OBJ_VERSION="0" RATING="5" PARENT_NODE_ID="105" AREA_NR="100" NAME="The First Posting.Comment119672933218233" WIKINAME="TheFirstPostingComment119672933218233" CREATED_ON="2007-04-10 10:00:00" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -126,7 +126,7 @@  <WIKI_NODE - NODE_ID="107" OBJ_VERSION="0" PARENT_NODE_ID="102" + NODE_ID="107" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102" AREA_NR="100" NAME="A second (sticky) posting with a longer title" WIKINAME="ASecondStickyPostingWithALongerTitle" CREATED_ON="2007-04-03 08:01:00" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -144,7 +144,7 @@  <WIKI_NODE - NODE_ID="108" OBJ_VERSION="0" PARENT_NODE_ID="107" + NODE_ID="108" OBJ_VERSION="0" RATING="4" PARENT_NODE_ID="107" AREA_NR="100" NAME="A second (sticky) posting with a longer title.Comment119672933211234" WIKINAME="ASecondStickyPostingWithALongerTitle.Comment119672933211234" CREATED_ON="2007-04-04 08:01:00" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> @@ -158,7 +158,7 @@  <WIKI_NODE - NODE_ID="109" OBJ_VERSION="0" PARENT_NODE_ID="100" + NODE_ID="109" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="100" AREA_NR="100" NAME="Seam Developers" WIKINAME="SeamDevelopers" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="1" WRITE_ACCESS_LEVEL="1" WRITE_PROTECTED="true"/> @@ -197,7 +197,7 @@  <WIKI_NODE - NODE_ID="110" OBJ_VERSION="0" PARENT_NODE_ID="109" + NODE_ID="110" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="109" AREA_NR="100" NAME="Seam Developers Forum" WIKINAME="SeamDevelopersForum" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="1" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -215,7 +215,7 @@  <WIKI_NODE - NODE_ID="111" OBJ_VERSION="0" PARENT_NODE_ID="109" + NODE_ID="111" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="109" AREA_NR="100" NAME="A third thread with no replies" WIKINAME="AThirdThreadWithNoReplies" CREATED_ON="2007-04-05 09:01:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="1" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="false"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -3,7 +3,7 @@ <dataset> <WIKI_NODE - NODE_ID="20" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="20" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="20" NAME="Help" WIKINAME="Help" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -12,7 +12,7 @@ NS_LEFT="20" NS_RIGHT="29" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="21" OBJ_VERSION="0" PARENT_NODE_ID="20" + NODE_ID="21" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="20" AREA_NR="20" NAME="Working with documents" WIKINAME="WorkingWithDocuments" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -22,7 +22,7 @@ <WIKI_NODE - NODE_ID="22" OBJ_VERSION="0" PARENT_NODE_ID="21" + NODE_ID="22" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="21" AREA_NR="20" NAME="Wiki Text Markup" WIKINAME="WikiTextMarkup" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="2006-09-26 13:45:00" LAST_MODIFIED_BY_USER_ID="1" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -37,7 +37,7 @@ <WIKI_NODE - NODE_ID="23" OBJ_VERSION="0" PARENT_NODE_ID="20" + NODE_ID="23" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="20" AREA_NR="20" NAME="Plugins" WIKINAME="Plugins" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -46,7 +46,7 @@ NS_LEFT="23" NS_RIGHT="28" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="24" OBJ_VERSION="0" PARENT_NODE_ID="23" + NODE_ID="24" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="23" AREA_NR="20" NAME="Using Plugins" WIKINAME="UsingPlugins" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -55,7 +55,7 @@ NS_LEFT="24" NS_RIGHT="25" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="25" OBJ_VERSION="0" PARENT_NODE_ID="23" + NODE_ID="25" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="23" AREA_NR="20" NAME="Creating Plugins" WIKINAME="CreatingPlugins" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/KnowledgeBase.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/KnowledgeBase.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/KnowledgeBase.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -3,7 +3,7 @@ <dataset> <WIKI_NODE - NODE_ID="200" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="200" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="200" NAME="Documentation" WIKINAME="Documentation" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -13,7 +13,7 @@ <WIKI_MENU_ITEM DIRECTORY_ID="200" DISPLAY_POSITION="3"/> <WIKI_NODE - NODE_ID="201" OBJ_VERSION="0" PARENT_NODE_ID="200" + NODE_ID="201" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="200" AREA_NR="200" NAME="Knowledge Base" WIKINAME="KnowledgeBase" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -23,7 +23,7 @@ <WIKI_MENU_ITEM DIRECTORY_ID="201" DISPLAY_POSITION="0"/> <WIKI_NODE - NODE_ID="202" OBJ_VERSION="0" PARENT_NODE_ID="201" + NODE_ID="202" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="201" AREA_NR="200" NAME="Knowledge Base Overview" WIKINAME="KnowledgeBaseOverview" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -38,7 +38,7 @@ <WIKI_NODE - NODE_ID="203" OBJ_VERSION="0" PARENT_NODE_ID="201" + NODE_ID="203" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="201" AREA_NR="200" NAME="FAQs" WIKINAME="FAQs" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -48,7 +48,7 @@ <WIKI_MENU_ITEM DIRECTORY_ID="203" DISPLAY_POSITION="0"/> <WIKI_NODE - NODE_ID="204" OBJ_VERSION="0" PARENT_NODE_ID="201" + NODE_ID="204" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="201" AREA_NR="200" NAME="Setup & Installation" WIKINAME="SetupInstallation" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -58,7 +58,7 @@ <WIKI_MENU_ITEM DIRECTORY_ID="204" DISPLAY_POSITION="1"/> <WIKI_NODE - NODE_ID="205" OBJ_VERSION="0" PARENT_NODE_ID="201" + NODE_ID="205" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="201" AREA_NR="200" NAME="Components & Services" WIKINAME="ComponentsServices" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -68,7 +68,7 @@ <WIKI_MENU_ITEM DIRECTORY_ID="205" DISPLAY_POSITION="2"/> <WIKI_NODE - NODE_ID="206" OBJ_VERSION="0" PARENT_NODE_ID="201" + NODE_ID="206" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="201" AREA_NR="200" NAME="User Interface" WIKINAME="UserInterface" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/UploadData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/UploadData.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/UploadData.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -3,7 +3,7 @@ <dataset> <WIKI_NODE - NODE_ID="30" OBJ_VERSION="0" PARENT_NODE_ID="2" + NODE_ID="30" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="2" AREA_NR="2" NAME="Test Image" WIKINAME="TestImage" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -18,7 +18,7 @@ THUMBNAIL_DATA="[BINARY_DIR]/testimage_thumbnail.jpg"/> <WIKI_NODE - NODE_ID="31" OBJ_VERSION="0" PARENT_NODE_ID="2" + NODE_ID="31" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="2" AREA_NR="2" NAME="Test Upload" WIKINAME="TestUpload" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-25 11:24:26 UTC (rev 7229) @@ -73,6 +73,9 @@ <PREFERENCE PREF_ID = "200" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "FeedAggregator" PROPERTY_NAME = "title" STRING_VALUE = "Aggregated Feeds" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "201" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "FeedAggregator" PROPERTY_NAME = "truncateDescription" STRING_VALUE = "[NULL]" LONG_VALUE = "100" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "210" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "ForumTopPosters" PROPERTY_NAME = "title" STRING_VALUE = "Top Forum Posters" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "211" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "ForumTopPosters" PROPERTY_NAME = "numberOfPosters" STRING_VALUE = "[NULL]" LONG_VALUE = "10" BOOLEAN_VALUE = "[NULL]"/> +  <PREFERENCE PREF_ID = "300" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "JiraConnector" PROPERTY_NAME = "connectionTimeoutSeconds" STRING_VALUE = "[NULL]" LONG_VALUE = "15" BOOLEAN_VALUE = "[NULL]"/> @@ -173,7 +176,7 @@ <USER_ROLE USER_ID="3" ROLE_ID="3"/> <WIKI_NODE - NODE_ID="1" OBJ_VERSION="0" PARENT_NODE_ID="[NULL]" + NODE_ID="1" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="[NULL]" AREA_NR="1" NAME="AAA" WIKINAME="AAA" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="true"/> @@ -182,7 +185,7 @@ NS_LEFT="1" NS_RIGHT="999" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="2" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="2" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="2" NAME="BBB" WIKINAME="BBB" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -191,7 +194,7 @@ NS_LEFT="2" NS_RIGHT="3" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="3" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="3" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="3" NAME="CCC" WIKINAME="CCC" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -200,7 +203,7 @@ NS_LEFT="4" NS_RIGHT="9" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="4" OBJ_VERSION="0" PARENT_NODE_ID="3" + NODE_ID="4" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="3" AREA_NR="3" NAME="DDD" WIKINAME="DDD" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -209,7 +212,7 @@ NS_LEFT="5" NS_RIGHT="6" NS_THREAD="1"/> <WIKI_NODE - NODE_ID="5" OBJ_VERSION="0" PARENT_NODE_ID="3" + NODE_ID="5" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="3" AREA_NR="3" NAME="EEE" WIKINAME="EEE" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -224,7 +227,7 @@ <WIKI_NODE - NODE_ID="6" OBJ_VERSION="0" PARENT_NODE_ID="3" + NODE_ID="6" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="3" AREA_NR="3" NAME="One" WIKINAME="One" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="2006-09-26 13:45:00" LAST_MODIFIED_BY_USER_ID="1" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -239,7 +242,7 @@ <WIKI_TAG FILE_ID="6" TAG="Tag One"/> <WIKI_NODE - NODE_ID="7" OBJ_VERSION="0" PARENT_NODE_ID="3" + NODE_ID="7" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="3" AREA_NR="3" NAME="Two" WIKINAME="Two" CREATED_ON="2006-09-24 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="2006-09-25 13:45:00" LAST_MODIFIED_BY_USER_ID="1" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -256,7 +259,7 @@ <WIKI_FILE_LINK SOURCE_WIKI_FILE_ID="7" TARGET_WIKI_FILE_ID="9"/> <WIKI_NODE - NODE_ID="8" OBJ_VERSION="0" PARENT_NODE_ID="4" + NODE_ID="8" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="4" AREA_NR="3" NAME="Three" WIKINAME="Three" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -272,22 +275,22 @@ <WIKI_TAG FILE_ID="8" TAG="Tag Three"/> <WIKI_NODE - NODE_ID="9" OBJ_VERSION="0" PARENT_NODE_ID="2" + NODE_ID="9" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="2" AREA_NR="2" NAME="Four" WIKINAME="Four" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> <WIKI_FILE NODE_ID="9" FILE_REVISION="0"/> <WIKI_DOCUMENT - NODE_ID="9" CONTENT="Testdocument Four

[<=jiraIssueList[url=http://jira.jboss.com/jira][usernam...;" + NODE_ID="9" CONTENT="Testdocument Four

[<=jiraIssueList[url=http://jira.jboss.com/jira][usernam... Users Forum]]
" HEADER="[NULL]" FOOTER="[NULL]" - HEADER_MACROS="[NULL]" CONTENT_MACROS="jiraIssueList" FOOTER_MACROS="[NULL]" + HEADER_MACROS="[NULL]" CONTENT_MACROS="jiraIssueList forumTopPosters" FOOTER_MACROS="[NULL]" NAME_AS_TITLE="true" ENABLE_COMMENTS="true" ENABLE_COMMENT_FORM="true" ENABLE_COMMENTS_ON_FEEDS="true"/> <WIKI_NODE - NODE_ID="10" OBJ_VERSION="0" PARENT_NODE_ID="6" + NODE_ID="10" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="6" AREA_NR="3" NAME="One.Comment11967298211870" WIKINAME="OneComment11967298211870" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -299,7 +302,7 @@ NS_LEFT="1" NS_RIGHT="8" NS_THREAD="10"/> <WIKI_NODE - NODE_ID="11" OBJ_VERSION="0" PARENT_NODE_ID="10" + NODE_ID="11" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="10" AREA_NR="3" NAME="One.Comment1196729823870" WIKINAME="OneComment1196729823870" CREATED_ON="2006-09-24 13:45:00" CREATED_BY_USER_ID="3" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -310,7 +313,7 @@ NS_LEFT="2" NS_RIGHT="3" NS_THREAD="10"/> <WIKI_NODE - NODE_ID="12" OBJ_VERSION="0" PARENT_NODE_ID="10" + NODE_ID="12" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="10" AREA_NR="3" NAME="One.Comment1196729874870" WIKINAME="OneComment.1196729874870" CREATED_ON="2006-09-25 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -321,7 +324,7 @@ NS_LEFT="4" NS_RIGHT="7" NS_THREAD="10"/> <WIKI_NODE - NODE_ID="13" OBJ_VERSION="0" PARENT_NODE_ID="12" + NODE_ID="13" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="12" AREA_NR="3" NAME="One.Comment11967293211870" WIKINAME="OneComment11967293211870" CREATED_ON="2006-09-26 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -332,7 +335,7 @@ NS_LEFT="5" NS_RIGHT="6" NS_THREAD="10"/> <WIKI_NODE - NODE_ID="14" OBJ_VERSION="0" PARENT_NODE_ID="6" + NODE_ID="14" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="6" AREA_NR="3" NAME="One.Comment11967293211830" WIKINAME="OneComment11967293211830" CREATED_ON="2006-09-27 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -343,7 +346,7 @@ NS_LEFT="1" NS_RIGHT="4" NS_THREAD="14"/> <WIKI_NODE - NODE_ID="15" OBJ_VERSION="0" PARENT_NODE_ID="14" + NODE_ID="15" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="14" AREA_NR="3" NAME="One.Comment119672932118230" WIKINAME="OneComment119672932118230" CREATED_ON="2006-09-28 13:45:00" CREATED_BY_USER_ID="2" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="false"/> @@ -389,7 +392,7 @@  <WIKI_NODE - NODE_ID="16" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="16" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="16" NAME="Members" WIKINAME="Members" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="1000" WRITE_PROTECTED="true"/> @@ -400,7 +403,7 @@  <WIKI_NODE - NODE_ID="17" OBJ_VERSION="0" PARENT_NODE_ID="1" + NODE_ID="17" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="1" AREA_NR="17" NAME="Trash" WIKINAME="Trash" CREATED_ON="2006-09-23 13:45:00" CREATED_BY_USER_ID="1" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USER_ID="[NULL]" READ_ACCESS_LEVEL="0" WRITE_ACCESS_LEVEL="0" WRITE_PROTECTED="true"/> Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java 2008-01-25 11:24:26 UTC (rev 7229) @@ -115,6 +115,42 @@ }.run(); } + @Test + public void rateComment() throws Exception { + + loginMember(); + + new FacesRequest("/docDisplay_d.xhtml") { + + protected void beforeRequest() { + setParameter("documentId", "6"); + } + + protected void updateModelValues() throws Exception { + assert getValue("#{documentHome.instance.id}").equals(6l); + } + + protected void invokeApplication() throws Exception { + invokeMethod("#{commentHome.rate(11, 4)}"); + } + + }.run(); + + new NonFacesRequest("/docDisplay_d.xhtml") { + + protected void beforeRequest() { + setParameter("documentId", "6"); + } + + protected void renderResponse() throws Exception { + WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class); + assert dao.findWikiNode(11l).getRating() == 4; + } + + }.run(); + + } + private void loginAdmin() throws Exception { new FacesRequest() { protected void invokeApplication() throws Exception { @@ -126,5 +162,15 @@ }.run(); } + private void loginMember() throws Exception { + new FacesRequest() { + protected void invokeApplication() throws Exception { + setValue("#{identity.username}", "member"); + setValue("#{identity.password}", "member"); + invokeAction("#{identity.login}"); + assert getValue("#{identity.loggedIn}").equals(true); + } + }.run(); + } } \ No newline at end of file Modified: trunk/examples/wiki/view/docDisplay_d.xhtml =================================================================== --- trunk/examples/wiki/view/docDisplay_d.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/docDisplay_d.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -203,34 +203,39 @@ <ui:param name="titlePlural" value="#{messages['lacewiki.label.commentsDisplay.Comments']}"/> <ui:define name="controls"> - <s:fragment rendered="#{not commentHome.showForm and s:hasPermission('Comment', 'create', documentHome.instance)}"> + <h:panelGroup> - <s:link tabindex="102" - action="#{commentHome.replyTo()}" - styleClass="buttonNonpersistent"> - <f:param name="parentCommentId" value="#{c.id}"/> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.ReplyTo']}"/> - </s:link> + <s:fragment rendered="#{not commentHome.showForm and s:hasPermission('Comment', 'create', documentHome.instance)}"> - <s:link tabindex="102" - action="#{commentHome.quote()}" - styleClass="buttonNonpersistent"> - <f:param name="parentCommentId" value="#{c.id}"/> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.Quote']}"/> - </s:link> + <s:link tabindex="102" + action="#{commentHome.replyTo()}" + styleClass="buttonNonpersistent"> + <f:param name="parentCommentId" value="#{c.id}"/> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.ReplyTo']}"/> + </s:link> - </s:fragment> + <s:link tabindex="102" + action="#{commentHome.quote()}" + styleClass="buttonNonpersistent"> + <f:param name="parentCommentId" value="#{c.id}"/> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.Quote']}"/> + </s:link> - <s:fragment rendered="#{s:hasPermission('Comment', 'delete', currentDocument) and not commentHome.showForm}"> - <a:jsFunction name="deleteCommentId#{c.id}" - reRender="commentDisplayForm" - action="#{commentHome.remove(c.id)}"/> - <h:outputLink value="#" - onclick="deleteConfirmation('#{messages['lacewiki.label.commentsDisplay.CommentThread']} \\'#{c.subject}\\'', 'deleteCommentId#{c.id}')" - styleClass="button"> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.RemoveComment']}"/> - </h:outputLink> - </s:fragment> + </s:fragment> + + <s:fragment rendered="#{s:hasPermission('Comment', 'delete', currentDocument) and not commentHome.showForm}"> + <a:jsFunction name="deleteCommentId#{c.id}" + reRender="commentDisplayForm" + action="#{commentHome.remove(c.id)}"/> + <h:outputLink value="#" + onclick="deleteConfirmation('#{messages['lacewiki.label.commentsDisplay.CommentThread']} \\'#{c.subject}\\'', 'deleteCommentId#{c.id}')" + styleClass="button"> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.RemoveComment']}"/> + </h:outputLink> + </s:fragment> + + </h:panelGroup> + </ui:define> </ui:decorate> <s:fragment rendered="#{s:hasPermission('Comment', 'create', documentHome.instance)}"> Modified: trunk/examples/wiki/view/includes/commentsDisplay.xhtml =================================================================== --- trunk/examples/wiki/view/includes/commentsDisplay.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/includes/commentsDisplay.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -130,12 +130,10 @@ enablePlugins="false"/> </s:div> - <div align="right" class="commentControls"> + <div class="commentControls"> <h:form> - <h:panelGroup> <ui:insert name="controls"/> - </h:panelGroup> </h:form> </div> Modified: trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -60,34 +60,92 @@ <ui:param name="titlePlural" value="#{messages['forum.label.Replies']}"/> <ui:define name="controls"> - <s:fragment rendered="#{not replyHome.showForm and replyHome.hasReplyPermission()}"> + <h:panelGrid columns="3" styleClass="forumReplyControls" + columnClasses="forumReplyRating, forumReplyStatus, forumReplyControl" + cellpadding="0" cellspacing="0" border="0"> - <s:link tabindex="102" - action="#{replyHome.replyTo()}" - styleClass="buttonNonpersistent"> - <f:param name="parentCommentId" value="#{c.id}"/> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.ReplyTo']}"/> - </s:link> + <s:fragment> - <s:link tabindex="102" - action="#{replyHome.quote()}" - styleClass="buttonNonpersistent"> - <f:param name="parentCommentId" value="#{c.id}"/> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.Quote']}"/> - </s:link> + <s:fragment rendered="#{not replyHome.showForm + and c.rating == 0 + and not currentUser.guest + and c.createdBy.id != currentUser.id + and currentDocument.createdBy.id == currentUser.id}"> + + <h:panelGrid columns="7" styleClass="commentRatingChooser" + columnClasses="label, star, star, star, star, star, star" + border="0" cellpadding="0" cellspacing="0"> + <h:outputText styleClass="smallFont" value="#{messages['lacewiki.label.comment.RateThisPosting']}: "/> + <c:forEach begin="1" var="r" end="5"> + <a:commandLink action="#{replyHome.rate(c.id, r)}" + reRender="comments, messageBoxContainer" + status="commentStatus#{c.id}"> + <h:graphicImage styleClass="item#{c.id}-rate#{r}" + onmouseover="highlightStars('#{c.id}', '5', '#{r}')" + onmouseout="highlightStars('#{c.id}', '5', '0')" + value="/themes/#{preferences.get('Wiki').themeName}/img/star_grey.gif" + alt="*" + width="16" height="16"/> + </a:commandLink> + </c:forEach> + </h:panelGrid> + </s:fragment> - </s:fragment> + <s:fragment rendered="#{c.rating > 0}"> + <h:panelGrid columns="#{c.rating + 1}" styleClass="commentRating" + columnClasses="label, star, star, star, star, star, star" + border="0" cellpadding="0" cellspacing="0"> + <h:outputText styleClass="smallFont" value="#{messages['lacewiki.label.comment.Rating']}: "/> + <c:forEach begin="1" var="r" end="#{c.rating}"> + <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/star.gif" + width="16" height="16" alt="*"/> + </c:forEach> + </h:panelGrid> + </s:fragment> - <s:fragment rendered="#{s:hasPermission('Comment', 'delete', currentDocument) and not replyHome.showForm}"> - <a:jsFunction name="deleteReplyId#{c.id}" - reRender="forumRepliesContainer" - action="#{replyHome.remove(c.id)}"/> - <h:outputLink value="#" - onclick="deleteConfirmation('#{messages['lacewiki.label.commentsDisplay.CommentThread']} \\'#{c.subject}\\'', 'deleteReplyId#{c.id}')" - styleClass="button sessionEventTrigger"> - <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.RemoveComment']}"/> - </h:outputLink> - </s:fragment> + </s:fragment> + + <s:fragment> + <ui:include src="../../includes/statusIndicator.xhtml"> + <ui:param name="statusId" value="commentStatus#{c.id}"/> + </ui:include> + </s:fragment> + + <s:fragment> + + <s:fragment rendered="#{not replyHome.showForm and replyHome.hasReplyPermission()}"> + + <s:link tabindex="102" + action="#{replyHome.replyTo()}" + styleClass="buttonNonpersistent"> + <f:param name="parentCommentId" value="#{c.id}"/> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.ReplyTo']}"/> + </s:link> + + <s:link tabindex="102" + action="#{replyHome.quote()}" + styleClass="buttonNonpersistent"> + <f:param name="parentCommentId" value="#{c.id}"/> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.Quote']}"/> + </s:link> + + </s:fragment> + + <s:fragment rendered="#{s:hasPermission('Comment', 'delete', currentDocument) and not replyHome.showForm}"> + <a:jsFunction name="deleteReplyId#{c.id}" + reRender="forumRepliesContainer" + action="#{replyHome.remove(c.id)}"/> + <h:outputLink value="#" + onclick="deleteConfirmation('#{messages['lacewiki.label.commentsDisplay.CommentThread']} \\'#{c.subject}\\'', 'deleteReplyId#{c.id}')" + styleClass="button sessionEventTrigger"> + <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.commentsDisplay.RemoveComment']}"/> + </h:outputLink> + </s:fragment> + + </s:fragment> + + </h:panelGrid> + </ui:define> </ui:decorate> Added: trunk/examples/wiki/view/plugins/forumTopPosters/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopPosters/plugin.xhtml (rev 0) +++ trunk/examples/wiki/view/plugins/forumTopPosters/plugin.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -0,0 +1,78 @@ +<wiki:plugin + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:wiki="http://jboss.com/products/seam/wiki" + xmlns:a="https://ajax4jsf.dev.java.net/ajax" + xmlns:s="http://jboss.com/products/seam/taglib"> + + <s:div styleClass="forumTopPosters box"> + + <s:div styleClass="boxHeader"> + <h:outputText value="#{preferences.get('ForumTopPosters', currentMacro).title}"/> + </s:div> + + <div class="boxContent"> + + <h:dataTable value="#{forumQuery.topPosters}" var="p" + rendered="#{not empty forumQuery.topPosters and forumQuery.topPosters.size() > 0}" + styleClass="datatable forumTopPostersTable" + headerClass="alignCenter" + columnClasses="fifteenPercentColumn alignCenter indexColumn, + defaultColumn alignCenter nameColumn, + twentyPercentColumn alignCenter joinedOnColumn, + twentyPercentColumn alignCenter ratingPointsColumn" + rowClasses="rowOdd, rowEven" + cellpadding="0" cellspacing="0" border="0"> + + <h:column> + <f:facet name="header"> + <h:outputText value="#{messages['forumTopPosters.label.Position']}"/> + </f:facet> + <h:outputText value="#{forumQuery.topPosters.indexOf(p)+1}."/> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="#{messages['forumTopPosters.label.User']}"/> + </f:facet> + <ui:include src="../../includes/userInfoLink.xhtml"> + <ui:param name="user" value="#{p}"/> + </ui:include> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="#{messages['forumTopPosters.label.JoinedOn']}"/> + </f:facet> + <h:outputText value="#{p.createdOn}"> + <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/> + </h:outputText> + <h:outputText value=" #{preferences.get('Wiki').timeZone}"/> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="#{messages['forumTopPosters.label.RatingPoints']}"/> + </f:facet> + <h:outputText value="#{p.ratingPoints}"/> + </h:column> + + </h:dataTable> + + </div> + + <s:div styleClass="forumTopPostersEmpty" + rendered="#{empty forumQuery.topPosters or forumQuery.topPosters.size() == 0}"> + <h:outputText value="#{messages['forumTopPosters.label.NoPostersFound']}"/> + </s:div> + + <div class="boxFooter"/> + + </s:div> + +</wiki:plugin> + + Modified: trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -31,7 +31,7 @@ <h:column> <h:outputLink value="#{preferences.get('JiraIssueList', currentMacro).url}/browse/#{i.key}"> <h:outputText - value="#{wiki:truncateString(i.summary, preferences.get('JiraIssueList', currentMacro).truncateSummary, '...')}"/> + value="(#{i.key})  #{wiki:truncateString(i.summary, preferences.get('JiraIssueList', currentMacro).truncateSummary, '...')}"/> </h:outputLink> </h:column> Modified: trunk/examples/wiki/view/themes/default/css/forumReplies.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/forumReplies.css 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/default/css/forumReplies.css 2008-01-25 11:24:26 UTC (rev 7229) @@ -0,0 +1,16 @@ +.forumReplyControls { + width: 100%; +} + +.forumReplyRating { + text-align: left; +} + +.forumReplyStatus { + text-align: right; +} + +.forumReplyControl { + text-align: right; + width: 200px; +} \ No newline at end of file Modified: trunk/examples/wiki/view/themes/default/css/template.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/template.css 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/default/css/template.css 2008-01-25 11:24:26 UTC (rev 7229) @@ -940,9 +940,17 @@ } .commentControls { - margin-bottom: 10px; + margin-bottom: 5px; } +.commentRating, .commentRatingChooser { + font-weight: bold; +} + +.commentRating .label, .commentRatingChooser .label { + vertical-align: bottom; +} + .commentFirstLevel { background: #fff url(../img/input.bg.gif) 0 0 no-repeat; } Added: trunk/examples/wiki/view/themes/default/img/star.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/wiki/view/themes/default/img/star.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/wiki/view/themes/default/img/star_grey.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/wiki/view/themes/default/img/star_grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/examples/wiki/view/themes/default/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -234,6 +234,19 @@ // ###################### Design ################################# + function highlightStars(item, range, end) { + for (i = 1; i <= range; i++) { + styleClass = ".item"+item+"-rate"+i; + jQuery(styleClass) + .attr("src", "#{themePath}/img/star_grey.gif"); + } + for (i = 1; i <= end; i++) { + styleClass = ".item"+item+"-rate"+i; + jQuery(styleClass) + .attr("src", "#{themePath}/img/star.gif"); + } + } + function pulsate(query) { var blinkCount = 4*2; do { Modified: trunk/examples/wiki/view/themes/sfwkorg/css/forumReplies.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/forumReplies.css 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/sfwkorg/css/forumReplies.css 2008-01-25 11:24:26 UTC (rev 7229) @@ -0,0 +1,16 @@ +.forumReplyControls { + width: 100%; +} + +.forumReplyRating { + text-align: left; +} + +.forumReplyStatus { + text-align: right; +} + +.forumReplyControl { + text-align: right; + width: 200px; +} \ No newline at end of file Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-25 11:24:26 UTC (rev 7229) @@ -726,9 +726,17 @@ } .commentControls { - margin-bottom: 10px; + margin-bottom: 5px; } +.commentRating, .commentRatingChooser { + font-weight: bold; +} + +.commentRating .label, .commentRatingChooser .label { + vertical-align: bottom; +} + .commentFirstLevel { background: #fff url(../img/input.bg.gif) 0 0 no-repeat; } Added: trunk/examples/wiki/view/themes/sfwkorg/img/star.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/wiki/view/themes/sfwkorg/img/star.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/wiki/view/themes/sfwkorg/img/star_grey.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/wiki/view/themes/sfwkorg/img/star_grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -236,6 +236,17 @@ // ###################### Design ################################# + function highlightStars(item, range, end) { + for (i = 1; i <= range; i++) { + styleClass = ".item"+item+"-rate"+i; + jQuery(styleClass).attr("src", "#{themePath}/img/star_grey.gif"); + } + for (i = 1; i <= end; i++) { + styleClass = ".item"+item+"-rate"+i; + jQuery(styleClass).attr("src", "#{themePath}/img/star.gif"); + } + } + function pulsate(query) { var blinkCount = 2*2; do { Modified: trunk/examples/wiki/view/userInfo_d.xhtml =================================================================== --- trunk/examples/wiki/view/userInfo_d.xhtml 2008-01-25 00:10:16 UTC (rev 7228) +++ trunk/examples/wiki/view/userInfo_d.xhtml 2008-01-25 11:24:26 UTC (rev 7229) @@ -66,6 +66,15 @@ </s:div> </s:div> + <s:div styleClass="entry"> + <s:div styleClass="label"> + <h:outputText value="#{messages['lacewiki.label.userInfo.RatingPoints']}:"/> + </s:div> + <s:div styleClass="output"> + <h:outputText value="#{userHome.ratingPoints}"/> + </s:div> + </s:div> + </s:div> </s:div>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7228 - branches/Seam_2_0/src/pdf/org/jboss/seam/pdf.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-01-24 19:10:16 -0500 (Thu, 24 Jan 2008) New Revision: 7228 Modified: branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java Log: JBSEAM-2532 Modified: branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java =================================================================== --- branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java 2008-01-24 23:55:11 UTC (rev 7227) +++ branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java 2008-01-25 00:10:16 UTC (rev 7228) @@ -1,6 +1,10 @@ package org.jboss.seam.pdf; -public class DocumentData { +import java.io.Serializable; + +public class DocumentData + implements Serializable +{ byte[] data; DocumentType documentType; String baseName;

16 years, 3 months

1
0
0 / 0

Seam SVN: r7227 - trunk/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-01-24 18:55:11 -0500 (Thu, 24 Jan 2008) New Revision: 7227 Modified: trunk/doc/reference/en/modules/security.xml Log: JBSEAM-2533 Modified: trunk/doc/reference/en/modules/security.xml =================================================================== --- trunk/doc/reference/en/modules/security.xml 2008-01-24 23:53:21 UTC (rev 7226) +++ trunk/doc/reference/en/modules/security.xml 2008-01-24 23:55:11 UTC (rev 7227) @@ -541,7 +541,7 @@ <row> <entry> <para> - <literal>org.jboss.seam.security.loginSuccessful</literal> + <literal>org.jboss.seam.loginSuccessful</literal> </para> </entry> <entry> @@ -553,7 +553,7 @@ <row> <entry> <para> - <literal>org.jboss.seam.security.loginFailed</literal> + <literal>org.jboss.seam.loginFailed</literal> </para> </entry> <entry> @@ -566,7 +566,7 @@ <row> <entry> <para> - <literal>org.jboss.seam.security.NotLoggedIn</literal> + <literal>org.jboss.seam.NotLoggedIn</literal> </para> </entry> <entry>

16 years, 3 months

1
0
0 / 0

Seam SVN: r7226 - in trunk/src/main/org/jboss/seam: security and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-01-24 18:53:21 -0500 (Thu, 24 Jan 2008) New Revision: 7226 Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java Log: JBSEAM-2533 Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java =================================================================== --- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-01-24 23:52:55 UTC (rev 7225) +++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-01-24 23:53:21 UTC (rev 7226) @@ -575,12 +575,6 @@ // TODO - Deprecated, remove for next major release Events.instance().raiseEvent("org.jboss.seam.notLoggedIn"); Events.instance().raiseEvent(Identity.EVENT_NOT_LOGGED_IN); - - FacesMessages.instance().addFromResourceBundleOrDefault( - FacesMessage.SEVERITY_WARN, - "org.jboss.seam.NotLoggedIn", - "Please log in first" - ); } public static String toString(Object returnValue) Modified: trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java =================================================================== --- trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java 2008-01-24 23:52:55 UTC (rev 7225) +++ trunk/src/main/org/jboss/seam/security/FacesSecurityEvents.java 2008-01-24 23:53:21 UTC (rev 7226) @@ -114,6 +114,16 @@ getLoginSuccessfulMessage(), Identity.instance().getUsername()); } + + @Observer(Identity.EVENT_NOT_LOGGED_IN) + public void addNotLoggedInMessage() + { + FacesMessages.instance().addFromResourceBundleOrDefault( + FacesMessage.SEVERITY_WARN, + "org.jboss.seam.NotLoggedIn", + "Please log in first" + ); + } public Severity getLoginSuccessfulMessageSeverity() {

16 years, 3 months

1
0
0 / 0

Seam SVN: r7225 - trunk/seam-gen/resources.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-01-24 18:52:55 -0500 (Thu, 24 Jan 2008) New Revision: 7225 Modified: trunk/seam-gen/resources/messages_bg.properties trunk/seam-gen/resources/messages_de.properties trunk/seam-gen/resources/messages_en.properties trunk/seam-gen/resources/messages_fr.properties trunk/seam-gen/resources/messages_tr.properties Log: JBSEAM-2533 Modified: trunk/seam-gen/resources/messages_bg.properties =================================================================== --- trunk/seam-gen/resources/messages_bg.properties 2008-01-24 23:27:40 UTC (rev 7224) +++ trunk/seam-gen/resources/messages_bg.properties 2008-01-24 23:52:55 UTC (rev 7225) @@ -66,10 +66,10 @@ org.jboss.seam.TaskEnded = \u0417\u0430\u0434\u0430\u0447\u0430 #0 \u0435 \u043F\u0440\u0438\u043A\u043B\u044E\u0447\u0438\u043B\u0430 org.jboss.seam.TaskNotFound = \u0417\u0430\u0434\u0430\u0447\u0430 #0 \u043D\u0435 \u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0430 org.jboss.seam.TransactionFailed = \u0422\u0440\u0430\u043D\u0437\u0430\u043A\u0446\u0438\u044F \u043D\u0435 \u0435 \u0443\u0441\u043F\u044F\u043B\u0430 +org.jboss.seam.NotLoggedIn = \u041C\u043E\u043B\u044F \u043F\u044A\u0440\u0432\u043E \u0441\u0435 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u0430\u0439\u0442\u0435 -org.jboss.seam.security.loginFailed = \u041D\u0435\u0443\u0441\u043F\u0435\u0448\u0435\u043D \u0432\u0445\u043E\u0434 -org.jboss.seam.security.loginSuccessful = \u0417\u0434\u0440\u0430\u0432\u0435\u0439, #0 -org.jboss.seam.security.notLoggedIn = \u041C\u043E\u043B\u044F \u043F\u044A\u0440\u0432\u043E \u0441\u0435 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u0430\u0439\u0442\u0435 +org.jboss.seam.loginFailed = \u041D\u0435\u0443\u0441\u043F\u0435\u0448\u0435\u043D \u0432\u0445\u043E\u0434 +org.jboss.seam.loginSuccessful = \u0417\u0434\u0440\u0430\u0432\u0435\u0439, #0 right = \u203A Modified: trunk/seam-gen/resources/messages_de.properties =================================================================== --- trunk/seam-gen/resources/messages_de.properties 2008-01-24 23:27:40 UTC (rev 7224) +++ trunk/seam-gen/resources/messages_de.properties 2008-01-24 23:52:55 UTC (rev 7225) @@ -16,9 +16,8 @@ validator.size=die Gr\u00F6\u00DFe muss zischen {min} und {max} liegen validator.email=muss einer wohlgeformten E-Mailadresse entsprechen -org.jboss.seam.security.loginFailed=Anmeldung fehlgeschlagen -org.jboss.seam.security.loginSuccessful=Willkommen, #0 -org.jboss.seam.security.notLoggedIn=Bitte melden Sie sich zun\u00E4chst an +org.jboss.seam.loginFailed=Anmeldung fehlgeschlagen +org.jboss.seam.loginSuccessful=Willkommen, #0 org.jboss.seam.TransactionFailed=Transaktion fehlgeschlagen org.jboss.seam.NoConversation=Der Vorgang wurde bereits beendet, verarbeitet eine andere Abfrage oder ergab eine Zeit\u00FCberschreitung @@ -27,6 +26,7 @@ org.jboss.seam.ProcessNotFound=Prozess #0 nicht gefunden org.jboss.seam.TaskEnded=Funktion #0 wurde bereits beendet org.jboss.seam.TaskNotFound=Funktion #0 nicht gefunden +org.jboss.seam.NotLoggedIn=Bitte melden Sie sich zun\u00E4chst an javax.faces.component.UIInput.CONVERSION=Wert konnte nicht in den erwarteten Typ umgewandelt werden javax.faces.component.UIInput.REQUIRED=Wert erforderlich Modified: trunk/seam-gen/resources/messages_en.properties =================================================================== --- trunk/seam-gen/resources/messages_en.properties 2008-01-24 23:27:40 UTC (rev 7224) +++ trunk/seam-gen/resources/messages_en.properties 2008-01-24 23:52:55 UTC (rev 7225) @@ -16,9 +16,8 @@ validator.size=size must be between {min} and {max} validator.email=must be a well-formed email address -org.jboss.seam.security.loginFailed=Login failed -org.jboss.seam.security.loginSuccessful=Welcome, #0 -org.jboss.seam.security.notLoggedIn=Please log in first +org.jboss.seam.loginFailed=Login failed +org.jboss.seam.loginSuccessful=Welcome, #0 org.jboss.seam.TransactionFailed=Transaction failed org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request @@ -27,6 +26,7 @@ org.jboss.seam.ProcessNotFound=Process #0 not found org.jboss.seam.TaskEnded=Task #0 already ended org.jboss.seam.TaskNotFound=Task #0 not found +org.jboss.seam.NotLoggedIn=Please log in first javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type javax.faces.component.UIInput.REQUIRED=value is required Modified: trunk/seam-gen/resources/messages_fr.properties =================================================================== --- trunk/seam-gen/resources/messages_fr.properties 2008-01-24 23:27:40 UTC (rev 7224) +++ trunk/seam-gen/resources/messages_fr.properties 2008-01-24 23:52:55 UTC (rev 7225) @@ -24,9 +24,8 @@ org.jboss.seam.security.NotLoggedInException = Veuillez d'abord vous connecter org.jboss.seam.unexpected.error = Erreur inattendue. Veuillez essayez de nouveau. -org.jboss.seam.security.loginFailed = La connexion a �chou�. -org.jboss.seam.security.loginSuccessful = Bienvenue, {0} -org.jboss.seam.notLoggedIn = Veuillez d'abord vous connecter. +org.jboss.seam.loginFailed = La connexion a �chou�. +org.jboss.seam.loginSuccessful = Bienvenue, {0} org.jboss.seam.TransactionFailed = La transaction a �chou�. org.jboss.seam.NoConversation = La conversation s'est interrompue, a d�pass� les d�lais ou traite une autre requ�te. @@ -35,6 +34,7 @@ org.jboss.seam.ProcessNotFound = Le processus #0 n'a pas �t� trouv�. org.jboss.seam.TaskEnded = T�che #0 d�j� achev�e org.jboss.seam.TaskNotFound = La t�che #0 n'a pas �t� trouv�e. +org.jboss.seam.NotLoggedIn = Veuillez d'abord vous connecter. javax.faces.component.UIInput.CONVERSION = La valeur ne peut �tre convertie dans le type attendu javax.faces.component.UIInput.REQUIRED = Une valeur est requise. Modified: trunk/seam-gen/resources/messages_tr.properties =================================================================== --- trunk/seam-gen/resources/messages_tr.properties 2008-01-24 23:27:40 UTC (rev 7224) +++ trunk/seam-gen/resources/messages_tr.properties 2008-01-24 23:52:55 UTC (rev 7225) @@ -16,9 +16,8 @@ validator.size=girilen de\u011ferin boyut {min} ile {max} aras\u0131nda olmal\u0131d\u0131r validator.email=girilen de\u011fer e-posta adresi format\u0131na uygun olmal\u0131d\u0131r -org.jboss.seam.security.loginFailed=Oturum a\u00e7\u0131lamad\u0131 -org.jboss.seam.security.loginSuccessful=Ho\u015fgeldiniz, #0 -org.jboss.seam.notLoggedIn=L\u00fctfen \u00f6ncelikle oturum a\u00e7\u0131n +org.jboss.seam.loginFailed=Oturum a\u00e7\u0131lamad\u0131 +org.jboss.seam.loginSuccessful=Ho\u015fgeldiniz, #0 org.jboss.seam.TransactionFailed=\u0130\u015flem tamamlanamad\u0131 org.jboss.seam.NoConversation=Konu\u015fma sonland\u0131, zaman a\u015f\u0131m\u0131na u\u011frad\u0131 ya da ba\u015fka bir talebi i\u015fliyordu @@ -27,6 +26,7 @@ org.jboss.seam.ProcessNotFound=#0 s\u00fcreci bulunamad\u0131 org.jboss.seam.TaskEnded=#0 g\u00f6revi sonlanm\u0131\u015f org.jboss.seam.TaskNotFound=#0 g\u00f6revi bulunamad\u0131 +org.jboss.seam.NotLoggedIn=L\u00fctfen \u00f6ncelikle oturum a\u00e7\u0131n javax.faces.component.UIInput.CONVERSION=girilen de\u011fer, beklenen tipe d\u00f6n\u00fc\u015ft\u00fcr\u00fclemedi javax.faces.component.UIInput.REQUIRED=bir de\u011fer girilmesi gereklidir

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits January 2008