Seam SVN: r7204 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-23 08:49:12 -0500 (Wed, 23 Jan 2008)
New Revision: 7204
Modified:
trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java
Log:
better
Modified: trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-23 13:47:39 UTC (rev 7203)
+++ trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-23 13:49:12 UTC (rev 7204)
@@ -38,7 +38,7 @@
InputStream stream = classLoader.getResourceAsStream(name);
if (stream == null)
{
- throw new IllegalStateException("Cannot load " + name + " from " + classLoader + " using getResourceAsStream()");
+ throw new IllegalStateException("Cannot load " + name + " from " + classLoader + " (using getResourceAsStream() returned null)");
}
DataInputStream dstream = new DataInputStream(stream);
16 years, 11 months
- 1
- 0
Seam SVN: r7203 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-23 08:47:39 -0500 (Wed, 23 Jan 2008)
New Revision: 7203
Modified:
trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java
Log:
Better exception
Modified: trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-23 13:35:46 UTC (rev 7202)
+++ trunk/src/main/org/jboss/seam/deployment/AbstractDeploymentHandler.java 2008-01-23 13:47:39 UTC (rev 7203)
@@ -31,8 +31,16 @@
*/
protected ClassFile getClassFile(String name, ClassLoader classLoader) throws IOException
{
+ if (name == null)
+ {
+ throw new NullPointerException("name cannot be null");
+ }
InputStream stream = classLoader.getResourceAsStream(name);
- DataInputStream dstream = new DataInputStream(stream);
+ if (stream == null)
+ {
+ throw new IllegalStateException("Cannot load " + name + " from " + classLoader + " using getResourceAsStream()");
+ }
+ DataInputStream dstream = new DataInputStream(stream);
try
{
16 years, 11 months
- 1
- 0
Seam SVN: r7202 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-23 08:35:46 -0500 (Wed, 23 Jan 2008)
New Revision: 7202
Modified:
trunk/build/default.build.properties
Log:
note
Modified: trunk/build/default.build.properties
===================================================================
--- trunk/build/default.build.properties 2008-01-23 13:30:04 UTC (rev 7201)
+++ trunk/build/default.build.properties 2008-01-23 13:35:46 UTC (rev 7202)
@@ -1,6 +1,8 @@
# Use this properties file to set default properties for Seam.
# They can be overridden in ../build.properties
#
+# The default qualifier is -SNAPSHOT
+#
# Seam Version
# ------------
major.version 2
16 years, 11 months
- 1
- 0
Seam SVN: r7201 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-23 08:30:04 -0500 (Wed, 23 Jan 2008)
New Revision: 7201
Modified:
trunk/build/default.build.properties
Log:
Should always be -SNAPSHOT
Modified: trunk/build/default.build.properties
===================================================================
--- trunk/build/default.build.properties 2008-01-23 13:23:25 UTC (rev 7200)
+++ trunk/build/default.build.properties 2008-01-23 13:30:04 UTC (rev 7201)
@@ -6,7 +6,7 @@
major.version 2
minor.version .0
patchlevel .1
-qualifier .SNAPSHOT
+qualifier -SNAPSHOT
#
# Other program locations
# -----------------------
16 years, 11 months
- 1
- 0
Seam SVN: r7200 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-23 08:23:25 -0500 (Wed, 23 Jan 2008)
New Revision: 7200
Modified:
trunk/build/build.xml
trunk/build/common.build.xml
Log:
Add installExample target
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-01-23 13:09:31 UTC (rev 7199)
+++ trunk/build/build.xml 2008-01-23 13:23:25 UTC (rev 7200)
@@ -151,6 +151,10 @@
<deployExample name="${name}" repositoryId="snapshots.jboss.org"/>
</target>
+ <target name="installExample">
+ <installExample name="${name}"/>
+ </target>
+
<macrodef name="offline">
<attribute name="pom" />
<attribute name="repository" />
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-01-23 13:09:31 UTC (rev 7199)
+++ trunk/build/common.build.xml 2008-01-23 13:23:25 UTC (rev 7200)
@@ -129,7 +129,6 @@
<artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" />
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-jbas5" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
@@ -212,6 +211,38 @@
</sequential>
</macrodef>
+ <macrodef name="installExample">
+ <attribute name="name" />
+ <attribute name="path" default="${seam.dir}/examples/@{name}" />
+ <sequential>
+ <ant dir="@{path}" target="archive" inheritall="false">
+ <propertyset>
+ <propertyref name="initpomsdone" />
+ <propertyref name="copyseamdone" />
+ <propertyref name="copyseamdependenciesdone" />
+ <propertyref name="copyjbossembeddeddone" />
+ <propertyref name="core.pom" />
+ <propertyref name="root.pom" />
+ <propertyref name="parent.pom" />
+ <propertyref name="ui.pom" />
+ <propertyref name="remoting.pom" />
+ <propertyref name="gen.pom" />
+ <propertyref name="pdf.pom" />
+ <propertyref name="ioc.pom" />
+ <propertyref name="mail.pom" />
+ <propertyref name="debug.pom" />
+ <propertyref name="jbas5.pom" />
+ <propertyref name="testng.jvmargs"/>
+ </propertyset>
+ </ant>
+ <pomfile name="example.pom" value="@{path}/pom.xml" />
+ <artifact:install file="@{path}/dist/jboss-seam-(a){name}.ear">
+ <pom file="${example.pom}" />
+ <attach file="@{path}/resources/jboss-seam-(a){name}-ds.xml" classifier="ds" type="xml" />
+ </artifact:install>
+ </sequential>
+ </macrodef>
+
<macrodef name="deployExampleNoDs">
<attribute name="name" />
<attribute name="path" default="${seam.dir}/examples/@{name}" />
16 years, 11 months
- 1
- 0
Seam SVN: r7199 - trunk/src/jbas5/org/jboss/seam/as5/vfs.
by seam-commits＠lists.jboss.org
Author: alesj
Date: 2008-01-23 08:09:31 -0500 (Wed, 23 Jan 2008)
New Revision: 7199
Modified:
trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Log:
Non VFS exclude, temp hack.
Top trace log.
Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-23 10:06:38 UTC (rev 7198)
+++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-23 13:09:31 UTC (rev 7199)
@@ -64,6 +64,10 @@
log.trace("Root url: " + url);
String urlString = url.toString();
+ // TODO - this should go away once we figure out why -exp.war is part of CL resources
+ if (urlString.startsWith("vfs") == false)
+ return null;
+
int p = urlString.indexOf(":");
String file = urlString.substring(p + 1);
URL vfsurl = null;
@@ -107,6 +111,10 @@
top = top.getParent();
parentDepth--;
}
+
+ if (trace)
+ log.trace("Top: " + top);
+
return top;
}
16 years, 11 months
- 1
- 0
Seam SVN: r7198 - in trunk/examples/wiki: src/test/org/jboss/seam/wiki/test/preferences and 2 other directories.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-01-23 05:06:38 -0500 (Wed, 23 Jan 2008)
New Revision: 7198
Added:
trunk/examples/wiki/view/themes/sfwkorg/img/powered_by_seam.png
Modified:
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/InstancePreferencesTests.java
trunk/examples/wiki/view/themes/sfwkorg/template.xhtml
Log:
Fix tests
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java 2008-01-23 08:09:43 UTC (rev 7197)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java 2008-01-23 10:06:38 UTC (rev 7198)
@@ -50,7 +50,7 @@
for (WikiMacro wikiMacro : docHome.getInstance().getContentMacros()) {
if (wikiMacro.getName().equals("lastModifiedDocuments")) {
assert wikiMacro.getParams().size()==2;
- assert wikiMacro.getParams().get("documentTitleLength").equals("10");
+ assert wikiMacro.getParams().get("documentTitleLength").equals("60");
assert wikiMacro.getParams().get("showUsernames").equals("true");
macroFound = true;
}
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/InstancePreferencesTests.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/InstancePreferencesTests.java 2008-01-23 08:09:43 UTC (rev 7197)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/preferences/InstancePreferencesTests.java 2008-01-23 10:06:38 UTC (rev 7198)
@@ -60,7 +60,7 @@
if (macro.getName().equals("lastModifiedDocuments")) {
LastModifiedDocumentsPreferences lmdPrefs =
(LastModifiedDocumentsPreferences)Preferences.getInstance("LastModifiedDocuments", "currentMacro");
- assert lmdPrefs.getDocumentTitleLength().equals(10l);
+ assert lmdPrefs.getDocumentTitleLength().equals(60l);
}
return null;
Added: trunk/examples/wiki/view/themes/sfwkorg/img/powered_by_seam.png
===================================================================
(Binary files differ)
Property changes on: trunk/examples/wiki/view/themes/sfwkorg/img/powered_by_seam.png
___________________________________________________________________
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-23 08:09:43 UTC (rev 7197)
+++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-23 10:06:38 UTC (rev 7198)
@@ -373,6 +373,13 @@
</p>
</div>
+ <div style="margin-top: 25px; margin-left: 15px; margin-right: 15px; text-align:center;">
+ <h:outputLink value="http://seamframework.org">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/powered_by_seam.png" width="120" height="60"
+ style="border: 1px solid #666"/>
+ </h:outputLink>
+ </div>
+
</div>
<!-- Main Content area -->
16 years, 11 months
- 1
- 0
Seam SVN: r7197 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/connectors/feed and 16 other directories.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-01-23 03:09:43 -0500 (Wed, 23 Jan 2008)
New Revision: 7197
Added:
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java
Modified:
trunk/examples/wiki/src/etc/messages_en.properties
trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties
trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.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/UserPasswordReset.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedDAO.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java
trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferences.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml
trunk/examples/wiki/view/dirDisplay_d.xhtml
trunk/examples/wiki/view/includes/commentForm.xhtml
trunk/examples/wiki/view/includes/ownerSelector.xhtml
trunk/examples/wiki/view/includes/tagEditor.xhtml
trunk/examples/wiki/view/includes/userControl.xhtml
trunk/examples/wiki/view/includes/wikiTextEditor.xhtml
trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml
trunk/examples/wiki/view/plugins/feedTeasers/plugin.xhtml
trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml
trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml
trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml
trunk/examples/wiki/view/themes/default/css/feedTeasers.css
trunk/examples/wiki/view/themes/default/css/lastModifiedDocuments.css
trunk/examples/wiki/view/themes/default/css/template.css
trunk/examples/wiki/view/themes/default/css/userControl.css
trunk/examples/wiki/view/themes/default/template.xhtml
trunk/examples/wiki/view/themes/sfwkorg/css/feedTeasers.css
trunk/examples/wiki/view/themes/sfwkorg/css/lastModifiedDocuments.css
trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css
trunk/examples/wiki/view/themes/sfwkorg/css/userControl.css
trunk/examples/wiki/view/themes/sfwkorg/template.xhtml
Log:
Minor UI improvements, IE fixes
Modified: trunk/examples/wiki/src/etc/messages_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/messages_en.properties 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/etc/messages_en.properties 2008-01-23 08:09:43 UTC (rev 7197)
@@ -217,7 +217,7 @@
lacewiki.label.VerificationError=The entered characters do not match the shown (case sensitive) characters, please try again.
# Wiki Text Editor
-lacewiki.label.wikiTextEditor.CharactersLeft=characters left
+lacewiki.label.wikiTextEditor.CharactersLeft=chars left
lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically=Edit this text, the live preview updates if you stop typing for 3 seconds.
# Document Display
Modified: trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-01-23 08:09:43 UTC (rev 7197)
@@ -1,7 +1,6 @@
lastModifiedDocuments.preferences.Name=Plugin: Last Modified Documents
+lastModifiedDocuments.preferences.Title=Title of plugin box
lastModifiedDocuments.preferences.NumberOfItems=Number of items shown in list
lastModifiedDocuments.preferences.ShowUsernames=Show user names
lastModifiedDocuments.preferences.DocumentTitleLength=Truncate document titles after characters
-lastModifiedDocuments.label.Last=Last
-lastModifiedDocuments.label.ModifiedDocuments=Site Updates
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedAggregatorDAO.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -56,11 +56,20 @@
// Sort by date of feed entry ascending
new Comparator<FeedEntryDTO>() {
public int compare(FeedEntryDTO a, FeedEntryDTO b) {
- if (a.getFeedEntry().getPublishedDate().getTime() >
- b.getFeedEntry().getPublishedDate().getTime()) return -1;
+ if (a.getFeedEntry().getUpdatedDate() != null && b.getFeedEntry().getUpdatedDate() != null) {
+ if (a.getFeedEntry().getUpdatedDate().getTime() >
+ b.getFeedEntry().getUpdatedDate().getTime()) return -1;
- return (a.getFeedEntry().getPublishedDate().getTime() ==
- b.getFeedEntry().getPublishedDate().getTime() ? 0 : 1);
+ return (a.getFeedEntry().getUpdatedDate().getTime() ==
+ b.getFeedEntry().getUpdatedDate().getTime() ? 0 : 1);
+
+ } else {
+ if (a.getFeedEntry().getPublishedDate().getTime() >
+ b.getFeedEntry().getPublishedDate().getTime()) return -1;
+
+ return (a.getFeedEntry().getPublishedDate().getTime() ==
+ b.getFeedEntry().getPublishedDate().getTime() ? 0 : 1);
+ }
}
}
);
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -22,6 +22,7 @@
import javax.faces.application.FacesMessage;
import static javax.faces.application.FacesMessage.SEVERITY_INFO;
+import static javax.faces.application.FacesMessage.SEVERITY_WARN;
import static javax.faces.application.FacesMessage.SEVERITY_ERROR;
import java.util.*;
@@ -416,7 +417,7 @@
if (pastedName.length() > 245) {
getFacesMessages().addToControlFromResourceBundleOrDefault(
"name",
- SEVERITY_ERROR,
+ SEVERITY_WARN,
"lacewiki.msg.Clipboard.DuplicatePasteNameFailure",
"The name '{0}' was already in use in this area and is too long to be renamed, skipping paste.",
pastedName
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -20,6 +20,7 @@
import org.jboss.seam.wiki.util.WikiUtil;
import static javax.faces.application.FacesMessage.SEVERITY_ERROR;
+import static javax.faces.application.FacesMessage.SEVERITY_WARN;
import static javax.faces.application.FacesMessage.SEVERITY_INFO;
import java.util.Date;
import java.util.List;
@@ -314,7 +315,7 @@
} else {
getFacesMessages().addToControlFromResourceBundleOrDefault(
"name",
- SEVERITY_ERROR,
+ SEVERITY_WARN,
"lacewiki.entity.DuplicateName",
"This name is already used, please change it"
);
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -65,7 +65,7 @@
facesMessages.addToControlFromResourceBundleOrDefault(
"preferenceValidationErrors",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"preferenceValueValidationFailed." + preferenceEntity.getEntityName() + "." + entry.getKey().getFieldName(),
preferenceEntity.getDescription() + " - '" + entry.getKey().getDescription() + "': " + validationError.getMessage());
}
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-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -175,7 +175,7 @@
} else {
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.userHome.WrongPortraitImageType",
"The file type '{0}' is not supported, the portrait was not updated.",
uploader.getUpload().getContentType()
@@ -342,7 +342,7 @@
getPasswordControl() == null || getPasswordControl().length() == 0) {
facesMessages.addToControlFromResourceBundleOrDefault(
"passwordControl",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordOrPasswordControlEmpty",
"Please enter your password twice!"
);
@@ -356,7 +356,7 @@
if (!matcher.find()) {
facesMessages.addToControlFromResourceBundleOrDefault(
"password",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordDoesntMatchPattern",
"Password does not match the pattern: {0}",
prefs.getPasswordRegex()
@@ -370,7 +370,7 @@
if (password == null || passwordControl == null || !password.equals(passwordControl) ) {
facesMessages.addToControlFromResourceBundleOrDefault(
"passwordControl",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordControlNoMatch",
"The passwords don't match."
);
@@ -384,7 +384,7 @@
if ( foundUser != null && foundUser != getInstance() ) {
facesMessages.addToControlFromResourceBundleOrDefault(
"username",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.UsernameExists",
"A user with that name already exists."
);
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserPasswordReset.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserPasswordReset.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserPasswordReset.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -85,7 +85,7 @@
User user = getUserForEmail(username, email);
if (user == null) {
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.resetPassword.NotValid",
"Your account and e-mail address information didn't match, please try again to reset your password."
);
@@ -116,7 +116,7 @@
);
} catch (Exception ex) {
- facesMessages.add(FacesMessage.SEVERITY_ERROR, "Couldn't send password reset email: " + ex.getMessage());
+ facesMessages.add(FacesMessage.SEVERITY_WARN, "Couldn't send password reset email: " + ex.getMessage());
}
}
@@ -158,7 +158,7 @@
Contexts.getSessionContext().remove(RESET_PASSWORD_OF_USER);
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_INFO,
"lacewiki.msg.resetPassword.Complete",
"Successfully reset password of account '{0}', please log in.",
persistentUser.getUsername()
@@ -176,7 +176,7 @@
if (getPassword() == null || getPassword().length() == 0 ||
getPasswordControl() == null || getPasswordControl().length() == 0) {
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordOrPasswordControlEmpty",
"Please enter your password twice!"
);
@@ -189,7 +189,7 @@
Matcher matcher = Pattern.compile(prefs.getPasswordRegex()).matcher(getPassword());
if (!matcher.find()) {
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordDoesntMatchPattern",
"Password does not match the pattern: {0}",
prefs.getPasswordRegex()
@@ -202,7 +202,7 @@
public boolean passwordMatchesControl() {
if (!password.equals(passwordControl) ) {
facesMessages.addFromResourceBundleOrDefault(
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
"lacewiki.msg.PasswordControlNoMatch",
"The passwords don't match."
);
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedDAO.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedDAO.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/feeds/FeedDAO.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -203,6 +203,8 @@
public void updateFeedEntry(WikiDirectory parentDir, WikiNode node, FeedEntry feedEntry, boolean pushOnSiteFeed) {
log.debug("updating feed entry: " + feedEntry.getId());
+ feedEntry.setUpdatedDate(new Date());
+
// Link feed entry with all feeds (there might be new feeds since this feed entry was created)
List<WikiFeed> feeds = findParentFeeds(parentDir, pushOnSiteFeed);
for (Feed feed : feeds) {
Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java (rev 0)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.seam.wiki.core.ui;
+
+import org.jboss.seam.security.FacesSecurityEvents;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+
+import javax.faces.application.FacesMessage;
+
+/**
+ * @author Christian Bauer
+ */
+@Name("org.jboss.seam.security.facesSecurityEvents")
+@Install(precedence = Install.APPLICATION, classDependencies = "javax.faces.context.FacesContext")
+@BypassInterceptors
+@Startup
+public class WikiSecurityEvents extends FacesSecurityEvents {
+
+ public FacesMessage.Severity getLoginFailedMessageSeverity() {
+ return FacesMessage.SEVERITY_WARN;
+ }
+}
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -48,7 +48,7 @@
// TODO: Needs to use resource bundle, how?
FacesMessages.instance().addToControl(
textEditorId + "TextArea",
- FacesMessage.SEVERITY_ERROR,
+ FacesMessage.SEVERITY_WARN,
e.getFacesMessage().getSummary()
);
}
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferences.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferences.java 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferences.java 2008-01-23 08:09:43 UTC (rev 7197)
@@ -2,6 +2,7 @@
import org.hibernate.validator.NotNull;
import org.hibernate.validator.Range;
+import org.hibernate.validator.Length;
import org.jboss.seam.wiki.preferences.PreferenceVisibility;
import org.jboss.seam.wiki.preferences.annotations.PreferenceProperty;
import org.jboss.seam.wiki.preferences.annotations.Preferences;
@@ -12,6 +13,15 @@
public class LastModifiedDocumentsPreferences implements Serializable {
@PreferenceProperty(
+ description = "#{messages['lastModifiedDocuments.preferences.Title']}",
+ visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE},
+ editorIncludeName = "AdaptiveTextInput"
+ )
+ @Length(min = 0, max = 255)
+ @NotNull
+ private String title;
+
+ @PreferenceProperty(
description = "#{messages['lastModifiedDocuments.preferences.NumberOfItems']}",
visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE},
editorIncludeName = "NumberRange"
@@ -36,6 +46,10 @@
@NotNull
private Long documentTitleLength;
+ public String getTitle() {
+ return title;
+ }
+
public Long getNumberOfItems() {
return numberOfItems;
}
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-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -24,7 +24,7 @@
<PREFERENCE PREF_ID = "20" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "minorRevisionEnabled" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
<PREFERENCE PREF_ID = "21" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaRows" STRING_VALUE = "[NULL]" LONG_VALUE = "15" BOOLEAN_VALUE = "[NULL]"/>
- <PREFERENCE PREF_ID = "22" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaColumns" STRING_VALUE = "[NULL]" LONG_VALUE = "65" BOOLEAN_VALUE = "[NULL]"/>
+ <PREFERENCE PREF_ID = "22" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaColumns" STRING_VALUE = "[NULL]" LONG_VALUE = "60" BOOLEAN_VALUE = "[NULL]"/>
<PREFERENCE PREF_ID = "30" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "activationCodeSalt" STRING_VALUE = "MySecretSalt123" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/>
<PREFERENCE PREF_ID = "31" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "passwordRegex" STRING_VALUE = "^[0-9A-Za-z]{6,15}" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/>
@@ -41,7 +41,8 @@
<PREFERENCE PREF_ID = "110" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "LastModifiedDocuments" PROPERTY_NAME = "numberOfItems" STRING_VALUE = "[NULL]" LONG_VALUE = "5" BOOLEAN_VALUE = "[NULL]"/>
<PREFERENCE PREF_ID = "111" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "LastModifiedDocuments" PROPERTY_NAME = "showUsernames" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
- <PREFERENCE PREF_ID = "112" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "LastModifiedDocuments" PROPERTY_NAME = "documentTitleLength" STRING_VALUE = "[NULL]" LONG_VALUE = "20" BOOLEAN_VALUE = "[NULL]"/>
+ <PREFERENCE PREF_ID = "112" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "LastModifiedDocuments" PROPERTY_NAME = "documentTitleLength" STRING_VALUE = "[NULL]" LONG_VALUE = "50" BOOLEAN_VALUE = "[NULL]"/>
+ <PREFERENCE PREF_ID = "113" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "LastModifiedDocuments" PROPERTY_NAME = "title" STRING_VALUE = "Last Site Updates" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/>
<PREFERENCE PREF_ID = "120" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Blog" PROPERTY_NAME = "pageSize" STRING_VALUE = "[NULL]" LONG_VALUE = "5" BOOLEAN_VALUE = "[NULL]"/>
<PREFERENCE PREF_ID = "121" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Blog" PROPERTY_NAME = "archiveSubscribeIcon" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "false"/>
@@ -231,7 +232,7 @@
NODE_ID="6" FILE_REVISION="3"/>
<WIKI_DOCUMENT
NODE_ID="6"
- CONTENT="Testdocument One with some plugins:

[<=docPager]

<table>
<tr>
<td style="vertical-align:top; padding-right: 20px; width:60%">
[<=feedTeasers[feed=1]]
<br/>
[<=lastModifiedDocuments[documentTitleLength=10][showUsernames=true]]
<br/>
[<=tags[linkToCurrentDocument=false]]
<br/>
[<=dirMenu[title=Test Menu]]
</td>
<td>
[<=userProfile]
</td>
</tr>
</table>

And some images/attachments:

[=>BBB|Test Image]

[=>BBB|Test Upload]

"
+ CONTENT="Testdocument One with some plugins:

[<=docPager]

<table>
<tr>
<td style="vertical-align:top; padding-right: 20px; width:60%">
[<=feedTeasers[feed=1]]
<br/>
[<=lastModifiedDocuments[documentTitleLength=60][showUsernames=true]]
<br/>
[<=tags[linkToCurrentDocument=false]]
<br/>
[<=dirMenu[title=Test Menu]]
</td>
<td style="vertical-align:top;">
[<=userProfile]
</td>
</tr>
</table>

And some images/attachments:

[=>BBB|Test Image]

[=>BBB|Test Upload]

"
HEADER="[<=headerMacro1]
[<=headerMacro2]" FOOTER="[<=footerMacro1]
[<=footerMacro2]
"
HEADER_MACROS="headerMacro1 headerMacro2" CONTENT_MACROS="docPager feedTeasers lastModifiedDocuments tags dirMenu userProfile" FOOTER_MACROS="footerMacro1 footerMacro2"
NAME_AS_TITLE="true" ENABLE_COMMENTS="true" ENABLE_COMMENT_FORM="true" ENABLE_COMMENTS_ON_FEEDS="true"/>
Modified: trunk/examples/wiki/view/dirDisplay_d.xhtml
===================================================================
--- trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -102,7 +102,7 @@
<h:panelGrid columns="3"
styleClass="directoryControl smallFont"
- columnClasses="directorySelectControl, directoryClipboard, directoryTrash"
+ columnClasses="directorySelectControl, directoryTrash, directoryClipboard"
cellpadding="0" cellspacing="0" border="0">
<s:fragment>
@@ -130,6 +130,17 @@
</s:fragment>
<s:fragment>
+ <h:panelGroup rendered="#{directoryHome.instance.id == trashArea.id and s:hasPermission('Trash', 'empty', directoryHome.instance)}">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif"
+ width="18" height="20" style="vertical-align:middle;"/>
+ <h:commandLink action="#{directoryHome.emptyTrash()}"
+ tabindex="1" styleClass="button">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.EmptyTrash']}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ </s:fragment>
+
+ <s:fragment>
<h:panelGroup>
<s:span>
<h:outputText value="#{messages['lacewiki.label.Clipboard']} "/>
@@ -169,17 +180,6 @@
</h:panelGroup>
</s:fragment>
- <s:fragment>
- <h:panelGroup rendered="#{directoryHome.instance.id == trashArea.id and s:hasPermission('Trash', 'empty', directoryHome.instance)}">
- <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif"
- width="18" height="20" style="vertical-align:middle;"/>
- <h:commandLink action="#{directoryHome.emptyTrash()}"
- tabindex="1" styleClass="button">
- <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.EmptyTrash']}"/>
- </h:commandLink>
- </h:panelGroup>
- </s:fragment>
-
</h:panelGrid>
<h:panelGrid columns="2" styleClass="directoryPathTable" columnClasses="directoryPath, directoryPagerControl"
@@ -286,9 +286,11 @@
styleClass="datatable topLeftBottomBorder smallFont"
headerClass="regularHeader rightBorder alignCenter"
columnClasses="onePercentColumn rightBorder alignCenter, onePercentColumn rightBorder alignCenter,
- defaultColumn rightBorder alignLeft,
- tenPercentColumn rightBorder alignLeft, fifteenPercentColumn rightBorder alignLeft,
- fifteenPercentColumn rightBorder alignLeft,twentyPercentColumn rightBorder alignCenter"
+ defaultColumn rightBorder alignLeft wrapWhitespace,
+ twentyPercentColumn rightBorder alignLeft wrapWhitespace,
+ fifteenPercentColumn rightBorder alignLeft wrapWhitespace,
+ fifteenPercentColumn rightBorder alignLeft wrapWhitespace,
+ fifteenPercentColumn rightBorder alignCenter wrapWhitespace"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
@@ -467,7 +469,7 @@
<h:column>
<f:facet name="header">
- #{messages['lacewiki.label.dirDisplay.Owner']}
+ <h:outputText value="#{messages['lacewiki.label.dirDisplay.Owner']}"/>
</f:facet>
<s:span styleClass="undecoratedLink" rendered="#{node.ownedByRegularUser}">
<s:link view="/userInfo_#{skin}.xhtml" propagation="none">
@@ -480,16 +482,16 @@
<h:column>
<f:facet name="header">
- #{messages['lacewiki.label.dirDisplay.ReadAccess']}
+ <h:outputText value="#{messages['lacewiki.label.dirDisplay.ReadAccess']}"/>
</f:facet>
- #{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 15, '...')}
+ <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 20, '...')}"/>
</h:column>
<h:column>
<f:facet name="header">
- #{messages['lacewiki.label.dirDisplay.WriteAccess']}
+ <h:outputText value="#{messages['lacewiki.label.dirDisplay.WriteAccess']}"/>
</f:facet>
- #{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 15, '...')}
+ <h:outputText value="#{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 20, '...')}"/>
</h:column>
<h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
Modified: trunk/examples/wiki/view/includes/commentForm.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/commentForm.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/includes/commentForm.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -93,7 +93,7 @@
<ui:param name="valueBinding" value="#{commentHome.instance.content}"/>
<ui:param name="valueMaxLength" value="32768"/>
<ui:param name="valueRequired" value="true"/>
- <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '80' : '52'}"/>
+ <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '60' : '48'}"/>
<ui:param name="textEditorRows" value="10"/>
</ui:include>
Modified: trunk/examples/wiki/view/includes/ownerSelector.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -30,9 +30,9 @@
<h:panelGrid columns="6"
styleClass="datatable topLeftBottomBorder"
headerClass="regularHeader rightBorder"
- columnClasses="tenPercentColumn formFields, tenPercentColumn formFields,
- tenPercentColumn formFields, tenPercentColumn formFields,
- defaultColumn alignRight rightBorder formFields"
+ columnClasses="tenPercentColumn formFields minorPadding, tenPercentColumn formFields minorPadding,
+ tenPercentColumn formFields minorPadding, tenPercentColumn formFields minorPadding,
+ defaultColumn alignRight rightBorder formFields minorPadding"
cellpadding="0" cellspacing="0" border="0">
<h:panelGroup>
@@ -116,10 +116,10 @@
styleClass="datatable topLeftBottomBorder"
headerClass="sortableHeader rightBorder"
columnClasses="defaultColumn rightBorder alignLeft,
- twentyPercentColumn rightBorder alignLeft,
- twentyPercentColumn rightBorder alignLeft,
- twentyPercentColumn rightBorder alignLeft,
- tenPercentColumn rightBorder alignCenter"
+ twentyPercentColumn rightBorder alignLeft minorPadding,
+ twentyPercentColumn rightBorder alignLeft minorPadding,
+ twentyPercentColumn rightBorder alignLeft minorPadding,
+ tenPercentColumn rightBorder alignCenter minorPadding"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
Modified: trunk/examples/wiki/view/includes/tagEditor.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/tagEditor.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/includes/tagEditor.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -12,7 +12,7 @@
<h:outputText value="#{messages['lacewiki.label.tagEdit.Tags']}:"/>
</div>
<div class="input">
- <h:inputText id="tagsInput" styleClass="ajaxSupport" tabindex="1" size="70" maxlength="1024" required="false" value="#{home.tagString}">
+ <h:inputText id="tagsInput" styleClass="ajaxSupport" tabindex="1" size="55" maxlength="1024" required="false" value="#{home.tagString}">
<a:support event="onchange" reRender="popularTagsList" oncomplete="onAjaxRequestComplete()"/>
</h:inputText>
</div>
Modified: trunk/examples/wiki/view/includes/userControl.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/userControl.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/includes/userControl.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -17,7 +17,7 @@
<script type="text/javascript">jQuery(function() {
var offset = jQuery("#loginForm\\:openPasswordResetPopup").offset();
jsf('passwordResetPopup')
- .css({ width: "400px", height: "115px",
+ .css({ width: "420px", height: "115px",
top: offset.top+10+"px", left: offset.left-200+"px"
})
.jqm({
@@ -30,43 +30,45 @@
</ui:define>
<ui:define name="dialogTitle">#{messages['lacewiki.label.resetPassword.DialogTitle']}</ui:define>
<ui:define name="dialogContent">
+
<h:form id="resetPasswordRequestForm" styleClass="resetPasswordRequestForm">
- <div class="form">
- <div class="formFields">
+ <div class="resetPasswordRequestFormFields">
- <s:decorate id="nameDecorate" template="formFieldDecorate.xhtml">
- <ui:param name="fieldId" value="userPasswordResetUsername"/>
- <ui:define name="label">#{messages['lacewiki.label.resetPassword.Username']}</ui:define>
- <h:inputText tabindex="51" size="16" maxlength="16" value="#{userPasswordReset.username}"/>
- </s:decorate>
+ <s:decorate id="nameDecorate" template="formFieldDecorate.xhtml">
+ <ui:param name="fieldId" value="userPasswordResetUsername"/>
+ <ui:define name="label">#{messages['lacewiki.label.resetPassword.Username']}</ui:define>
+ <h:inputText tabindex="51" size="16" maxlength="16" value="#{userPasswordReset.username}"/>
+ </s:decorate>
- <s:decorate id="emailDecorate" template="formFieldDecorate.xhtml">
- <ui:param name="fieldId" value="userPasswordResetEmail"/>
- <ui:define name="label">#{messages['lacewiki.label.resetPassword.Email']}</ui:define>
- <h:inputText tabindex="51" size="32" maxlength="255" value="#{userPasswordReset.email}"/>
- </s:decorate>
+ <s:decorate id="emailDecorate" template="formFieldDecorate.xhtml">
+ <ui:param name="fieldId" value="userPasswordResetEmail"/>
+ <ui:define name="label">#{messages['lacewiki.label.resetPassword.Email']}</ui:define>
+ <h:inputText tabindex="51" size="32" maxlength="255" value="#{userPasswordReset.email}"/>
+ </s:decorate>
- </div>
- <div class="formControls">
- <div class="entry">
- <div class="label"> </div>
- <div class="input">
- <a:commandLink styleClass="buttonNonpersistent sessionEventTrigger closeDialog" tabindex="51"
- reRender="messageBoxContainer, passwordReset"
- action="#{userPasswordReset.sendResetPasswordEmail}">
- <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/>
- </a:commandLink>
+ </div>
- <h:outputLink styleClass="buttonNonpersistent closeDialog" tabindex="51">
- <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.Cancel']}"/>
- </h:outputLink>
+ <div class="resetPasswordRequestFormControls">
+ <div class="entry">
+ <div class="label"> </div>
+ <div class="input">
+ <a:commandLink styleClass="buttonNonpersistent sessionEventTrigger closeDialog" tabindex="51"
+ reRender="messageBoxContainer, passwordReset"
+ action="#{userPasswordReset.sendResetPasswordEmail}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/>
+ </a:commandLink>
- </div>
+ <h:outputLink styleClass="buttonNonpersistent closeDialog" tabindex="51">
+ <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.Cancel']}"/>
+ </h:outputLink>
+
</div>
</div>
</div>
</h:form>
+
</ui:define>
+
</ui:decorate>
</s:fragment>
Modified: trunk/examples/wiki/view/includes/wikiTextEditor.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -55,7 +55,8 @@
<h:outputText value="#{label}:"/>
<s:fragment rendered="#{not empty textPreviewId}">
<br/>
- <h:outputText value="(#{valueMaxLength - wiki:length(valueBinding)} #{messages['lacewiki.label.wikiTextEditor.CharactersLeft']})"/>
+ <h:outputText style="white-space:nowrap;"
+ value="(#{valueMaxLength - wiki:length(valueBinding)} #{messages['lacewiki.label.wikiTextEditor.CharactersLeft']})"/>
</s:fragment>
</s:div>
Modified: trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -44,9 +44,12 @@
<s:div styleClass="feedEntryInfo smallFont">
<s:span rendered="#{not preferences.get('FeedAggregator', currentMacro).hideDate}">
- <h:outputText value="#{feDTO.feedEntry.publishedDate}">
+ <h:outputText value="#{feDTO.feedEntry.publishedDate}" rendered="#{empty feDTO.feedEntry.updatedDate}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
</h:outputText>
+ <h:outputText value="#{feDTO.feedEntry.updatedDate}" rendered="#{not empty feDTO.feedEntry.updatedDate}">
+ <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
+ </h:outputText>
<h:outputText value=" #{preferences.get('Wiki').timeZone}"/>
</s:span>
Modified: trunk/examples/wiki/view/plugins/feedTeasers/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/feedTeasers/plugin.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/plugins/feedTeasers/plugin.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -21,7 +21,7 @@
rowClasses="rowOdd, rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <div class="teaserAuthorDate">
+ <div class="teaserAuthorDate smallFont">
<s:span styleClass="teaserDate">
<h:outputText value="#{fe.updatedDate}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
Modified: trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -87,7 +87,7 @@
<ui:param name="valueBinding" value="#{replyHome.instance.content}"/>
<ui:param name="valueMaxLength" value="32768"/>
<ui:param name="valueRequired" value="true"/>
- <ui:param name="textEditorColumns" value="#{replyHome.instance.ownedByRegularUser ? '80' : '50'}"/>
+ <ui:param name="textEditorColumns" value="#{replyHome.instance.ownedByRegularUser ? '60' : '48'}"/>
<ui:param name="textEditorRows" value="20"/>
</ui:include>
Modified: trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -19,8 +19,8 @@
rendered="#{not empty jiraIssueList.issues and jiraIssueList.issues.size() > 0}"
styleClass="datatable jiraIssueListTable"
columnClasses="onePercentColumn alignCenter priorityColumn,
- defaultColumn alignLeft summaryColumn,
- tenPercentColumn alignLeft rightBorder componentsColumn"
+ defaultColumn alignLeft summaryColumn wrapWhitespace,
+ tenPercentColumn alignLeft componentsColumn"
rowClasses="rowOdd, rowEven"
cellpadding="0" cellspacing="0" border="0">
@@ -41,6 +41,7 @@
<h:outputText rendered="#{i.componentNames.indexOf(comp) < i.componentNames.size()-1}"
value=",  "/>
</ui:repeat>
+ <h:outputText value=" " rendered="#{empty i.componentNames}"/>
</h:column>
Modified: trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/plugins/lastModifiedDocuments/plugin.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -10,33 +10,36 @@
<s:div styleClass="box lastModifiedDocuments">
<s:div styleClass="boxHeader">
- #{messages['lastModifiedDocuments.label.Last']}
- #{preferences.get('LastModifiedDocuments', currentMacro).numberOfItems}
- #{messages['lastModifiedDocuments.label.ModifiedDocuments']}
+ <h:outputText value="#{preferences.get('LastModifiedDocuments', currentMacro).title}"/>
</s:div>
<div class="boxContent">
<h:dataTable value="#{lastModifiedDocuments.listOfDocuments}" var="doc"
styleClass="datatable lastModifiedDocumentsTable"
- columnClasses="onePercentColumn alignLeft lastModifiedColumn, defaultColumn alignLeft"
+ columnClasses="defaultColumn alignLeft lastModifiedColumn"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <h:outputText value="#{doc.lastModifiedOn}"
- rendered="#{!empty doc.lastModifiedOn}">
- <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
- </h:outputText>
- <h:outputText value=" #{preferences.get('Wiki').timeZone}"/>
- <h:outputText value=" (#{doc.lastModifiedBy.username})"
- rendered="#{!empty doc.lastModifiedBy and preferences.get('LastModifiedDocuments', currentMacro).showUsernames}">
- </h:outputText>
+
+ <s:div styleClass="lastModifiedAuthorDate smallFont">
+ <h:outputText value="(#{doc.lastModifiedBy.username}) "
+ rendered="#{!empty doc.lastModifiedBy and preferences.get('LastModifiedDocuments', currentMacro).showUsernames}">
+ </h:outputText>
+ <h:outputText value="#{doc.lastModifiedOn}"
+ rendered="#{!empty doc.lastModifiedOn}">
+ <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
+ </h:outputText>
+ <h:outputText value=" #{preferences.get('Wiki').timeZone}"/>
+ </s:div>
+
+ <s:div styleClass="lastModifiedTitle wrapWhitespace">
+ <h:outputLink target="_top" value="#{wiki:renderURL(doc)}" styleClass="lastModifiedLink">
+ <h:outputText value="#{wiki:truncateString(doc.name, preferences.get('LastModifiedDocuments', currentMacro).documentTitleLength, '...')}"/>
+ </h:outputLink>
+ </s:div>
+
</h:column>
- <h:column>
- <h:outputLink target="_top" value="#{wiki:renderURL(doc)}" styleClass="lastModifiedLink">
- <h:outputText value="#{wiki:truncateString(doc.name, preferences.get('LastModifiedDocuments', currentMacro).documentTitleLength, '...')}"/>
- </h:outputLink>
- </h:column>
</h:dataTable>
</div>
Modified: trunk/examples/wiki/view/themes/default/css/feedTeasers.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/feedTeasers.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/default/css/feedTeasers.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -3,12 +3,11 @@
}
.teaserTitle {
- padding-top: 15px;
- padding-bottom: 15px;
+ margin-bottom: 5px;
+ font-weight: bold;
}
.teaserAuthorDate {
- float: right;
text-align: right;
}
Modified: trunk/examples/wiki/view/themes/default/css/lastModifiedDocuments.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/lastModifiedDocuments.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/default/css/lastModifiedDocuments.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -1,5 +1,16 @@
.lastModifiedDocuments {}
+.lastModifiedLink {
+}
+
+.lastModifiedColumn {
+ padding-bottom: 5px;
+}
+
+.lastModifiedAuthorDate {
+ text-align: right;
+}
+
.lastModifiedLink:link {color: #962325}
.lastModifiedLink:visited {color: #962325}
.lastModifiedLink:hover {color: #000}
Modified: trunk/examples/wiki/view/themes/default/css/template.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/template.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/default/css/template.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -320,8 +320,6 @@
vertical-align: text-top;
padding-left: 10px;
padding-right: 10px;
- padding-top: 2px;
- padding-bottom: 2px;
}
.attentionMessage {
@@ -686,16 +684,18 @@
.directorySelectControl {
text-align: left;
- width: 40%
+ white-space: nowrap;
}
.directoryClipboard {
text-align: right;
- width: 40%
+ white-space: nowrap;
}
.directoryTrash {
text-align: right;
+ white-space: nowrap;
+ width: 125px;
}
.directoryPathTable {
@@ -868,6 +868,10 @@
white-space: normal;
}
+.noWrapWhitespace {
+ white-space: nowrap;
+}
+
.pager {
width: 100%;
padding: 0;
Modified: trunk/examples/wiki/view/themes/default/css/userControl.css
===================================================================
--- trunk/examples/wiki/view/themes/default/css/userControl.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/default/css/userControl.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -38,9 +38,16 @@
display: inline;
}
-.resetPasswordRequestForm .form {
- margin:-10px;
+.resetPasswordRequestForm {
+ display: inline;
}
-.resetPasswordRequestForm .form .formFields {
+.resetPasswordRequestFormFields {
}
+
+.resetPasswordRequestFormFields .entry .label {
+ white-space: nowrap;
+}
+
+.resetPasswordRequestFormControls {
+}
Modified: trunk/examples/wiki/view/themes/default/template.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -355,20 +355,24 @@
<s:div styleClass="box" rendered="#{!empty facesMessages.currentGlobalMessages}">
<div id="messageBox" class="messageBox">
<ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}">
- <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif"
- width="18" height="18"
- styleClass="infoImage"/>
- <h:outputText styleClass="infoMessage" value="#{message.summary}"/>
+
+ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0"
+ rendered="#{message.severity.ordinal == 0}">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif"
+ width="18" height="18"
+ styleClass="infoImage"/>
+ <h:outputText styleClass="infoMessage" value="#{message.summary}"/>
</h:panelGrid>
- <!-- TODO: Well, how do we do that in EL without static stuff?! #{message.severity == 'Warn' or message.severity == 'Error'}
- <h:panelGrid columns="2" rendered="false">
+
+ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0"
+ rendered="#{message.severity.ordinal > 0}">
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
+ rendered="#{message.severity.ordinal > 0}"
width="18" height="18"
styleClass="attentionImage"/>
<h:outputText styleClass="attentionMessage" value="#{message.summary}"/>
</h:panelGrid>
- -->
+
</ui:repeat>
<script type="text/javascript">jQuery(function() {
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/feedTeasers.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/feedTeasers.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/feedTeasers.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -9,7 +9,6 @@
.teaserAuthorDate {
text-align: right;
- font-size: 90%;
}
.teaserAuthor {
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/lastModifiedDocuments.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/lastModifiedDocuments.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/lastModifiedDocuments.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -1,9 +1,16 @@
-.lastModifiedDocuments {
-}
+.lastModifiedDocuments {}
.lastModifiedLink {
}
+.lastModifiedColumn {
+ padding-bottom: 5px;
+}
+
+.lastModifiedAuthorDate {
+ text-align: right;
+}
+
.lastModifiedLink:link {color: #576c74}
.lastModifiedLink:visited {color: #576c74}
.lastModifiedLink:hover {color: #000}
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -434,11 +434,10 @@
vertical-align: text-top;
padding-left: 10px;
padding-right: 10px;
- padding-top: 2px;
- padding-bottom: 2px;
}
.attentionMessage {
+ font-weight: bold;
color: #666;
}
@@ -654,6 +653,10 @@
white-space: normal;
}
+.noWrapWhitespace {
+ white-space: nowrap;
+}
+
/* Pager
-----------------------------------------------*/
@@ -938,8 +941,8 @@
padding-left: 10px;
padding-right: 10px;
background-color: white;
- margin-left: 80px;
- margin-right: 80px;
+ margin-left: 50px;
+ margin-right: 50px;
}
/* Box on page
@@ -1069,16 +1072,18 @@
.directorySelectControl {
text-align: left;
- width: 40%
+ white-space: nowrap;
}
.directoryClipboard {
text-align: right;
- width: 40%
+ white-space: nowrap;
}
.directoryTrash {
text-align: right;
+ white-space: nowrap;
+ width: 125px;
}
.directoryPathTable {
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/userControl.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/userControl.css 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/userControl.css 2008-01-23 08:09:43 UTC (rev 7197)
@@ -43,9 +43,16 @@
display: inline;
}
-.resetPasswordRequestForm .form {
- margin:-10px;
+.resetPasswordRequestForm {
+ display: inline;
}
-.resetPasswordRequestForm .form .formFields {
+.resetPasswordRequestFormFields {
}
+
+.resetPasswordRequestFormFields .entry .label {
+ white-space: nowrap;
+}
+
+.resetPasswordRequestFormControls {
+}
Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-23 04:39:45 UTC (rev 7196)
+++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-23 08:09:43 UTC (rev 7197)
@@ -237,7 +237,7 @@
// ###################### Design #################################
function pulsate(query) {
- var blinkCount = 4*2;
+ var blinkCount = 2*2;
do {
jQuery(query)['fade'+(blinkCount%2==0?'Out':'In')]('fast');
} while (--blinkCount);
@@ -385,11 +385,24 @@
<s:div id="messageBoxContainer">
<s:div id="messageBox" styleClass="messageBox" rendered="#{!empty facesMessages.currentGlobalMessages}">
<ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}">
- <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif"
- width="18" height="18" styleClass="messageBoxImage infoImage"/>
- <h:outputText styleClass="infoMessage" value="#{message.summary}"/>
+
+ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0"
+ rendered="#{message.severity.ordinal == 0}">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif"
+ width="18" height="18"
+ styleClass="messageBoxImage infoImage"/>
+ <h:outputText styleClass="infoMessage" value="#{message.summary}"/>
</h:panelGrid>
+
+ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0"
+ rendered="#{message.severity.ordinal > 0}">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
+ rendered="#{message.severity.ordinal > 0}"
+ width="18" height="18"
+ styleClass="messageBoxImage attentionImage"/>
+ <h:outputText styleClass="attentionMessage" value="#{message.summary}"/>
+ </h:panelGrid>
+
</ui:repeat>
<script type="text/javascript">jQuery(function() {
jQuery("#messageBoxContainer").css("margin-top", "10px").css("margin-bottom", "10px");
16 years, 11 months
- 1
- 0
Seam SVN: r7196 - trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-01-22 23:39:45 -0500 (Tue, 22 Jan 2008)
New Revision: 7196
Modified:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
Log:
fix seamspace test
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-22 21:34:26 UTC (rev 7195)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-23 04:39:45 UTC (rev 7196)
@@ -94,32 +94,42 @@
setParameter("name", "Mr_Smiley");
setParameter("blogId", "1");
}
-
+
@Override
- protected void invokeApplication() throws Exception
+ protected void renderResponse() throws Exception
{
- assert invokeAction("#{blog.createComment}") == null;
-
- assert getValue("#{comment}") != null;
- assert getValue("#{comment.blog}") != null;
+ assert getValue("#{selectedBlog}") != null;
+ assert getValue("#{selectedBlog.blogId}").equals(1);
}
}.run();
-
+
new FacesRequest("/comment.xhtml", cid)
{
@Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{comment.comment}", "I totally disagree with your blog entry!");
- }
-
- @Override
protected void invokeApplication() throws Exception
{
- assert invokeAction("#{blog.saveComment}") == null;
+ assert invokeAction("#{blog.createComment}") == null;
+
+ assert getValue("#{comment}") != null;
+ assert getValue("#{comment.blog}") != null;
}
}.run();
+ new FacesRequest("/comment.xhtml", cid)
+ {
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{comment.comment}", "I totally disagree with your blog entry!");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ assert invokeAction("#{blog.saveComment}") == null;
+ }
+ }.run();
+
new FacesRequest()
{
@Override
@@ -128,6 +138,7 @@
invokeAction("#{identity.logout}");
assert getValue("#{identity.loggedIn}").equals(false);
}
- }.run();
+ }.run();
+
}
}
16 years, 11 months
- 1
- 0
Seam SVN: r7195 - trunk/build.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-01-22 16:34:26 -0500 (Tue, 22 Jan 2008)
New Revision: 7195
Modified:
trunk/build/root.pom.xml
Log:
update jboss-el dependency
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-01-22 18:57:45 UTC (rev 7194)
+++ trunk/build/root.pom.xml 2008-01-22 21:34:26 UTC (rev 7195)
@@ -651,7 +651,7 @@
<dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
16 years, 11 months
- 1
- 0