April 2009 - seam-commits - Jboss List Archives

Seam SVN: r10685 - in modules/trunk: faces and 1 other directories.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 17:45:28 -0400 (Tue, 28 Apr 2009) New Revision: 10685 Modified: modules/trunk/el/pom.xml modules/trunk/faces/pom.xml modules/trunk/international/pom.xml Log: clean up POM add whitespace use webbeans properties push common test dependencies to parent Modified: modules/trunk/el/pom.xml =================================================================== --- modules/trunk/el/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/el/pom.xml … [View More]2009-04-28 21:45:28 UTC (rev 10685) @@ -31,39 +31,31 @@ </build> <dependencies> -  + <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> </dependency> + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> +  + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> -  - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> -  - </dependency> + </dependencies> </project> Modified: modules/trunk/faces/pom.xml =================================================================== --- modules/trunk/faces/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/faces/pom.xml 2009-04-28 21:45:28 UTC (rev 10685) @@ -15,38 +15,48 @@ <name>Seam Faces Module</name> <dependencies> + <dependency> <groupId>${seam.groupId}</groupId> <artifactId>seam-el</artifactId> </dependency> + <dependency> <groupId>${seam.groupId}</groupId> <artifactId>seam-international</artifactId> </dependency> + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> +  + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - </dependency> + </dependencies> </project> Modified: modules/trunk/international/pom.xml =================================================================== --- modules/trunk/international/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/international/pom.xml 2009-04-28 21:45:28 UTC (rev 10685) @@ -32,63 +32,25 @@ <dependencies> -  <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> + <groupId>${seam.groupId}</groupId> + <artifactId>seam-el</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core-test</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> +  + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - -  - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <version>3.1.0-Alpha1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>seam-el</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -100,18 +62,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> -  - </dependency> - </dependencies> </project> [View Less]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10684 - modules/trunk/parent.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 17:43:44 -0400 (Tue, 28 Apr 2009) New Revision: 10684 Modified: modules/trunk/parent/pom.xml Log: add test dependencies Modified: modules/trunk/parent/pom.xml =================================================================== --- modules/trunk/parent/pom.xml 2009-04-28 21:43:08 UTC (rev 10683) +++ modules/trunk/parent/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) @@ -145,6 +145,35 @@ </plugins> </pluginManagement> </… [View More]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10683 - modules/trunk/version-matrix.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 17:43:08 -0400 (Tue, 28 Apr 2009) New Revision: 10683 Modified: modules/trunk/version-matrix/pom.xml Log: oops, fix broken XML Modified: modules/trunk/version-matrix/pom.xml =================================================================== --- modules/trunk/version-matrix/pom.xml 2009-04-28 21:42:25 UTC (rev 10682) +++ modules/trunk/version-matrix/pom.xml 2009-04-28 21:43:08 UTC (rev 10683) @@ -52,8 +52,8 @@ <properties> <seam.… [View More]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10682 - modules/trunk/version-matrix.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 17:42:25 -0400 (Tue, 28 Apr 2009) New Revision: 10682 Modified: modules/trunk/version-matrix/pom.xml Log: add property for webbeans version and groupId add versions for test dependencies Modified: modules/trunk/version-matrix/pom.xml =================================================================== --- modules/trunk/version-matrix/pom.xml 2009-04-28 21:23:52 UTC (rev 10681) +++ modules/trunk/version-matrix/pom.xml 2009-04-28 21:42:25 UTC (rev 10682) @… [View More]@ -52,6 +52,8 @@ <properties> <seam.version>3.0.0-SNAPSHOT</seam.version> <seam.groupId>org.jboss.seam</seam.groupId> + <webbeans.version>1.0.0-SNAPSHOT</seam.version> + <webbeans.groupId>org.jboss.webbeans</seam.groupId> </properties> <dependencyManagement> @@ -134,6 +136,12 @@ <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> <version>1.0_02.CR4</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -155,22 +163,28 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> + <groupId>${webbeans.groupId}</groupId> <artifactId>jsr299-api</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${webbeans.version}</version> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> + <groupId>${webbeans.groupId}</groupId> <artifactId>webbeans-logging</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${webbeans.version}</version> </dependency> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> + <groupId>${webbeans.groupId}.servlet</groupId> <artifactId>webbeans-servlet</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${webbeans.version}</version> </dependency> + + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-core-test</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.drools</groupId> @@ -183,6 +197,33 @@ <artifactId>drools-compiler</artifactId> <version>4.0.4</version> </dependency> + +  + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <version>3.1.0-Alpha1</version> + <exclusions> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jbossws</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jboss.jbossws</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.jbpm</groupId> @@ -195,15 +236,15 @@ <artifactId>seam-bpm</artifactId> <version>${seam.version}</version> </dependency> - + <dependency> <groupId>${seam.groupId}</groupId> - <artifactId>seam-faces</artifactId> + <artifactId>seam-drools</artifactId> <version>${seam.version}</version> </dependency> - + <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-el</artifactId> <version>${seam.version}</version> </dependency> @@ -216,22 +257,16 @@ <dependency> <groupId>${seam.groupId}</groupId> - <artifactId>seam-drools</artifactId> + <artifactId>seam-international</artifactId> <version>${seam.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-persistence</artifactId> <version>${seam.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>seam-international</artifactId> - <version>${seam.version}</version> - </dependency> - </dependencies> </dependencyManagement> [View Less]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10681 - in modules/trunk/international/src: test/java/org/jboss/seam/international and 1 other directory.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 17:23:52 -0400 (Tue, 28 Apr 2009) New Revision: 10681 Added: modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesTest.java Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java modules/trunk/international/src/test/java/org/jboss/seam/international/InterpolatorTest.java modules/… [View More]trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java Log: standalone integration test for StatusMessages add initializer to StatusMessages Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java =================================================================== --- modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-04-28 20:29:58 UTC (rev 10680) +++ modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-04-28 21:23:52 UTC (rev 10681) @@ -1,5 +1,6 @@ package org.jboss.seam.international; +import java.io.Serializable; import org.jboss.seam.el.*; import java.text.MessageFormat; import java.util.Locale; @@ -17,7 +18,7 @@ */ public @Dependent -class Interpolator +class Interpolator implements Serializable { private static final LogProvider log = Logging.getLogProvider(Interpolator.class); Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java =================================================================== --- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-28 20:29:58 UTC (rev 10680) +++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-28 21:23:52 UTC (rev 10681) @@ -34,8 +34,7 @@ import javax.annotation.Named; import javax.context.ConversationScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.inject.Initializer; import javax.validation.ConstraintViolation; import org.jboss.seam.international.StatusMessage.Severity; @@ -62,16 +61,23 @@ @ConversationScoped class StatusMessages implements Serializable { - private static final long serialVersionUID = -5395975397632138270L; + private static final long serialVersionUID = -5396789975397138270L; private List<StatusMessage> messages = new ArrayList<StatusMessage>(); private Map<String, List<StatusMessage>> keyedMessages = new HashMap<String, List<StatusMessage>>(); private transient List<Runnable> tasks; + + private Interpolator interpolator; + + public StatusMessages() {} + + public @Initializer StatusMessages(Interpolator interpolator) + { + this.interpolator = interpolator; + } - @Current Interpolator interpolator; - /** * Get a list of StatusMessage objects that are not associated with a "client id". * @@ -153,14 +159,7 @@ if (!message.isEmpty()) { messages.add(message); - getTasks().add( - new Runnable() - { - public void run() - { - message.interpolate(interpolator, params); - } - }); + getTasks().add(new InterpolateMessageTask(message, params)); } } @@ -191,14 +190,7 @@ list.add(message); keyedMessages.put(id, list); } - getTasks().add( - new Runnable() - { - public void run() - { - message.interpolate(interpolator, params); - } - }); + getTasks().add(new InterpolateMessageTask(message, params)); } } @@ -433,6 +425,16 @@ addToControl(id, WARN, cv.getMessage()); } + /** + * Run the tasks on each message that interpolate the message templates. View layer + * modules are expected to invoke this message. The view layer implementation may override + * this method to transpose the messages into the view layer-specific messages. + */ + public void onBeforeRender() + { + doRunTasks(); + } + private List<Runnable> getTasks() { if (tasks == null) @@ -453,4 +455,21 @@ tasks.clear(); } } + + private class InterpolateMessageTask implements Runnable + { + private final StatusMessage message; + private final Object[] params; + + public InterpolateMessageTask(StatusMessage message, Object[] params) + { + this.message = message; + this.params = params; + } + + public void run() + { + message.interpolate(interpolator, params); + } + } } Modified: modules/trunk/international/src/test/java/org/jboss/seam/international/InterpolatorTest.java =================================================================== --- modules/trunk/international/src/test/java/org/jboss/seam/international/InterpolatorTest.java 2009-04-28 20:29:58 UTC (rev 10680) +++ modules/trunk/international/src/test/java/org/jboss/seam/international/InterpolatorTest.java 2009-04-28 21:23:52 UTC (rev 10681) @@ -59,7 +59,7 @@ @Test public void testMultipleValueExpressionsAndParameters() { - String result = getInterpolatorInstance().interpolate("#{name}, meet {0}. {0}, meet #{name}. Everyone, meet {1}.", "Pete", "Gavin"); + String result = getInterpolatorInstance().interpolate("#{name}, meet {0}. #0, meet #{name}. Everyone, meet {1}.", "Pete", "Gavin"); assertEquals(result, "Dan, meet Pete. Pete, meet Dan. Everyone, meet Gavin."); } Added: modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesTest.java =================================================================== --- modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesTest.java (rev 0) +++ modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesTest.java 2009-04-28 21:23:52 UTC (rev 10681) @@ -0,0 +1,50 @@ +package org.jboss.seam.international; + +import org.jboss.seam.el.Expressions; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.webbeans.context.ConversationContext; +import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import static org.testng.Assert.*; +import org.testng.annotations.Test; + +/** + * Integration test the StatusMessages bean to ensure that it finds + * and uses the interpolator and interpolates the message templates. + * + * @author Dan Allen + */ +@Artifact(addCurrentPackage = false) +@Classes( +{ + StatusMessages.class, Interpolator.class, Expressions.class, LocaleProducer.class +}) +public class StatusMessagesTest extends AbstractWebBeansTest +{ + @Override + public void beforeMethod() + { + super.beforeMethod(); + ConversationContext.instance().setBeanStore(new ConcurrentHashMapBeanStore()); + ConversationContext.instance().setActive(true); + } + + @Test + public void testAddGlobalMessageFromTemplateWithInterpolations() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.add("The hole numbers of Amen Corner at #{'Augusta National'} are {0}, {1} and {2}.", 11, 12, 13); + statusMessages.onBeforeRender(); + assertEquals(statusMessages.getGlobalMessages().size(), 1); + StatusMessage message = statusMessages.getGlobalMessages().get(0); + assertEquals(message.getSummary(), "The hole numbers of Amen Corner at Augusta National are 11, 12 and 13."); + } + + // TODO test loading messages from resource bundle when resource bundle is ready + + private StatusMessages getStatusMessagesInstance() + { + return getCurrentManager().getInstanceByType(StatusMessages.class); + } +} Modified: modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java =================================================================== --- modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java 2009-04-28 20:29:58 UTC (rev 10680) +++ modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java 2009-04-28 21:23:52 UTC (rev 10681) @@ -16,8 +16,6 @@ @Test(groups = "unit") public class StatusMessagesUnitTest { - private Interpolator identityInterpolator = new IdentityInterpolator(); - /** * Check that the add() method appends a global message, that the * default severity is INFO, and that interpolation is deferred. @@ -33,7 +31,7 @@ assertSame(message.getSeverity(), StatusMessage.Severity.INFO); assertFalse(message.isEmpty()); assertNull(message.getSummary()); - message.interpolate(identityInterpolator); + statusMessages.onBeforeRender(); assertEquals(message.getSummary(), "Simple message"); assertNull(message.getDetail()); } @@ -49,7 +47,7 @@ assertEquals(statusMessages.getGlobalMessages().size(), 1); StatusMessage message = statusMessages.getGlobalMessages().get(0); assertSame(message.getSeverity(), StatusMessage.Severity.WARN); - message.interpolate(identityInterpolator); + statusMessages.onBeforeRender(); assertEquals(message.getSummary(), "Summary template"); assertEquals(message.getDetail(), "Detail template"); } @@ -81,7 +79,7 @@ StatusMessage message = messages.get(0); assertSame(message.getSeverity(), StatusMessage.Severity.INFO); assertNull(message.getSummary()); - message.interpolate(identityInterpolator); + statusMessages.onBeforeRender(); assertEquals(message.getSummary(), "Available!"); assertNull(message.getDetail()); statusMessages.addToControl("username", "Nice choice"); @@ -101,7 +99,7 @@ assertEquals(statusMessages.getKeyedMessages().size(), 0); StatusMessage message = statusMessages.getGlobalMessages().get(0); assertSame(message.getSeverity(), StatusMessage.Severity.WARN); - message.interpolate(identityInterpolator); + statusMessages.onBeforeRender(); assertEquals(message.getSummary(), "Invalid number"); } @@ -187,9 +185,10 @@ private StatusMessages getStatusMessagesInstance() { - return new StatusMessages(); + return new StatusMessages(new IdentityInterpolator()); } + // QUESTION should I make this a @Mock Interpolator and use Web Beans to test? private class IdentityInterpolator extends Interpolator { @Override [View Less]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10680 - in modules/trunk/international/src: test/java/org/jboss/seam/international and 1 other directory.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 16:29:58 -0400 (Tue, 28 Apr 2009) New Revision: 10680 Added: modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessage.java modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java Log: add additional JavaDoc and unit tests for StatusMessages Modified: modules/trunk/international/… [View More]src/main/java/org/jboss/seam/international/StatusMessage.java =================================================================== --- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessage.java 2009-04-28 18:24:05 UTC (rev 10679) +++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessage.java 2009-04-28 20:29:58 UTC (rev 10680) @@ -1,3 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + * $Id$ + */ package org.jboss.seam.international; import java.io.Serializable; Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java =================================================================== --- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-28 18:24:05 UTC (rev 10679) +++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-28 20:29:58 UTC (rev 10680) @@ -1,3 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + * $Id$ + */ package org.jboss.seam.international; import static org.jboss.seam.international.StatusMessage.Severity.INFO; @@ -17,10 +40,22 @@ import org.jboss.seam.international.StatusMessage.Severity; /** - * Abstract base class for providing status messages. View layers should provide - * a concrete implementation. + * {@link StatusMessages} is a technology agnostic repository for holding + * status messages intended to be displayed to an end user. View layer modules + * should provide a concrete implementation that handles tranposing the generic + * status messages into status messages specific to the view techology (e.g., + * JSF, Wicket). + * + * A status message can either be global or it can be keyed to a "client id", which + * is the id of a cooresponding user interface component on the page. + * + * Seam will interpolate value expressions and positional parameters in + * message templates. Interpolation is deferred until just before the next view + * in the conversation is rendered. * * @author Pete Muir + * @author Dan Allen + * @see StatusMessage */ public @Named("org.jboss.seam.international.statusMessages") @@ -35,20 +70,43 @@ private transient List<Runnable> tasks; - protected @Current Manager manager; + @Current Interpolator interpolator; - protected List<StatusMessage> getMessages() + /** + * Get a list of StatusMessage objects that are not associated with a "client id". + * + * @return A list of StatusMessage objects not associated with a "client id" + */ + public List<StatusMessage> getGlobalMessages() { return messages; } + + /** + * Get a list of StatusMessage objects that are associated with the given "client id". + * + * @param id The "client id" of the user interface component to which the messages apply + * + * @return A list of StatusMessage objects associated with the given "client id" + */ + public List<StatusMessage> getKeyedMessages(String id) + { + return keyedMessages.get(id); + } - protected Map<String, List<StatusMessage>> getKeyedMessages() + /** + * Get a map of StatusMessage objects associated with a "client id". The keys in the map are + * the "client id" values and the values for each key are the messages. + * + * @return A map of StatusMessage objects keyed by "client id" + */ + public Map<String, List<StatusMessage>> getKeyedMessages() { return keyedMessages; } /** - * Clear all status messages + * Clear all status messages. */ public void clear() { @@ -56,11 +114,27 @@ keyedMessages.clear(); } + /** + * Clear all status messages associated with a "client id". + */ + public void clearKeyedMessages() + { + keyedMessages.clear(); + } + + /** + * Clear all status messages associated with a given "client id". + * + * @param id The "client id" of the user interface component to which the messages apply + */ public void clearKeyedMessages(String id) { keyedMessages.remove(id); } + /** + * Clear all status messages not associated with a "client id". + */ public void clearGlobalMessages() { messages.clear(); @@ -84,7 +158,7 @@ { public void run() { - message.interpolate(manager.getInstanceByType(Interpolator.class), params); + message.interpolate(interpolator, params); } }); } @@ -122,7 +196,7 @@ { public void run() { - message.interpolate(manager.getInstanceByType(Interpolator.class), params); + message.interpolate(interpolator, params); } }); } Added: modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java =================================================================== --- modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java (rev 0) +++ modules/trunk/international/src/test/java/org/jboss/seam/international/StatusMessagesUnitTest.java 2009-04-28 20:29:58 UTC (rev 10680) @@ -0,0 +1,249 @@ +package org.jboss.seam.international; + +import java.util.List; +import javax.validation.ConstraintDescriptor; +import javax.validation.ConstraintViolation; +import static org.testng.Assert.*; +import org.testng.annotations.Test; + +/** + * A set of tests which exercise the StatusMessages as a unit (no external dependencies). + * These tests focus primarily on the creation and storage of the StatusMessage. + * + * @author Dan Allen + * @see StatusMessages + */ +@Test(groups = "unit") +public class StatusMessagesUnitTest +{ + private Interpolator identityInterpolator = new IdentityInterpolator(); + + /** + * Check that the add() method appends a global message, that the + * default severity is INFO, and that interpolation is deferred. + */ + @Test + public void testAddGlobalMessageFromTemplateWithDefaultSeverity() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.add("Simple message"); + assertEquals(statusMessages.getGlobalMessages().size(), 1); + assertEquals(statusMessages.getKeyedMessages().size(), 0); + StatusMessage message = statusMessages.getGlobalMessages().get(0); + assertSame(message.getSeverity(), StatusMessage.Severity.INFO); + assertFalse(message.isEmpty()); + assertNull(message.getSummary()); + message.interpolate(identityInterpolator); + assertEquals(message.getSummary(), "Simple message"); + assertNull(message.getDetail()); + } + + /** + * Test that separate summary and detail templates can be specified. + */ + @Test + public void testAddMessageWithSummaryAndDetail() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.add(StatusMessage.Severity.WARN, null, null, "Summary template", "Detail template"); + assertEquals(statusMessages.getGlobalMessages().size(), 1); + StatusMessage message = statusMessages.getGlobalMessages().get(0); + assertSame(message.getSeverity(), StatusMessage.Severity.WARN); + message.interpolate(identityInterpolator); + assertEquals(message.getSummary(), "Summary template"); + assertEquals(message.getDetail(), "Detail template"); + } + + /** + * Test that the severity is processed correctly when adding a global message. + */ + @Test + public void testAddGlobalWarningMessageFromTemplate() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.add(StatusMessage.Severity.WARN, "Achtung!"); + assertEquals(statusMessages.getGlobalMessages().size(), 1); + assertSame(statusMessages.getGlobalMessages().get(0).getSeverity(), StatusMessage.Severity.WARN); + } + + /** + * Test that the addToControl() associates a message with a client id, that the + * default severity is INFO, and that interpolation is deferred. + */ + @Test + public void testAddMessageToControlFromTemplateWithDefaultSeverity() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.addToControl("username", "Available!"); + List<StatusMessage> messages = statusMessages.getKeyedMessages("username"); + assertNotNull(messages); + assertEquals(messages.size(), 1); + StatusMessage message = messages.get(0); + assertSame(message.getSeverity(), StatusMessage.Severity.INFO); + assertNull(message.getSummary()); + message.interpolate(identityInterpolator); + assertEquals(message.getSummary(), "Available!"); + assertNull(message.getDetail()); + statusMessages.addToControl("username", "Nice choice"); + assertEquals(statusMessages.getKeyedMessages("username").size(), 2); + } + + /** + * Test that add() can create a global message with severity WARN from the contraint violation message. + */ + @Test + public void testAddGlobalMessageFromConstraintViolation() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + ConstraintViolation violation = new ConstraintViolationStub("Invalid number", "creditCardNumber"); + statusMessages.add(violation); + assertEquals(statusMessages.getGlobalMessages().size(), 1); + assertEquals(statusMessages.getKeyedMessages().size(), 0); + StatusMessage message = statusMessages.getGlobalMessages().get(0); + assertSame(message.getSeverity(), StatusMessage.Severity.WARN); + message.interpolate(identityInterpolator); + assertEquals(message.getSummary(), "Invalid number"); + } + + /** + * Test that addToControl() can create a message associated with the "client id" that is equivalent to the + * last path segment of the property path with severity WARN from the contraint violation message. + */ + @Test + public void testAddMessageToControlsDynamicallyFromConstraintViolation() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + ConstraintViolation firstNameViolation = new ConstraintViolationStub("Too short", "firstName"); + ConstraintViolation lastNameViolation = new ConstraintViolationStub("Too long", "lastName"); + ConstraintViolation usernameViolation = new ConstraintViolationStub("Already taken", "account.username"); + statusMessages.addToControl(firstNameViolation); + statusMessages.addToControls(new ConstraintViolation[] { lastNameViolation, usernameViolation }); + assertEquals(statusMessages.getGlobalMessages().size(), 0); + assertEquals(statusMessages.getKeyedMessages().size(), 3); + List<StatusMessage> messages = statusMessages.getKeyedMessages("lastName"); + assertNotNull(messages); + assertEquals(messages.size(), 1); + assertSame(messages.get(0).getSeverity(), StatusMessage.Severity.WARN); + assertNotNull(statusMessages.getKeyedMessages("lastName")); + assertNotNull(statusMessages.getKeyedMessages("username")); + } + + /** + * Test that the serverity is processed correctly when adding a message to a client id. + */ + @Test + public void testAddWarningMessageToControlFromTemplate() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + statusMessages.addToControl("password", StatusMessage.Severity.WARN, "Too short"); + List<StatusMessage> messages = statusMessages.getKeyedMessages("password"); + assertNotNull(messages); + assertEquals(messages.size(), 1); + assertSame(StatusMessage.Severity.WARN, messages.get(0).getSeverity()); + } + + /** + * Test that global and keyed messages can be cleared separately. + */ + @Test + public void testClearMessages() + { + StatusMessages statusMessages = getStatusMessagesInstance(); + + statusMessages.add("An info message"); + statusMessages.add(StatusMessage.Severity.ERROR, "An error message"); + statusMessages.addToControl("username", "Available!"); + statusMessages.addToControl("username", "Nice choice"); + statusMessages.addToControl("password", StatusMessage.Severity.WARN, "Too short"); + + assertEquals(statusMessages.getGlobalMessages().size(), 2); + assertEquals(statusMessages.getKeyedMessages().size(), 2); + + statusMessages.clearGlobalMessages(); + + assertEquals(statusMessages.getGlobalMessages().size(), 0); + assertEquals(statusMessages.getKeyedMessages().size(), 2); + + statusMessages.clearKeyedMessages("username"); + + assertEquals(statusMessages.getKeyedMessages().size(), 1); + assertNull(statusMessages.getKeyedMessages("username")); + + statusMessages.clearKeyedMessages(); + + assertEquals(statusMessages.getKeyedMessages().size(), 0); + + statusMessages.add("An info message"); + statusMessages.addToControl("username", "Nice choice"); + + assertEquals(statusMessages.getGlobalMessages().size(), 1); + assertEquals(statusMessages.getKeyedMessages().size(), 1); + + statusMessages.clear(); + + assertEquals(statusMessages.getGlobalMessages().size(), 0); + assertEquals(statusMessages.getKeyedMessages().size(), 0); + } + + private StatusMessages getStatusMessagesInstance() + { + return new StatusMessages(); + } + + private class IdentityInterpolator extends Interpolator + { + @Override + public String interpolate(String string, Object... params) + { + return string; + } + } + + private class ConstraintViolationStub implements ConstraintViolation + { + private String message; + private String propertyPath; + + public ConstraintViolationStub(String message, String propertyPath) + { + this.message = message; + this.propertyPath = propertyPath; + } + + public String getMessage() + { + return message; + } + + public String getMessageTemplate() + { + throw new UnsupportedOperationException("Not supported by stub."); + } + + public Object getRootBean() + { + throw new UnsupportedOperationException("Not supported by stub."); + } + + public Object getLeafBean() + { + throw new UnsupportedOperationException("Not supported by stub."); + } + + public String getPropertyPath() + { + return propertyPath; + } + + public Object getInvalidValue() + { + throw new UnsupportedOperationException("Not supported by stub."); + } + + public ConstraintDescriptor getConstraintDescriptor() + { + throw new UnsupportedOperationException("Not supported by stub."); + } + + } +} [View Less]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10679 - modules/trunk/el/src/main/java/org/jboss/seam/el.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 14:24:05 -0400 (Tue, 28 Apr 2009) New Revision: 10679 Modified: modules/trunk/el/src/main/java/org/jboss/seam/el/SeamEL.java Log: note Modified: modules/trunk/el/src/main/java/org/jboss/seam/el/SeamEL.java =================================================================== --- modules/trunk/el/src/main/java/org/jboss/seam/el/SeamEL.java 2009-04-28 18:23:49 UTC (rev 10678) +++ modules/trunk/el/src/main/java/org/jboss/seam/el/SeamEL.java 2009-04-28 18:24:… [View More]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10678 - in modules/trunk: faces and 2 other directories.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 14:23:49 -0400 (Tue, 28 Apr 2009) New Revision: 10678 Modified: modules/trunk/el/pom.xml modules/trunk/faces/pom.xml modules/trunk/international/pom.xml modules/trunk/version-matrix/pom.xml Log: use ${seam.groupId} rather than ${project.groupId} in dependencies so they inherit correctly Modified: modules/trunk/el/pom.xml =================================================================== --- modules/trunk/el/pom.xml 2009-04-28 18:19:33 UTC (… [View More]rev 10677) +++ modules/trunk/el/pom.xml 2009-04-28 18:23:49 UTC (rev 10678) @@ -46,6 +46,13 @@ <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> +  + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.webbeans</groupId> Modified: modules/trunk/faces/pom.xml =================================================================== --- modules/trunk/faces/pom.xml 2009-04-28 18:19:33 UTC (rev 10677) +++ modules/trunk/faces/pom.xml 2009-04-28 18:23:49 UTC (rev 10678) @@ -16,11 +16,11 @@ <dependencies> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-el</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-international</artifactId> </dependency> <dependency> Modified: modules/trunk/international/pom.xml =================================================================== --- modules/trunk/international/pom.xml 2009-04-28 18:19:33 UTC (rev 10677) +++ modules/trunk/international/pom.xml 2009-04-28 18:23:49 UTC (rev 10678) @@ -84,7 +84,7 @@ </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-el</artifactId> </dependency> Modified: modules/trunk/version-matrix/pom.xml =================================================================== --- modules/trunk/version-matrix/pom.xml 2009-04-28 18:19:33 UTC (rev 10677) +++ modules/trunk/version-matrix/pom.xml 2009-04-28 18:23:49 UTC (rev 10678) @@ -51,6 +51,7 @@ <properties> <seam.version>3.0.0-SNAPSHOT</seam.version> + <seam.groupId>org.jboss.seam</seam.groupId> </properties> <dependencyManagement> @@ -190,13 +191,13 @@ </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-bpm</artifactId> <version>${seam.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-faces</artifactId> <version>${seam.version}</version> </dependency> @@ -206,9 +207,15 @@ <artifactId>seam-el</artifactId> <version>${seam.version}</version> </dependency> + + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>seam-faces</artifactId> + <version>${seam.version}</version> + </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>${seam.groupId}</groupId> <artifactId>seam-drools</artifactId> <version>${seam.version}</version> </dependency> [View Less]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10677 - in modules/trunk/faces/src/main: resources/META-INF and 1 other directory.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-04-28 14:19:33 -0400 (Tue, 28 Apr 2009) New Revision: 10677 Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/StatusMessagesTranslator.java modules/trunk/faces/src/main/resources/META-INF/faces-config.xml Log: use annotation instead of XML configuration Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/StatusMessagesTranslator.java =================================================================== --- … [View More]

15 years, 10 months

1
0
0 / 0

Seam SVN: r10676 - in branches/community/Seam_2_1: examples and 1 other directory.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2009-04-28 07:38:10 -0400 (Tue, 28 Apr 2009) New Revision: 10676 Modified: branches/community/Seam_2_1/build/resteasy.pom.xml branches/community/Seam_2_1/build/root.pom.xml branches/community/Seam_2_1/examples/build.xml Log: seam tasks example server part Modified: branches/community/Seam_2_1/build/resteasy.pom.xml =================================================================== --- branches/community/Seam_2_1/build/resteasy.pom.xml 2009-04-28 11:35:20 UTC (… [View More]

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2009