Seam SVN: r9143 - tags.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-24 15:11:51 -0400 (Wed, 24 Sep 2008)
New Revision: 9143
Added:
tags/JBoss_Seam_2_1_0_CR1/
Log:
tag for release
Copied: tags/JBoss_Seam_2_1_0_CR1 (from rev 9142, trunk)
16 years, 2 months
- 1
- 0
Seam SVN: r9142 - in trunk: build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-09-24 15:11:34 -0400 (Wed, 24 Sep 2008)
New Revision: 9142
Modified:
trunk/build/default.build.properties
trunk/changelog.txt
trunk/readme.txt
Log:
version numbers for release
Modified: trunk/build/default.build.properties
===================================================================
--- trunk/build/default.build.properties 2008-09-24 16:53:40 UTC (rev 9141)
+++ trunk/build/default.build.properties 2008-09-24 19:11:34 UTC (rev 9142)
@@ -8,7 +8,7 @@
major.version 2
minor.version .1
patchlevel .0
-qualifier -SNAPSHOT
+qualifier .CR1
#
# Other program locations
# -----------------------
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2008-09-24 16:53:40 UTC (rev 9141)
+++ trunk/changelog.txt 2008-09-24 19:11:34 UTC (rev 9142)
@@ -1,6 +1,133 @@
JBoss Seam Changelog
====================
+Release Notes - Seam - Version 2.1.0.CR1
+
+** Bug
+ * [JBSEAM-808] - StatckOverflowError if factory specifies it's component
+ * [JBSEAM-1277] - ServerConversationContext does not process removals / additions when an exception propagates up
+ * [JBSEAM-1747] - SeamPhaseListener transaction debug log statements are misleading/confusing
+ * [JBSEAM-1832] - Improvments to handling of Ajax Requests in Seam
+ * [JBSEAM-2133] - inline EL in component property value not properly detected
+ * [JBSEAM-2197] - interpolate swallows FormatType and FormatStyle of MessageFormat
+ * [JBSEAM-2348] - seam generate-ui fails for @OneToOne @PrimaryKeyJoinColumn annotated fields
+ * [JBSEAM-2465] - Asynchronous method call from page action
+ * [JBSEAM-2479] - META Tags added to HTML HEAD in Seam HTML mail get removed
+ * [JBSEAM-2480] - Important META tags missing from HTML generated email
+ * [JBSEAM-2499] - Seam Messages strips any MessageFormat formatting parameters
+ * [JBSEAM-2546] - Interpolator should support escaping of #{ character combination
+ * [JBSEAM-2607] - ThreadPoolDispatcher: exceptions from AsynchronousInvocation.call() are not logged
+ * [JBSEAM-2666] - ManagedPersistenceContext closed in a clustered environment
+ * [JBSEAM-2889] - Exception thrown by @Asynchronous method called by ThreadPoolDispatcher causes timer to suspend
+ * [JBSEAM-2907] - seam-gen should make their List classes type safe
+ * [JBSEAM-2921] - "no file extension in servlet path" exception when building redirect URI
+ * [JBSEAM-2947] - seam-gen crud app throws exception if duplicate entry added
+ * [JBSEAM-2955] - seambay example throws an exception when viewing "Whistler's Mother" item
+ * [JBSEAM-2958] - Spring example - no hotel checkout date is shown when booking a hotel
+ * [JBSEAM-2959] - Spring example can't change password
+ * [JBSEAM-2960] - ui example <s:graphicImage> example shows no image
+ * [JBSEAM-2992] - Wicket-Seam integration doesn't propagate the temporary conversation across a redirect
+ * [JBSEAM-2996] - Imported seam-gen project does not show content assist on project specific components
+ * [JBSEAM-3045] - urlrewritefilter breaks basic authentication
+ * [JBSEAM-3151] - SpringTransaction : error when using events.raiseTransactionSuccessEvent
+ * [JBSEAM-3176] - HotelSearchingAction not serializable
+ * [JBSEAM-3224] - RememberMe autologin mode is broken
+ * [JBSEAM-3231] - Support CSS for layout
+ * [JBSEAM-3236] - Simplify header handling
+ * [JBSEAM-3238] - More Excel examples
+ * [JBSEAM-3273] - @Startup + @Create on session-scoped bean broken in Seam 2.1
+ * [JBSEAM-3290] - hibernate tools dependencies should not be in the Seam lib directory
+ * [JBSEAM-3292] - junit.jar in not needed, but packaged with Seam distributions
+ * [JBSEAM-3313] - seamspace example blog comments throw security exceptions
+ * [JBSEAM-3314] - seamspace example allows "comment" permission on images, but there does not seem to be a way to add a comment
+ * [JBSEAM-3315] - seamspace example does not validate permission settings
+ * [JBSEAM-3316] - seamspace example fileupload throws a PropertyNotFoundException
+ * [JBSEAM-3319] - Excel example - row missing in csv file
+ * [JBSEAM-3320] - dvdstore is showing some jbpm warning
+ * [JBSEAM-3321] - Wicket example - gets blocked after entering invalid check-in/out dates
+ * [JBSEAM-3322] - Wicket example - conversations.xhtml file present
+ * [JBSEAM-3323] - JPA example on Tomcat 6.X and glassfish throws a IllegalStateException: Cannot load WEB-INF/classes/org/jboss/seam/example/jpa/Hotel.class
+ * [JBSEAM-3325] - jpa/hibernate examples build-jboss-embedded.xml files point to an invalid ant target
+ * [JBSEAM-3326] - seam-gen icefaces application throws a 404 when creating a new Person following release process
+ * [JBSEAM-3327] - seam-gen icefaces "new-form" submit does nothing
+ * [JBSEAM-3328] - Imported seam-gen project into jbtools 2.1.1 has missing jstl.jar
+ * [JBSEAM-3329] - security validation error in jbtools generated project for rule-based-permission-resolver element
+ * [JBSEAM-3334] - Icefaces example login does not work on JDK5
+ * [JBSEAM-3335] - port fix to trunk for glassfish jee5 example throws IllegalStateException: EJB is already associated with an incomplete transaction
+ * [JBSEAM-3336] - seam gen new-form and new-action do not show faces message on JDK6
+ * [JBSEAM-3338] - Documentation has some strange xml code in 19.1
+ * [JBSEAM-3340] - StatusMessages: addition of ConfigRedirectHandler messages is broken
+ * [JBSEAM-3343] - Bijection problem when page is deserialized from PageStore
+ * [JBSEAM-3344] - LDAPIdentityStore is missing server-port on xsd
+ * [JBSEAM-3349] - LDAPIdentityStore generates invalid filter on listUsers method
+ * [JBSEAM-3350] - BEA 10 Deployment fails
+ * [JBSEAM-3351] - Security XSD missing elements
+ * [JBSEAM-3354] - ELException catched in lifecycle phase RENDER_RESPONSE about: the raised exception does not have a readable property
+ * [JBSEAM-3357] - NPE on hot deploy
+ * [JBSEAM-3360] - EntityManager becoming detached in EntityConverter
+ * [JBSEAM-3366] - org.jboss.seam.util.Resources#getResourceAsStream() fails with newer versions of Tomcat, page.xml files aren't found
+ * [JBSEAM-3374] - NPE if Identity not set in IdentityRequestWrapper
+ * [JBSEAM-3379] - Identifier annotation can't be set on a class
+ * [JBSEAM-3382] - New caching providers functionality is seriously broken (PATCH)
+ * [JBSEAM-3392] - Reflections.getGetterMethod fails for boolean properties
+ * [JBSEAM-3399] - java.lang.NullPointerException at org.jboss.seam.deployment.HotDeploymentStrategy.getScannedComponentClasses(HotDeploymentStrategy.java:162)
+ * [JBSEAM-3403] - EntityQuerys fail when using an Empty Collection in a restriction
+ * [JBSEAM-3404] - Extended Identity component is not being loaded during Initialization process
+ * [JBSEAM-3407] - Unclosed stream in org.jboss.seam.deployment.DeploymentStrategy
+ * [JBSEAM-3409] - Examples broken after CSS migration
+ * [JBSEAM-3413] - HotDeployementStrategy rev 8925 causes Exceptions with ICEfaces server-push for Seam trunk only
+ * [JBSEAM-3426] - Make Exception Handling, Redirection URI a page request rather than Ajax request for ICEfaces integration
+ * [JBSEAM-3427] - Seam Components missing @Install(precedence = BUILT_IN) annotation
+ * [JBSEAM-3429] - Build for chatroom example needs to deploy chatroom-service.xml on AS5
+ * [JBSEAM-3430] - s:selectitems noSelectionLabel broken for java.util.Map
+ * [JBSEAM-3435] - Hot Deployment of minor changes terminates the session and triggers full app redeployment
+ * [JBSEAM-3436] - testReentrantBijection() is failing
+ * [JBSEAM-3440] - Don't attempt to change flush mode if persistence manager is closed
+ * [JBSEAM-3442] - JMS functionality broken in JBossAS 5
+ * [JBSEAM-3448] - MultipartFilter does not begin parsing until after transaction is started
+ * [JBSEAM-3453] - Deployed jar list files needed to be modified for remoting to work correctly in a newly generated project.
+
+
+** Feature Request
+ * [JBSEAM-905] - Using the debug page without exceptions
+ * [JBSEAM-1485] - Configure Default Interceptors
+ * [JBSEAM-1943] - Support for destroying the entire ConversationStack
+ * [JBSEAM-2033] - style h:messages (perhaps using rich:messages)
+ * [JBSEAM-2339] - add javadoc target to seam-gen project
+ * [JBSEAM-2469] - add postback flag to page actions
+ * [JBSEAM-2597] - Exception handling - JSF swallows exceptions in certain phases
+ * [JBSEAM-2610] - Better feedback than "The conversation ended, timed out or was processing another request"
+ * [JBSEAM-3088] - Allow supported locales to be configured in the component descriptor
+ * [JBSEAM-3212] - Improve Excel module reference documentation
+ * [JBSEAM-3233] - Support inline value for cells
+ * [JBSEAM-3284] - Document the support for .xls/.csv extension for DocumentStore URL like pdf has
+ * [JBSEAM-3309] - Drop worksheet name CSV export
+ * [JBSEAM-3332] - Support iterators from richfaces extended data model in excel exporter
+ * [JBSEAM-3341] - add support for facet name="footer" in <e:column>
+ * [JBSEAM-3362] - Detect cyclic dependencies and throw exception
+ * [JBSEAM-3376] - Add exportKey attribute to Workbook tag
+ * [JBSEAM-3410] - Improve CSS parser
+ * [JBSEAM-3414] - More restrictive/descriptive data structure of the pages.xsd
+ * [JBSEAM-3418] - Ignore case on none for @UserPassword hash parameter
+ * [JBSEAM-3422] - Add basic method on Identity that checks for authenticated user
+ * [JBSEAM-3423] - Modularize rss support
+ * [JBSEAM-3438] - Honor input's label attribute in ModelValidator message
+
+** Task
+ * [JBSEAM-1954] - JDK 1.6 tests failing
+ * [JBSEAM-2594] - Container issue - improved exception handling in Seam
+ * [JBSEAM-2732] - Remove deprecated s:selectDate
+ * [JBSEAM-3002] - Upgrade to GA of JBoss.org docbook plugins
+ * [JBSEAM-3191] - Upgrade to jBPM 3.2.3
+ * [JBSEAM-3199] - seam-gen test readme.txt jar listing needs to be updated
+ * [JBSEAM-3258] - Update sfwk.org instructions for JDK6 support
+ * [JBSEAM-3301] - Review reentrant call handling in light of problems with BijectionInterceptor
+ * [JBSEAM-3311] - Maven overrides dependencyManagement with transitive dependencies
+ * [JBSEAM-3356] - Seam PDF integration should throw runtime exceptions, not IOExceptions
+ * [JBSEAM-3389] - seam-gen generated Authenticator component is not up to date
+ * [JBSEAM-3456] - Verify Seam JEE example on WLS 10.0MP1
+
+
Release Notes - Seam - Version 2.1.0.BETA1
** Bug
Modified: trunk/readme.txt
===================================================================
--- trunk/readme.txt 2008-09-24 16:53:40 UTC (rev 9141)
+++ trunk/readme.txt 2008-09-24 19:11:34 UTC (rev 9142)
@@ -1,6 +1,6 @@
JBoss Seam - Contextual Component framework for Java EE 5
=========================================================
-version 2.1.0.SNAPSHOT, August 2008
+version 2.1.0.CR1, September 2008
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
16 years, 2 months
- 1
- 0
Seam SVN: r9141 - in trunk/seam-gen: icefaces/view and 1 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-24 12:53:40 -0400 (Wed, 24 Sep 2008)
New Revision: 9141
Modified:
trunk/seam-gen/build.xml
trunk/seam-gen/icefaces/view/error.xhtml
trunk/seam-gen/view/error.xhtml
Log:
move showGlobalMessages parameter to correct place in template
don't copy favicon with filtering
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-09-24 16:02:26 UTC (rev 9140)
+++ trunk/seam-gen/build.xml 2008-09-24 16:53:40 UTC (rev 9141)
@@ -810,7 +810,6 @@
<copy todir="${project.home}/view">
<fileset id="view" dir="${base.dir}/view">
- <include name="favicon.ico"/>
<include name="home.xhtml"/>
<include name="error.xhtml"/>
<include name="login.xhtml"/>
@@ -825,6 +824,7 @@
<!-- Images have to be copied without filter -->
<copy todir="${project.home}/view">
<fileset id="view" dir="${base.dir}/view">
+ <include name="favicon.ico"/>
<include name="img/*"/>
</fileset>
</copy>
Modified: trunk/seam-gen/icefaces/view/error.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 16:02:26 UTC (rev 9140)
+++ trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 16:53:40 UTC (rev 9141)
@@ -7,8 +7,8 @@
xmlns:h="http://java.sun.com/jsf/html"
template="layout/template.xhtml">
+<ui:param name="showGlobalMessages" value="false"/>
<ui:define name="body">
- <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
Modified: trunk/seam-gen/view/error.xhtml
===================================================================
--- trunk/seam-gen/view/error.xhtml 2008-09-24 16:02:26 UTC (rev 9140)
+++ trunk/seam-gen/view/error.xhtml 2008-09-24 16:53:40 UTC (rev 9141)
@@ -7,8 +7,8 @@
xmlns:h="http://java.sun.com/jsf/html"
template="layout/template.xhtml">
+<ui:param name="showGlobalMessages" value="false"/>
<ui:define name="body">
- <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
16 years, 2 months
- 1
- 0
Seam SVN: r9140 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-09-24 12:02:26 -0400 (Wed, 24 Sep 2008)
New Revision: 9140
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml
Log:
updated refdoc for weblogic
Modified: trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-09-24 11:36:17 UTC (rev 9139)
+++ trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-09-24 16:02:26 UTC (rev 9140)
@@ -745,7 +745,7 @@
</itemizedlist>
</listitem>
</varlistentry>
- <varlistentry>
+ <!-- <varlistentry>
<term>
<literal>resources/WEB-INF/web.xml</literal>
</term>
@@ -768,7 +768,7 @@
</listitem>
</itemizedlist>
</listitem>
- </varlistentry>
+ </varlistentry> -->
</variablelist>
</section>
<section>
@@ -795,11 +795,15 @@
to deploy. For some reason Weblogic needs
it in the
<literal>WAR</literal>
- when it scans the application.
+ when it scans the application. There is some weird issue with
+ configuration of JSF. As workaround add also jsf-impl.jar from seam
+ distribution into WEB-INF/lib directory.
+
</para>
<programlisting role="XML"><![CDATA[
<fileset id="war.lib.extras" dir="${seam.dir}">
<include name="lib/richfaces-api.jar" />
+ <include name="lib/jsf-impl.jar" />
</fileset>]]></programlisting>
</listitem>
<listitem>
16 years, 2 months
- 1
- 0
Seam SVN: r9139 - in trunk/examples: hibernate/resources-glassfish/WEB-INF and 15 other directories.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2008-09-24 07:36:17 -0400 (Wed, 24 Sep 2008)
New Revision: 9139
Modified:
trunk/examples/groovybooking/resources/WEB-INF/pages.xml
trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml
trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml
trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml
trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml
trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml
trunk/examples/icefaces/resources/WEB-INF/pages.xml
trunk/examples/jee5/booking/resources/WEB-INF/pages.xml
trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml
trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml
trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml
trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml
trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml
trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml
trunk/examples/nestedbooking/resources/WEB-INF/pages.xml
trunk/examples/spring/resources/WEB-INF/pages.xml
trunk/examples/wicket/resources/WEB-INF/pages.xml
Log:
JBSEAM-3346 Fixed remaining examples.
Modified: trunk/examples/groovybooking/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/groovybooking/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/groovybooking/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml
===================================================================
--- trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/hibernate/resources-glassfish/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml
===================================================================
--- trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/hibernate/resources-jboss/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml
===================================================================
--- trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/hibernate/resources-tomcat/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml
===================================================================
--- trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/hibernate/resources-weblogic92/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml
===================================================================
--- trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/hibernate/resources-websphere61/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -101,5 +101,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/icefaces/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/icefaces/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -108,5 +108,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/jee5/booking/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jee5/booking/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-jboss/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml
===================================================================
--- trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -102,4 +102,10 @@
</redirect>
</exception>
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/nestedbooking/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/nestedbooking/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -128,5 +128,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
Modified: trunk/examples/spring/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/spring/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/spring/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -98,5 +98,18 @@
</navigation>
</page>
+
+ <exception class="org.jboss.seam.security.NotLoggedInException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">You must be logged in to use this feature</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
+
</pages>
Modified: trunk/examples/wicket/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-09-24 11:03:11 UTC (rev 9138)
+++ trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-09-24 11:36:17 UTC (rev 9139)
@@ -108,5 +108,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
16 years, 2 months
- 1
- 0
Seam SVN: r9138 - trunk/seam-gen/build-scripts.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-24 07:03:11 -0400 (Wed, 24 Sep 2008)
New Revision: 9138
Modified:
trunk/seam-gen/build-scripts/deployed-jars-ear-war.list
trunk/seam-gen/build-scripts/deployed-jars-ear.list
Log:
JBSEAM-3453
Modified: trunk/seam-gen/build-scripts/deployed-jars-ear-war.list
===================================================================
--- trunk/seam-gen/build-scripts/deployed-jars-ear-war.list 2008-09-24 10:06:19 UTC (rev 9137)
+++ trunk/seam-gen/build-scripts/deployed-jars-ear-war.list 2008-09-24 11:03:11 UTC (rev 9138)
@@ -1,7 +1,14 @@
commons-beanutils.jar
commons-digester.jar
-jboss-seam-*.jar
jsf-facelets.jar
jxl.jar
richfaces-impl.jar
richfaces-ui.jar
+jboss-seam-debug.jar
+jboss-seam-excel.jar
+jboss-seam-ioc.jar
+jboss-seam-mail.jar
+jboss-seam-pdf.jar
+jboss-seam-resteasy.jar
+jboss-seam-rss.jar
+jboss-seam-ui.jar
\ No newline at end of file
Modified: trunk/seam-gen/build-scripts/deployed-jars-ear.list
===================================================================
--- trunk/seam-gen/build-scripts/deployed-jars-ear.list 2008-09-24 10:06:19 UTC (rev 9137)
+++ trunk/seam-gen/build-scripts/deployed-jars-ear.list 2008-09-24 11:03:11 UTC (rev 9138)
@@ -7,3 +7,4 @@
jbpm-jpdl.jar
mvel14.jar
richfaces-api.jar
+jboss-seam-remoting.jar
\ No newline at end of file
16 years, 2 months
- 1
- 0
Seam SVN: r9137 - in trunk/examples/wiki/src/test: org/jboss/seam/wiki/test/editing and 2 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-24 06:06:19 -0400 (Wed, 24 Sep 2008)
New Revision: 9137
Modified:
trunk/examples/wiki/src/test/AllTests-jdk6.tng.xml
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java
Log:
Exclude more wiki tests under java 6
Modified: trunk/examples/wiki/src/test/AllTests-jdk6.tng.xml
===================================================================
--- trunk/examples/wiki/src/test/AllTests-jdk6.tng.xml 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/AllTests-jdk6.tng.xml 2008-09-24 10:06:19 UTC (rev 9137)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Lacewiki - All" verbose="1">
+<suite name="Lacewiki - All" verbose="1" parallel="false">
<parameter name="database" value="hsql"/>
@@ -80,6 +80,11 @@
</test>
<test name="Plugins">
+ <groups>
+ <run>
+ <exclude name="jdk6-expected-failures" />
+ </run>
+ </groups>
<packages>
<package name="org.jboss.seam.wiki.test.plugin"/>
</packages>
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java 2008-09-24 10:06:19 UTC (rev 9137)
@@ -103,7 +103,7 @@
}.run();
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void updateDocumentCheckRevisions() throws Exception {
loginAdmin();
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java 2008-09-24 10:06:19 UTC (rev 9137)
@@ -22,7 +22,7 @@
);
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void createUpload() throws Exception {
final String conversationId = new NonFacesRequest("/uploadCreate_d.xhtml") {
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/feeds/DocumentFeedTests.java 2008-09-24 10:06:19 UTC (rev 9137)
@@ -65,7 +65,7 @@
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void updateDocumentPushOnSiteFeed() throws Exception {
final String conversationId = new NonFacesRequest("/docEdit_d.xhtml") {
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java 2008-09-24 10:06:19 UTC (rev 9137)
@@ -27,7 +27,7 @@
);
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void addForum() throws Exception {
loginAdmin();
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java 2008-09-24 10:02:55 UTC (rev 9136)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java 2008-09-24 10:06:19 UTC (rev 9137)
@@ -29,7 +29,7 @@
);
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void newTopic() throws Exception {
final String conversationId = new FacesRequest() {
@@ -94,7 +94,7 @@
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void newStickyTopic() throws Exception {
loginAdmin();
@@ -160,7 +160,7 @@
}.run();
}
- @Test
+ @Test(groups="jdk6-expected-failures")
public void newClosedTopic() throws Exception {
loginAdmin();
16 years, 2 months
- 1
- 0
Seam SVN: r9136 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-24 06:02:55 -0400 (Wed, 24 Sep 2008)
New Revision: 9136
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/icefaces/build-scripts/build-war.xml
trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
JBSEAM-2339
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 09:49:55 UTC (rev 9135)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 10:02:55 UTC (rev 9136)
@@ -351,5 +351,20 @@
<xmlfileset dir="${test.dir}" includes="*Test.xml" />
</testng>
</target>
+
+ <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <mkdir dir="${dist.dir}/apidoc" />
+ <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
+
+ <packageset dir="${src.action.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ <packageset dir="${src.model.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ </javadoc>
+ </target>
</project>
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
+++ trunk/seam-gen/build-scripts/build.xml 2008-09-24 10:02:55 UTC (rev 9136)
@@ -322,6 +322,21 @@
<xmlfileset dir="${test.dir}" includes="*Test.xml" />
</testng>
</target>
+
+ <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <mkdir dir="${dist.dir}/apidoc" />
+ <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
+
+ <packageset dir="${src.action.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ <packageset dir="${src.model.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ </javadoc>
+ </target>
<target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files">
<mkdir dir="${schema.dir}"/>
Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-09-24 09:49:55 UTC (rev 9135)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-09-24 10:02:55 UTC (rev 9136)
@@ -345,6 +345,21 @@
<xmlfileset dir="${test.dir}" includes="*Test.xml" />
</testng>
</target>
+
+ <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <mkdir dir="${dist.dir}/apidoc" />
+ <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
+
+ <packageset dir="${src.action.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ <packageset dir="${src.model.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ </javadoc>
+ </target>
<target name="freshen" description="grab fresh icefaces jars">
<copy todir="${lib.dir}">
Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-24 10:02:55 UTC (rev 9136)
@@ -317,6 +317,21 @@
<xmlfileset dir="${test.dir}" includes="*Test.xml" />
</testng>
</target>
+
+ <target name="javadoc" depends="compilemodel,compileactions,copyclasses">
+ <mkdir dir="${dist.dir}/apidoc" />
+ <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
+
+ <packageset dir="${src.action.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ <packageset dir="${src.model.dir}" defaultexcludes="yes">
+ <include name="*/**" />
+ </packageset>
+
+ </javadoc>
+ </target>
<target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files">
<mkdir dir="${schema.dir}"/>
16 years, 2 months
- 1
- 0
Seam SVN: r9135 - in trunk/seam-gen: build-scripts and 14 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-24 05:49:55 -0400 (Wed, 24 Sep 2008)
New Revision: 9135
Added:
trunk/seam-gen/resources/org/
trunk/seam-gen/resources/org/jboss/
trunk/seam-gen/resources/org/jboss/seam/
trunk/seam-gen/resources/org/jboss/seam/ui/
trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/
trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss
trunk/seam-gen/view/favicon.ico
trunk/seam-gen/view/img/msgerror.png
trunk/seam-gen/view/img/msginfo.png
trunk/seam-gen/view/img/msgwarn.png
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/build.xml
trunk/seam-gen/icefaces/view/action.xhtml
trunk/seam-gen/icefaces/view/conversation.xhtml
trunk/seam-gen/icefaces/view/edit.xhtml
trunk/seam-gen/icefaces/view/edit.xhtml.ftl
trunk/seam-gen/icefaces/view/error.xhtml
trunk/seam-gen/icefaces/view/form.xhtml
trunk/seam-gen/icefaces/view/home.xhtml
trunk/seam-gen/icefaces/view/layout/template.xhtml
trunk/seam-gen/icefaces/view/list.xhtml
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/icefaces/view/login.xhtml
trunk/seam-gen/icefaces/view/query.xhtml
trunk/seam-gen/icefaces/view/stylesheet/theme.css
trunk/seam-gen/icefaces/view/view.xhtml.ftl
trunk/seam-gen/src/Authenticator.java
trunk/seam-gen/view/action.xhtml
trunk/seam-gen/view/conversation.xhtml
trunk/seam-gen/view/edit.xhtml
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/error.xhtml
trunk/seam-gen/view/form.xhtml
trunk/seam-gen/view/home.xhtml
trunk/seam-gen/view/layout/template.xhtml
trunk/seam-gen/view/list.xhtml
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/login.xhtml
trunk/seam-gen/view/query.xhtml
trunk/seam-gen/view/stylesheet/theme.css
trunk/seam-gen/view/view.xhtml.ftl
Log:
Drastically improve the look and feel by taking advantage of RichFaces custom skinning
Move global messages to template to prevent needless repitition (DRY)
Add Seam favicon to application
JBSEAM-2033 Use prettier message styles
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -185,6 +185,12 @@
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
+
+ <copy todir="${war.dir}/WEB-INF/classes">
+ <fileset dir="${basedir}/resources">
+ <include name="**/*.xcss"/>
+ </fileset>
+ </copy>
<copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build-scripts/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -127,6 +127,11 @@
</copy>
<copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
+ <include name="**/*.xcss"/>
+ </fileset>
+ </copy>
+ <copy todir="${war.dir}/WEB-INF/classes">
+ <fileset dir="${basedir}/resources">
<include name="messages*.properties"/>
<include name="*.skin.properties"/>
<include name="*_theme.properties"/>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -810,6 +810,7 @@
<copy todir="${project.home}/view">
<fileset id="view" dir="${base.dir}/view">
+ <include name="favicon.ico"/>
<include name="home.xhtml"/>
<include name="error.xhtml"/>
<include name="login.xhtml"/>
Modified: trunk/seam-gen/icefaces/view/action.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/action.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/action.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName@Form">
<ice:panelGroup id="actionFormId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/conversation.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/conversation.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName@Form">
<ice:panelGroup id="conversationPanelId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/edit.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/edit.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName@EditForm">
<ice:panelGroup id="edit@componentName@Id" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:form id="${componentName}editForm" styleClass="edit">
<ice:panelGroup id="edit${componentName}GroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/error.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -8,11 +8,11 @@
template="layout/template.xhtml">
<ui:define name="body">
-
+ <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
+ <h:messages id="errorMessage" styleClass="message"/>
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/icefaces/view/form.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/form.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/form.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName@formId">
<ice:panelGroup id="formSearchGroupId" styleClass="formBorderHighlight">
Modified: trunk/seam-gen/icefaces/view/home.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/home.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/home.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:panelGrid id="homePanelGrid" columns="2" columnClasses="leftMenu,leftMenu">
<img src="img/ICEfaces-logo.gif" alt="Icefaces and Seam: framework demo"/>
<ice:panelGroup id="homePanelGroup">
Modified: trunk/seam-gen/icefaces/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/layout/template.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/layout/template.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -12,10 +12,10 @@
doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@projectName@</title>
+ <link rel="shortcut icon" href="favicon.ico"/>
<link rel='stylesheet' type='text/css' href='./xmlhttp/css/rime/rime.css'/>
<link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
-
-
+ <ui:insert name="head"/>
</head>
<body>
@@ -25,6 +25,8 @@
<ice:outputConnectionStatus activeLabel="requesting..." styleClass="connectionStatus"/>
<div class="body">
+ <h:messages id="messages" globalOnly="true" styleClass="message" rendered="#{showGlobalMessages != 'false'}"
+ errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"/>
<ui:insert name="body"/>
</div>
Modified: trunk/seam-gen/icefaces/view/list.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/list.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,7 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
<ice:form id="listFormId">
<ice:panelGroup id="listSearchGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -19,14 +19,12 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:form id="list${componentName}FormId" styleClass="edit">
<ice:panelGroup id="searchGroup" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="iceDatTblColHdr2">
- <ice:outputText id="list${entityName}Id" value="${entityName} search"/>
+ <ice:outputText id="list${entityName}Id" value="${entityName} search filter"/>
</td>
</tr>
</table>
Modified: trunk/seam-gen/icefaces/view/login.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/login.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/login.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages styleClass="message"/>
-
<ice:form id="loginFormId">
<ice:panelGroup id="loginPanelGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -23,7 +21,7 @@
</table>
- <p>Please login using any username and password</p>
+ <p>Please login with the username <em>admin</em> and a blank password.</p>
<div class="dialog">
<ice:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value">
Modified: trunk/seam-gen/icefaces/view/query.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/query.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/query.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -13,7 +13,6 @@
<h1>@beanName@ results</h1>
<p>Generated query page</p>
- <h:messages globalOnly="true" styleClass="message"/>
<ice:form id="queryFormId">
<ice:outputText value="No results from search"
id="queryOutputTextId"
Modified: trunk/seam-gen/icefaces/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/icefaces/view/stylesheet/theme.css 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/stylesheet/theme.css 2008-09-24 09:49:55 UTC (rev 9135)
@@ -33,11 +33,15 @@
.error {
- color: red;
- border: solid red;
- padding: .4em;
- margin: 10px
+ padding: 5px;
}
+.errors {
+ color: red;
+ vertical-align: middle;
+}
+img.errors {
+ padding-right: 5px;
+}
.formBorderHighlight{
vertical-align: top; /*width: 100%;*/
@@ -48,14 +52,14 @@
.menuButtons {
font-size: 12px;
font-weight: bold;
- border-colour: #bed6f8;
+ border-color: #bed6f8;
/* background-color: #BED6F8; */
background-position: top left;
}
.menuButtons a {
font-size: 11px;
- colour: #000000;
+ color: #000000;
font-weight: bold;
font-family: Arial, Verdana, sans-serif;
text-decoration: none;
@@ -245,13 +249,38 @@
}
.message {
- border: 1px solid #FFCC00;
padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F0F0;
+ list-style: none;
+ border: 0;
+ background: none;
+ padding: 0;
+ color: #000000;
+ margin: 5px 0 8px 0;
+ font-size: 12px;
}
+.message li {
+ margin-left: 3px;
+}
+
+.message li span {
+ background: no-repeat left center;
+ padding-top: 1px;
+ padding-left: 20px;
+}
+
+.message li span.infomsg {
+ background-image: url(../img/msginfo.png);
+}
+
+.message li span.errormsg {
+ background-image: url(../img/msgerror.png);
+}
+
+.message li span.warnmsg {
+ background-image: url(../img/msgwarn.png);
+}
+
.prop {
padding: 5px;
display: block;
@@ -277,7 +306,7 @@
}*/
.errors input, .errors textarea {
- border: 1px solid red;
+ border: 1px solid red !important;
}
.contentLayoutGridStyleLogin {
Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:panelGroup id="view${homeName}PanelGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Added: trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss
===================================================================
--- trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss (rev 0)
+++ trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss 2008-09-24 09:49:55 UTC (rev 9135)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:template xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http:/jsf.exadel.com/template"
+ xmlns:u="http:/jsf.exadel.com/template/util">
+ <u:selector name="body">
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ <u:selector name="h1">
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="color" skin="tabDisabledTextColor"/>
+ </u:selector>
+ <u:selector name="a:active, a:link, a:visited">
+ <u:style name="color" skin="generalLinkColor"/>
+ </u:selector>
+ <u:selector name="a:hover">
+ <u:style name="color" skin="hoverLinkColor"/>
+ </u:selector>
+ <u:selector name="input[type='text'], input[type='password'], textarea, select">
+ <u:style name="background-color" skin="controlBackgroundColor"/>
+ <u:style name="color" skin="controlTextColor"/>
+ <u:style name="background-position" value="left top"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderFieldGradient"/>
+ </u:style>
+ <u:style name="border" value="1px solid"/>
+ <u:style name="border-color" skin="tableBorderColor" />
+ </u:selector>
+ <u:selector name="select">
+ <u:style name="background-color" value="transparent"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderFieldGradient"/>
+ </u:style>
+ </u:selector>
+ <u:selector name="option">
+ <u:style name="background-color" skin="generalBackgroundColor"/>
+ </u:selector>
+ <u:selector name="select[multiple]">
+ <u:style name="background-color" skin="controlBackgroundColor"/>
+ </u:selector>
+ <u:selector name="select[multiple] option">
+ <u:style name="background-color" value="transparent"/>
+ </u:selector>
+ <u:selector name="input[type='submit'], input[type='button']">
+ <u:style name="padding" value="1px 4px"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
+ </u:style>
+ <u:style name="border" value="1px solid"/>
+ <u:style name="border-color" skin="headerBackgroundColor"/>
+ <u:style name="color" skin="headerTextColor"/>
+ <u:style name="font-weight" value="bold"/>
+ </u:selector>
+ <u:selector name="input[type='submit'][disabled], input[type='button'][disabled]">
+ <u:style name="opacity" value="0.33"/>
+ </u:selector>
+ <u:selector name=".rich-table-subheadercell">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.TabGradientB"/>
+ </u:style>
+ </u:selector>
+ <u:selector name=".rich-toolbar a:link, .rich-toolbar a:visited, .rich-toolbar a:active, .rich-toolbar a:hover">
+ <u:style name="color" skin="headerTextColor"/>
+ </u:selector>
+ <u:selector name=".rich-toolbar a:hover">
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ <!--
+ <u:selector name=".rich-table-subheadercell a:link, .rich-table-subheadercell a:visited, .rich-table-subheadercell a:active">
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ -->
+ <u:selector name=".rich-table-subheadercell a:hover">
+ <u:style name="color" skin="calendarHolidaysTextColor"/>
+ </u:selector>
+</f:template>
Modified: trunk/seam-gen/src/Authenticator.java
===================================================================
--- trunk/seam-gen/src/Authenticator.java 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/src/Authenticator.java 2008-09-24 09:49:55 UTC (rev 9135)
@@ -22,7 +22,11 @@
//write your authentication logic here,
//return true if the authentication was
//successful, false otherwise
- identity.addRole("admin");
- return true;
+ if ("admin".equals(credentials.getUsername()))
+ {
+ identity.addRole("admin");
+ return true;
+ }
+ return false;
}
}
Modified: trunk/seam-gen/view/action.xhtml
===================================================================
--- trunk/seam-gen/view/action.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/action.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
Modified: trunk/seam-gen/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/view/conversation.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/conversation.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
Modified: trunk/seam-gen/view/edit.xhtml
===================================================================
--- trunk/seam-gen/view/edit.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/edit.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:form id="@componentName@Form">
<rich:panel>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -17,8 +17,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<h:form id="${componentName}" styleClass="edit">
<rich:panel>
Modified: trunk/seam-gen/view/error.xhtml
===================================================================
--- trunk/seam-gen/view/error.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/error.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -8,11 +8,12 @@
template="layout/template.xhtml">
<ui:define name="body">
+ <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
+ <h:messages id="errorMessage" styleClass="message"/>
</ui:define>
</ui:composition>
Added: trunk/seam-gen/view/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/seam-gen/view/form.xhtml
===================================================================
--- trunk/seam-gen/view/form.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/form.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:form id="@componentName@Form">
<rich:panel>
Modified: trunk/seam-gen/view/home.xhtml
===================================================================
--- trunk/seam-gen/view/home.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/home.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">Welcome!</f:facet>
<p>This empty shell application includes:</p>
Added: trunk/seam-gen/view/img/msgerror.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msgerror.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam-gen/view/img/msginfo.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msginfo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam-gen/view/img/msgwarn.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msgwarn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/seam-gen/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/view/layout/template.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/layout/template.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -5,23 +5,19 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a="http://richfaces.org/a4j"
xmlns:s="http://jboss.com/products/seam/taglib">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@projectName@</title>
+ <link rel="shortcut icon" href="favicon.ico"/>
+ <a:loadStyle src="resource:///org/jboss/seam/ui/richfaces/styles.xcss"/>
+ <a:loadStyle src="/stylesheet/theme.css"/>
+ <ui:remove><!-- Disable the a:loadStyle tags and enable the link tag to use plain setup -->
<link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
- <script type="text/javascript">
- A4J.AJAX.onError = function(req,status,message)
- {
-
- if (status == 503)
- {
- alert(message);
- }
-
- };
- </script>
+ </ui:remove>
+ <ui:insert name="head"/>
</head>
<body>
@@ -31,6 +27,9 @@
</ui:include>
<div class="body">
+ <h:messages id="messages" globalOnly="true" styleClass="message"
+ errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"
+ rendered="#{showGlobalMessages != 'false'}"/>
<ui:insert name="body"/>
</div>
Modified: trunk/seam-gen/view/list.xhtml
===================================================================
--- trunk/seam-gen/view/list.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/list.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@masterPageName@</f:facet>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -19,11 +19,9 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<h:form id="${componentName}Search" styleClass="edit">
- <rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
+ <rich:simpleTogglePanel label="${entityName} search filter" switchType="ajax">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/login.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages styleClass="message"/>
-
<h:form id="login">
<rich:panel>
@@ -34,7 +32,7 @@
</div>
<p>
- <i>Note - </i> You may login using any username/password combination.
+ <i>Note - </i> You may login with the username <em>admin</em> and a blank password.
</p>
</rich:panel>
Modified: trunk/seam-gen/view/query.xhtml
===================================================================
--- trunk/seam-gen/view/query.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/query.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -12,8 +12,6 @@
<h1>@beanName@ results</h1>
<p>Generated query page</p>
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:outputText value="No results from search"
rendered="#{empty @componentName@.resultList}"/>
<f:subview id="results" rendered="#{not empty @componentName@.resultList}">
Modified: trunk/seam-gen/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/view/stylesheet/theme.css 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/stylesheet/theme.css 2008-09-24 09:49:55 UTC (rev 9135)
@@ -1,117 +1,176 @@
+html {
+ overflow-y: scroll;
+}
+
body {
- font-size: 12px;
+ font-size: 12px;
+ margin: 0px;
}
-a:active, a:link, a:visited {
- color: #0D5798;
+a img {
+ border: none;
}
-a:hover {
- color: #8CAFCD;
-}
-input, textarea {
- border: 1px solid #BBBBBB;
- font-size: 10px;
- background: #F0F8FF;
- color: black;
+h1 {
+ font-size: 1.6em;
+ margin-top: 0;
}
input[type='submit'], input[type='button'] {
- background: #4477AA;
- color: white;
- margin: 5px;
- border-color: gray;
+ font-size: 10px;
+ margin: 5px 5px 5px 0;
+ cursor: pointer;
}
+input[type='text'], input[type='password'], textarea {
+ font-size: 11px;
+ padding-left: 1px;
+}
+
.tableControl, .actionButtons {
- width: 100%;
+ width: 100%;
}
.tableControl a {
- padding-left: 10px;
+ padding-left: 10px;
}
.tableControl {
- text-align: right;
+ text-align: right;
}
.footer {
- text-align: center;
- font-size: 10px;
+ text-align: center;
+ font-size: 11px;
+ margin-bottom: 10px;
}
.rich-table {
- width:100%;
+ width: 100%;
}
-h1 {
- font-family: Arial,sans-serif;
- color: #578BB8;
- font-size: 1.6em;
- margin-top: 0;
+.body {
+ padding: 30px;
}
-body {
- margin: 0px;
- font-family: Arial,sans-serif;
- color: #616161;
+.columnHeader:hover {
+ color: #FF6600;
}
-.body {
- padding: 30px;
+.message {
+ padding: 5px;
+ list-style: none;
+ border: 0;
+ background: none;
+ padding: 0;
+ color: #000000;
+ margin: 5px 0 8px 0;
+ font-size: 12px;
}
-.columnHeader:hover
-{
- color: #FF6600;
+.message li {
+ background: no-repeat left center;
+ padding-top: 1px;
+ padding-left: 20px;
+ margin-left: 3px;
}
-.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
+.message li.infomsg {
+ background-image: url(../img/msginfo.png);
}
+.message li.errormsg {
+ background-image: url(../img/msgerror.png);
+}
+
+.message li.warnmsg {
+ background-image: url(../img/msgwarn.png);
+}
+
.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
}
+
.value {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.error {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
+
.errors {
- color: red;
- vertical-align: middle;
+ color: red;
+ vertical-align: middle;
}
+
img.errors {
- padding-right: 5px;
+ padding-right: 5px;
}
-.errors input {
- border: 1px solid red;
+
+.errors input, .errors textarea {
+ border: 1px solid red !important;
}
-.errors textarea {
- border: 1px solid red;
-}
.required {
- color: red;
- padding-left: 2px;
+ color: red;
+ padding-left: 2px;
}
.rich-stglpanel-body {
- overflow: auto;
+ overflow: auto;
+}
+
+/* the specificity here is necessary to override the defaults */
+.rich-panel .rich-panel-header,
+.rich-stglpanel .rich-stglpanel-header {
+ padding: 2px 3px;
}
+
+
+select {
+ font-size: 12px;
+}
+
+.rich-panel input[type='submit'], .rich-panel input[type='button'],
+.rich-tabpanel input[type='submit'], .rich-tabpanel input[type='button'] {
+ margin-bottom: 0;
+}
+
+.tableControl input[type='submit'], .tableControl input[type='button'], .tableControl select {
+ margin: 5px 0 5px 5px;
+}
+
+/* I don't know why this is necessary, but the select is off by a pixel on the top and is padding too much on the left */
+.tableControl select {
+ margin-left: 2px;
+ position: relative;
+ top: 1px;
+}
+
+.actionButtons {
+ padding-left: 1px;
+}
+
+.actionButtons select {
+ margin: 5px 5px 5px 0;
+ vertical-align: bottom;
+}
+
+.rich-datalist {
+ list-style: square;
+ margin: 6px 0 1px 0;
+ padding-left: 18px;
+}
+
+.rich-list-item {
+ padding-bottom: 4px;
+}
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
16 years, 2 months
- 1
- 0
Seam SVN: r9134 - trunk/examples/nestedbooking/view.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2008-09-24 05:23:15 -0400 (Wed, 24 Sep 2008)
New Revision: 9134
Modified:
trunk/examples/nestedbooking/view/edit.xhtml
trunk/examples/nestedbooking/view/main.xhtml
trunk/examples/nestedbooking/view/password.xhtml
trunk/examples/nestedbooking/view/register.xhtml
Log:
JBSEAM-3431 Added ids for nestedbooking example.
Modified: trunk/examples/nestedbooking/view/edit.xhtml
===================================================================
--- trunk/examples/nestedbooking/view/edit.xhtml 2008-09-24 07:43:32 UTC (rev 9133)
+++ trunk/examples/nestedbooking/view/edit.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
@@ -6,16 +6,16 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<div class="entry">
- <s:label styleClass="label #{invalid?'errors':''}">
+ <s:label id="Label" styleClass="label #{invalid?'errors':''}">
<ui:insert name="label"/>
- <s:span styleClass="required" rendered="#{required}">*</s:span>
+ <s:span id="RequiredStyle" styleClass="required" rendered="#{required}">*</s:span>
</s:label>
<span class="input #{invalid?'errors':''}">
- <s:validateAll>
+ <s:validateAll id="ValidateAll">
<ui:insert/>
</s:validateAll>
</span>
- <s:message styleClass="error errors"/>
+ <s:message id="message" styleClass="error errors"/>
</div>
</ui:composition>
\ No newline at end of file
Modified: trunk/examples/nestedbooking/view/main.xhtml
===================================================================
--- trunk/examples/nestedbooking/view/main.xhtml 2008-09-24 07:43:32 UTC (rev 9133)
+++ trunk/examples/nestedbooking/view/main.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
@@ -26,7 +26,7 @@
 
<a:status>
<f:facet name="start">
- <h:graphicImage value="/img/spinner.gif"/>
+ <h:graphicImage id="SpinnerGif" value="/img/spinner.gif"/>
</f:facet>
</a:status>
<br/>
@@ -43,26 +43,26 @@
<a:outputPanel id="searchResults">
<div class="section">
- <h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
+ <h:outputText id="NoBookingsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
<h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
- <h:column>
- <f:facet name="header">Name</f:facet>
+ <h:column id="column1">
+ <f:facet id="NameFacet" name="header">Name</f:facet>
#{hot.name}
</h:column>
- <h:column>
- <f:facet name="header">Address</f:facet>
+ <h:column id="column2">
+ <f:facet id="AddressFacet" name="header">Address</f:facet>
#{hot.address}
</h:column>
- <h:column>
- <f:facet name="header">City, State</f:facet>
+ <h:column id="column3">
+ <f:facet id="CityStateFacet" name="header">City, State</f:facet>
#{hot.city}, #{hot.state}, #{hot.country}
</h:column>
- <h:column>
- <f:facet name="header">Zip</f:facet>
+ <h:column id="column4">
+ <f:facet id="ZipFacet" name="header">Zip</f:facet>
#{hot.zip}
</h:column>
- <h:column>
- <f:facet name="header">Action</f:facet>
+ <h:column id="column5">
+ <f:facet id="ActionFacet" name="header">Action</f:facet>
<s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
</h:column>
</h:dataTable>
Modified: trunk/examples/nestedbooking/view/password.xhtml
===================================================================
--- trunk/examples/nestedbooking/view/password.xhtml 2008-09-24 07:43:32 UTC (rev 9133)
+++ trunk/examples/nestedbooking/view/password.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
@@ -14,18 +14,18 @@
<h:form id="setpassword">
<fieldset>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="PasswordDecorate" template="edit.xhtml">
<ui:define name="label">Password</ui:define>
<h:inputSecret id="password" value="#{user.password}" required="true" />
</s:decorate>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="VerifyDecorate" template="edit.xhtml">
<ui:define name="label">Verify:</ui:define>
<h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/>
</s:decorate>
<div class="entry errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</div>
<div class="entry">
Modified: trunk/examples/nestedbooking/view/register.xhtml
===================================================================
--- trunk/examples/nestedbooking/view/register.xhtml 2008-09-24 07:43:32 UTC (rev 9133)
+++ trunk/examples/nestedbooking/view/register.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
@@ -40,18 +40,18 @@
</h:inputText>
</s:decorate>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="passwordDecorate" template="edit.xhtml">
<ui:define name="label">Password:</ui:define>
<h:inputSecret id="password" value="#{user.password}" required="true"/>
</s:decorate>
- <s:decorate template="edit.xhtml">
+ <s:decorate id="verifyDecorate" template="edit.xhtml">
<ui:define name="label">Verify Password:</ui:define>
<h:inputSecret id="verify" value="#{register.verify}" required="true"/>
</s:decorate>
<div class="entry errors">
- <h:messages globalOnly="true"/>
+ <h:messages id="messages" globalOnly="true"/>
</div>
<div class="entry">
16 years, 2 months
- 1
- 0