[seam-commits] Seam SVN: r7250 - in trunk/examples/wiki: src/etc and 11 other directories.

Author: christian.bauer(a)jboss.com Date: 2008-01-28 05:08:46 -0500 (Mon, 28 Jan 2008) New Revision: 7250 Added: trunk/examples/wiki/view/themes/sfwkorg/img/runningon_seamlogo_beige.gif Removed: trunk/examples/wiki/view/themes/sfwkorg/img/powered_by_seam.png Modified: trunk/examples/wiki/build.xml trunk/examples/wiki/src/etc/META-INF/components-dev.xml trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml trunk/examples/wiki/src/etc/WEB-INF/pages.xml trunk/examples/wiki/src/etc/messages_en.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml trunk/examples/wiki/view/message.xhtml trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml trunk/examples/wiki/view/themes/default/css/feedAggregator.css trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css trunk/examples/wiki/view/themes/sfwkorg/template.xhtml Log: Improved exception handling a bit (still buggy) Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/build.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -427,6 +427,8 @@ <!-- Clean up afterwards for the next deploy run --> <antcall target="clean"/> + <echo message="Compiled and packaged distribution files into directory: ${wiki.dist.dir}"/> + </target> <!-- ######################## TOOLS ################## --> Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -35,4 +35,9 @@ </property> </component> + <!-- Wiki is in debug mode --> + <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> + <property name="debug">true</property> + </component> + </components> \ No newline at end of file Modified: trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -41,8 +41,9 @@ <!-- Enable EHCache and register the JMX monitoring MBean --> <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> - <property name="hibernate.cache.use_query_cache" value="true"/> - <property name="hibernate.cache.use_second_level_cache" value="true"/> + <!-- TODO: The cache causes lots of unexpected stale query data problems, need to investigate --> + <property name="hibernate.cache.use_query_cache" value="false"/> + <property name="hibernate.cache.use_second_level_cache" value="false"/> <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiNode" value="read-write, WikiNode"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -36,8 +36,9 @@ <!-- Enable EHCache and register the JMX monitoring MBean --> <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> - <property name="hibernate.cache.use_query_cache" value="true"/> - <property name="hibernate.cache.use_second_level_cache" value="true"/> + <!-- TODO: The cache causes lots of unexpected stale query data problems, need to investigate --> + <property name="hibernate.cache.use_query_cache" value="false"/> + <property name="hibernate.cache.use_second_level_cache" value="false"/> <property name="hibernate.ejb.classcache.org.jboss.seam.wiki.core.model.WikiNode" value="read-write, WikiNode"/> Modified: trunk/examples/wiki/src/etc/WEB-INF/pages.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -355,42 +355,36 @@ <page view-id="/userList_m.xhtml"> <description>#{messages['lacewiki.label.userList.MemberList']} (#{messages['lacewiki.label.userList.Results']}: #{userSearch.rowCount})</description> </page> - - - - <page view-id="/test.xhtml"> - <param name="foo" value="#{testBean.foo}"/> - </page> - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/message.xhtml"> + <!-- TODO: This is never thrown by JSF --> + <redirect view-id="/wiki.xhtml"> <message>Your session has timed out, please try again</message> </redirect> </exception> - <!-- - <exception class="org.jboss.seam.framework.EntityNotFoundException"> - <end-conversation/> - <http-error error-code="404"/> - </exception> - <exception class="org.jboss.seam.security.AuthorizationException"> <end-conversation/> - <redirect view-id="/message.xhtml"> + <redirect view-id="/wiki.xhtml"> <message severity="WARN">#{messages['lacewiki.msg.AccessDenied']}: #{org.jboss.seam.handledException.message}</message> </redirect> </exception> <exception class="javax.persistence.OptimisticLockException"> + <end-conversation/> + <!-- TODO: This fails randomly, it works only once and then we don't get the message anymore?! --> <redirect view-id="/message.xhtml"> - <message>An error occured.</message> + <message severity="WARN">#{messages['lacewiki.msg.OptimisticLockError']}</message> </redirect> </exception> ---> - <!-- This breaks unit tests... + <exception class="org.jboss.seam.framework.EntityNotFoundException"> + <end-conversation/> + <http-error error-code="404"/> + </exception> + + <!-- TODO: This breaks unit tests... <exception> <redirect view-id="/message.xhtml"> <message severity="ERROR">Exception: #{org.jboss.seam.exception.message}</message> Modified: trunk/examples/wiki/src/etc/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_en.properties 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/etc/messages_en.properties 2008-01-28 10:08:46 UTC (rev 7250) @@ -20,8 +20,8 @@ org.jboss.seam.loginFailed=Login failed, please try again. org.jboss.seam.loginSuccessful=Login successful, welcome #0. -org.jboss.seam.TransactionFailed=Transaction failed -org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request. +org.jboss.seam.TransactionFailed=Transaction failed. +org.jboss.seam.NoConversation=The workspace ended, timed out or was processing another request. org.jboss.seam.IllegalNavigation=Illegal navigation org.jboss.seam.ProcessEnded=Process #0 already ended org.jboss.seam.ProcessNotFound=Process #0 not found @@ -639,7 +639,7 @@ lacewiki.msg.ImportDuplicateName=Skipping file '{0}', name is already used in this area... lacewiki.msg.ImportInvalidNode=Skipping entry '{0}', invalid: {1} lacewiki.msg.ImportOk=Created file '{0}' in current directory. -lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Please restart your workspace. +lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Your workspace has been closed. lacewiki.msg.AccessDenied=Access Denied lacewiki.msg.FatalError=An unrecoverable error occured! lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted. Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java 2008-01-28 10:08:46 UTC (rev 7250) @@ -32,6 +32,8 @@ @Logger static Log log; + private boolean debug; + @In(required = false) DBUnitImporter dbunitImporter; @@ -66,6 +68,14 @@ ManagementFactory.getPlatformMBeanServer().unregisterMBean(hibernateMBeanName); } + public boolean isDebug() { + return debug; + } + + public void setDebug(boolean debug) { + this.debug = debug; + } + /** Utility to debug JBoss JNDI problems */ public static String listJNDITree(String namespace) { StringBuffer buffer = new StringBuffer(4096); 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-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java 2008-01-28 10:08:46 UTC (rev 7250) @@ -134,6 +134,10 @@ throw new IllegalStateException("Could not find parent node with id: " + parentNodeId); getLog().debug("initalized with parent node: " + parentNode); + // Check write access level of the parent node, if the user wants to create a new node + if (!Identity.instance().hasPermission("Node", "create", parentNode) ) + throw new AuthorizationException("You don't have permission for this operation"); + // Default to same access permissions as parent node node.setWriteAccessLevel(parentNode.getWriteAccessLevel()); node.setReadAccessLevel(parentNode.getReadAccessLevel()); @@ -166,6 +170,10 @@ public N beforeNodeEditFound(N node) { + // Check write access level of the node the user wants to edit + if (!Identity.instance().hasPermission("Node", "edit", node) ) + throw new AuthorizationException("You don't have permission for this operation"); + writeAccessLevel = getAccessLevelsList().get( accessLevelsList.indexOf( new Role.AccessLevel(node.getWriteAccessLevel()) 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-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-28 10:08:46 UTC (rev 7250) @@ -4,7 +4,7 @@ <PREFERENCE PREF_ID = "1" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "baseUrl" STRING_VALUE = "http://localhost:8080/wiki" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "2" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "timeZone" STRING_VALUE = "CET" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> - <PREFERENCE PREF_ID = "3" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "themeName" STRING_VALUE = "default" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "3" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "themeName" STRING_VALUE = "sfwkorg" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "4" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "memberArea" STRING_VALUE = "Members" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "5" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "helpArea" STRING_VALUE = "Help" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "6" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "defaultDocumentId" STRING_VALUE = "[NULL]" LONG_VALUE = "6" BOOLEAN_VALUE = "[NULL]"/> @@ -22,20 +22,20 @@ <PREFERENCE PREF_ID = "18" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "trashArea" STRING_VALUE = "Trash" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "19" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "showSiteFeedInMenu" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> - <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 = "60" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "50" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "minorRevisionEnabled" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> + <PREFERENCE PREF_ID = "51" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaRows" STRING_VALUE = "[NULL]" LONG_VALUE = "15" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "52" 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]"/> - <PREFERENCE PREF_ID = "32" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "newUserInRole" STRING_VALUE = "member" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> - <PREFERENCE PREF_ID = "33" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "enableRegistration" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> - <PREFERENCE PREF_ID = "34" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "createHomeAfterUserActivation" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "false"/> - <PREFERENCE PREF_ID = "35" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "homepageDefaultContent" STRING_VALUE = "This is your homepage, login to edit it." LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "60" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "activationCodeSalt" STRING_VALUE = "MySecretSalt123" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "61" 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]"/> + <PREFERENCE PREF_ID = "62" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "newUserInRole" STRING_VALUE = "member" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "63" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "enableRegistration" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> + <PREFERENCE PREF_ID = "64" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "createHomeAfterUserActivation" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "false"/> + <PREFERENCE PREF_ID = "65" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "homepageDefaultContent" STRING_VALUE = "This is your homepage, login to edit it." LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> - <PREFERENCE PREF_ID = "40" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "listAscending" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "false"/> - <PREFERENCE PREF_ID = "41" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "enableByDefault" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> - <PREFERENCE PREF_ID = "42" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "threaded" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> + <PREFERENCE PREF_ID = "70" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "listAscending" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "false"/> + <PREFERENCE PREF_ID = "71" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "enableByDefault" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> + <PREFERENCE PREF_ID = "72" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Comments" PROPERTY_NAME = "threaded" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> <!-- PLUGINS --> Modified: trunk/examples/wiki/view/message.xhtml =================================================================== --- trunk/examples/wiki/view/message.xhtml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/message.xhtml 2008-01-28 10:08:46 UTC (rev 7250) @@ -14,45 +14,42 @@ <h:messages/> </div> -<s:fragment rendered="#{init.debug}"> - Exception Details: - <hr/> +<s:fragment rendered="#{wikiInit.debug}"> - <s:div id="stackTraceHandled"> - Handled exception: - <pre style="font-size:75%;"> +<h2>wikiInit.debug=true</h2> -Top level exception : #{org.jboss.seam.handledException.class.name}: #{org.jboss.seam.handledException.message} +<hr/> + +<h3>Handled exception:</h3> +<pre>Top level exception : #{org.jboss.seam.handledException.class.name}: #{org.jboss.seam.handledException.message} ========================================================================================================================= <ui:repeat value="#{org.jboss.seam.handledException.stackTrace}" var="stackElement"> #{stackElement}</ui:repeat> +</pre> -Root cause exception: #{wiki:unwrap(org.jboss.seam.handledException).class.name}: #{wiki:unwrap(org.jboss.seam.handledException).message} +<s:fragment rendered="#{wiki:unwrap(org.jboss.seam.handledException) != org.jboss.seam.handledException}"> +<pre>Root cause exception: #{wiki:unwrap(org.jboss.seam.handledException).class.name}: #{wiki:unwrap(org.jboss.seam.handledException).message} ========================================================================================================================= <ui:repeat value="#{wiki:unwrap(org.jboss.seam.handledException).stackTrace}" var="stackElement"> #{stackElement}</ui:repeat> - </pre> - <hr/> - </s:div> +</s:fragment> - <s:div id="stackTrace"> - Unhandled or wrapper exception: - <pre style="font-size:75%;"> +<h3>Unhandled or wrapper exception:</h3> -Top level exception : #{org.jboss.seam.exception.class.name}: #{org.jboss.seam.exception.message} +<pre>Top level exception : #{org.jboss.seam.exception.class.name}: #{org.jboss.seam.exception.message} ========================================================================================================================= <ui:repeat value="#{org.jboss.seam.exception.stackTrace}" var="stackElement"> #{stackElement}</ui:repeat> +</pre> -Root cause exception: #{wiki:unwrap(org.jboss.seam.exception).class.name}: #{wiki:unwrap(org.jboss.seam.exception).message} +<s:fragment rendered="#{wiki:unwrap(org.jboss.seam.exception) != org.jboss.seam.exception}"> +<pre>Root cause exception: #{wiki:unwrap(org.jboss.seam.exception).class.name}: #{wiki:unwrap(org.jboss.seam.exception).message} ========================================================================================================================= <ui:repeat value="#{wiki:unwrap(org.jboss.seam.exception).stackTrace}" var="stackElement"> #{stackElement}</ui:repeat> - </pre> - <hr/> - </s:div> +</s:fragment> </s:fragment> Modified: trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-28 10:08:46 UTC (rev 7250) @@ -10,28 +10,25 @@ <s:div styleClass="feedAggregator box"> - <s:div styleClass="boxHeader" rendered="#{empty preferences.get('FeedAggregator', currentMacro).aggregateId}"> - <h:outputText value="#{preferences.get('FeedAggregator', currentMacro).title}"/> - </s:div> - - <h:panelGrid rendered="#{not empty preferences.get('FeedAggregator', currentMacro).aggregateId}" - columns="2" cellpadding="0" cellspacing="0" border="0" - columnClasses="feedAggregatorSubscribe, feedAggregatorTitle" - styleClass="boxHeader fullWidth"> + <s:div styleClass="boxHeader"> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" + styleClass="feedAggregatorTitle"> + + <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}" + rendered="#{not empty preferences.get('FeedAggregator', currentMacro).aggregateId}" + style="margin-right:10px;"> + <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom" + /> </h:outputLink> - <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}"> - <h:outputText value="#{messages['feedAggregator.label.Subscribe']}"/> - </h:outputLink> - </h:panelGrid> - <h:outputText value="#{preferences.get('FeedAggregator', currentMacro).title}"/> + <h:outputText value="#{preferences.get('FeedAggregator', currentMacro).title}"/> - </h:panelGrid> + </h:panelGrid> + </s:div> + + <div class="boxContent"> <h:dataTable value="#{feedAggregator.feedEntries}" var="feDTO" rendered="#{not empty feedAggregator.feedEntries and feedAggregator.feedEntries.size() > 0}" Modified: trunk/examples/wiki/view/themes/default/css/feedAggregator.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/feedAggregator.css 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/themes/default/css/feedAggregator.css 2008-01-28 10:08:46 UTC (rev 7250) @@ -1,16 +1,13 @@ .feedAggregatorTitle { - text-align: right; + margin-left: auto; } -.feedAggregatorSubscribe { - text-align: left; -} - .feedEntryColumn { padding: 10px; } .feedEntryTitle { + font-weight: bold; padding-top: 15px; padding-bottom: 15px; } Modified: trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/themes/sfwkorg/css/feedAggregator.css 2008-01-28 10:08:46 UTC (rev 7250) @@ -1,11 +1,7 @@ .feedAggregatorTitle { - text-align: right; + margin-left:auto; } -.feedAggregatorSubscribe { - text-align: left; -} - .feedEntryColumn { padding: 10px; } Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-01-28 10:08:46 UTC (rev 7250) @@ -319,7 +319,7 @@ .homepageNews .rowOdd td, .homepageNews .rowEven td { padding: 2px; - border-bottom: 1px solid #b6b6b6; +/* border-bottom: 1px solid #b6b6b6; */ } /* ----- Footer styles ------ */ Deleted: trunk/examples/wiki/view/themes/sfwkorg/img/powered_by_seam.png =================================================================== (Binary files differ) Added: trunk/examples/wiki/view/themes/sfwkorg/img/runningon_seamlogo_beige.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/wiki/view/themes/sfwkorg/img/runningon_seamlogo_beige.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-27 22:03:32 UTC (rev 7249) +++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-28 10:08:46 UTC (rev 7250) @@ -385,9 +385,9 @@ </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 value="http://seamframework.org/Community/GetASeamIcon"> + <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/runningon_seamlogo_beige.gif" + width="200" height="50"/> </h:outputLink> </div>