Seam SVN: r7794 - trunk/build.
by seam-commits＠lists.jboss.org
Author: epbernard
Date: 2008-04-02 10:16:44 -0400 (Wed, 02 Apr 2008)
New Revision: 7794
Modified:
trunk/build/core.pom.xml
trunk/build/root.pom.xml
Log:
JBSEAM-2491 update to groovy 1.5.4
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-04-02 11:49:04 UTC (rev 7793)
+++ trunk/build/core.pom.xml 2008-04-02 14:16:44 UTC (rev 7794)
@@ -139,7 +139,7 @@
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<optional>true</optional>
</dependency>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-02 11:49:04 UTC (rev 7793)
+++ trunk/build/root.pom.xml 2008-04-02 14:16:44 UTC (rev 7794)
@@ -521,9 +521,9 @@
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.1-BETA-1</version>
+ <version>1.5.4</version>
<exclusions>
<!-- groovy-all imports a lot of stuff, would be better to just use specific bits -->
<exclusion>
16 years, 6 months
Seam SVN: r7793 - in trunk/src/main/org/jboss/seam: core and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-02 07:49:04 -0400 (Wed, 02 Apr 2008)
New Revision: 7793
Modified:
trunk/src/main/org/jboss/seam/contexts/BasicContext.java
trunk/src/main/org/jboss/seam/core/Events.java
Log:
Events made EVENT-scoped for improved performance
Modified: trunk/src/main/org/jboss/seam/contexts/BasicContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/BasicContext.java 2008-04-02 10:26:13 UTC (rev 7792)
+++ trunk/src/main/org/jboss/seam/contexts/BasicContext.java 2008-04-02 11:49:04 UTC (rev 7793)
@@ -7,6 +7,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.Seam;
import org.jboss.seam.core.Events;
/**
@@ -76,7 +77,11 @@
public void set(String name, Object value)
{
- if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
+ // We can't raise a preSetVariable event for Events itself because it doesn't exist yet...
+ if ( !Seam.getComponentName(Events.class).equals(name) && Events.exists() )
+ {
+ Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
+ }
map.put(name, value);
if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
}
Modified: trunk/src/main/org/jboss/seam/core/Events.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Events.java 2008-04-02 10:26:13 UTC (rev 7792)
+++ trunk/src/main/org/jboss/seam/core/Events.java 2008-04-02 11:49:04 UTC (rev 7793)
@@ -28,7 +28,7 @@
* @author Gavin King
*
*/
-(a)Scope(ScopeType.STATELESS)
+(a)Scope(ScopeType.EVENT)
@BypassInterceptors
@Name("org.jboss.seam.core.events")
@Install(precedence=BUILT_IN)
@@ -149,12 +149,12 @@
public static boolean exists()
{
- return Contexts.isApplicationContextActive() && instance()!=null;
+ return Contexts.isEventContextActive() && instance()!=null;
}
public static Events instance()
{
- return (Events) Component.getInstance(Events.class, ScopeType.STATELESS);
+ return (Events) Component.getInstance(Events.class, ScopeType.EVENT);
}
}
16 years, 6 months
Seam SVN: r7792 - trunk/seam-gen/build-scripts.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-02 06:26:13 -0400 (Wed, 02 Apr 2008)
New Revision: 7792
Modified:
trunk/seam-gen/build-scripts/build-war.xml
Log:
JBSEAM-2319
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-04-01 21:39:02 UTC (rev 7791)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-04-02 10:26:13 UTC (rev 7792)
@@ -45,7 +45,7 @@
<mkdir dir="${classes.action.dir}" />
<mkdir dir="${dist.dir}" />
<!-- if a .groovy file is in model or action, set groovy.present -->
- <available property="groovy.present" value="true" file="">
+ <available property="groovy.present" value="true" file="" searchparents="true">
<filepath>
<fileset dir="${src.action.dir}">
<include name="**/*.groovy"/>
16 years, 6 months
Seam SVN: r7791 - tags/JBoss_Seam_2_0_2_CR1.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-04-01 17:39:02 -0400 (Tue, 01 Apr 2008)
New Revision: 7791
Modified:
tags/JBoss_Seam_2_0_2_CR1/readme.txt
Log:
updated for 2.0.2.CR1
Modified: tags/JBoss_Seam_2_0_2_CR1/readme.txt
===================================================================
--- tags/JBoss_Seam_2_0_2_CR1/readme.txt 2008-04-01 20:13:43 UTC (rev 7790)
+++ tags/JBoss_Seam_2_0_2_CR1/readme.txt 2008-04-01 21:39:02 UTC (rev 7791)
@@ -1,6 +1,6 @@
JBoss Seam - Contextual Component framework for Java EE 5
=========================================================
-version 2.0.1.GA, January 2008
+version 2.0.2.CR1, April 2008
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
16 years, 6 months
Seam SVN: r7790 - tags.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-04-01 16:13:43 -0400 (Tue, 01 Apr 2008)
New Revision: 7790
Added:
tags/JBoss_Seam_2_0_2_CR1/
Log:
create JBoss_Seam_2_0_2_CR1 tag
Copied: tags/JBoss_Seam_2_0_2_CR1 (from rev 7789, branches/Seam_2_0)
16 years, 6 months
Seam SVN: r7789 - in branches/Seam_2_0: doc/Seam_Reference_Guide/en and 1 other directory.
by seam-commits＠lists.jboss.org
Author: epbernard
Date: 2008-04-01 15:51:58 -0400 (Tue, 01 Apr 2008)
New Revision: 7789
Modified:
branches/Seam_2_0/build/core.pom.xml
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en/Groovy.xml
Log:
JBSEAM-2491 Groovy 1.5.4
Modified: branches/Seam_2_0/build/core.pom.xml
===================================================================
--- branches/Seam_2_0/build/core.pom.xml 2008-04-01 17:31:16 UTC (rev 7788)
+++ branches/Seam_2_0/build/core.pom.xml 2008-04-01 19:51:58 UTC (rev 7789)
@@ -139,7 +139,7 @@
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-04-01 17:31:16 UTC (rev 7788)
+++ branches/Seam_2_0/build/root.pom.xml 2008-04-01 19:51:58 UTC (rev 7789)
@@ -455,9 +455,9 @@
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.1-BETA-1</version>
+ <version>1.5.4</version>
<exclusions>
<!-- groovy-all imports a lot of stuff, would be better to just use specific bits -->
<exclusion>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Groovy.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en/Groovy.xml 2008-04-01 17:31:16 UTC (rev 7788)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/Groovy.xml 2008-04-01 19:51:58 UTC (rev 7789)
@@ -48,7 +48,7 @@
<section>
<title>Writing Groovy components</title>
- <para>As you should have noticed by now, Seam uses annotations heavily. Be sure to use Groovy 1.1 Beta1 or
+ <para>As you should have noticed by now, Seam uses annotations heavily. Be sure to use Groovy 1.1 or
above for annotation support. Here are some example of groovy code used in a Seam application.</para>
<section>
@@ -94,13 +94,6 @@
accessed from Java as <code>hotel.getCity()</code>, the getters and setters being generated by the
Groovy compiler. This type of syntactic sugar makes the entity code very concise.</para>
- <para>Some temporary gotchas: Groovy 1.1 Beta1 does not (yet) support generics. One negative effect of
- this is that entity relationships have no built-in type information. It is necessary to use the
- targetEntity attribute of the appropriate <literal>@*ToMany</literal> annotation instead of simply
- using a generic type definition like <code>Collection<Entity></code>. For the same
- reason, you won't be able to benefit from the very useful <xref linkend="framework"/> yet. The good
- news is that support for generics is targeted for Groovy 1.1 (Groovy 1.1 Beta2 at the time of
- writing).</para>
</section>
<section>
16 years, 6 months
Seam SVN: r7788 - maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-01 13:31:16 -0400 (Tue, 01 Apr 2008)
New Revision: 7788
Modified:
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/support_doc.png
Log:
Community Documentation rather than Support Documentation
Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/support_doc.png
===================================================================
(Binary files differ)
16 years, 6 months
Seam SVN: r7787 - in maven-plugins/trunk: seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam and 1 other directories.
by seam-commits＠lists.jboss.org
Author: newtonm
Date: 2008-04-01 13:14:49 -0400 (Tue, 01 Apr 2008)
New Revision: 7787
Removed:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common-xhtml.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl
Modified:
maven-plugins/trunk/seam-docbook-xslt/pom.xml
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl
maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
Log:
Merged Seam XSL customization layer with JBoss.org style so that all projects can benefit. Merged features include: rendering of authors, editors, and others in the authorgroup. Different placement of titles around examples, figures etc. Non-graphic callout settings. New PDF title page and settings to prevent blank pages. Monospaced programlisting font and custom TOC with bold chapter titles. TOC section depth of 2 to match the HTML. In addition the authorgroup, PRE.JSP and PRE.XHTML CSS configuration was moved to JBoss.org CSS.
Modified: maven-plugins/trunk/seam-docbook-xslt/pom.xml
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-04-01 17:14:49 UTC (rev 7787)
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0-200803311754</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -71,4 +71,4 @@
</snapshotRepository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common-xhtml.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common-xhtml.xsl 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common-xhtml.xsl 2008-04-01 17:14:49 UTC (rev 7787)
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2007 Red Hat, Inc.
- License: GPL
- Author: Pete Muir
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- exclude-result-prefixes="#default">
-
- <!-- Enable extensions (needed for callouts) -->
- <xsl:param name="use.extensions">1</xsl:param>
-
- <!-- Enable callouts -->
- <xsl:param name="callout.extensions">1</xsl:param>
-
- <!-- And disable these extensions -->
- <xsl:param name="tablecolumns.extension">0</xsl:param>
- <xsl:param name="graphicsize.extension">0</xsl:param>
-
- <!-- Placement of titles (Seam specific) -->
- <xsl:param name="formal.title.placement">
- figure after example before equation before table before procedure before
- </xsl:param>
-
-
- <!-- Callouts -->
-
- <!-- Don't use graphics, use a simple number style -->
- <xsl:param name="callout.graphics">0</xsl:param>
-
- <!-- Place callout marks at this column in annotated areas -->
- <xsl:param name="callout.defaultcolumn">90</xsl:param>
-
- <xsl:template match="authorgroup" mode="titlepage.mode">
- <div class="authorgroup">
- <div class="authors">
- <xsl:call-template name="gentext.by" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="./author" />
- </xsl:call-template>
- </div>
-
- <div class="editors">
- <xsl:call-template name="gentext.editors" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="./editor" />
- </xsl:call-template>
- </div>
-
- <div class="others">
- <xsl:call-template name="gentext.others" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="./othercredit" />
- </xsl:call-template>
- </div>
- </div>
- </xsl:template>
-
-</xsl:stylesheet>
Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl 2008-04-01 17:14:49 UTC (rev 7787)
@@ -1,81 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2007 Red Hat, Inc.
- License: GPL
- Author: Pete Muir
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- exclude-result-prefixes="#default">
-
- <xsl:template name="person.name.list">
- <xsl:param name="person.list"
- select="author|corpauthor|othercredit|editor" />
- <xsl:param name="person.count" select="count($person.list)" />
- <xsl:param name="count" select="1" />
-
- <xsl:choose>
- <xsl:when test="$count > $person.count"></xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="person.name">
- <xsl:with-param name="node"
- select="$person.list[position()=$count]" />
- </xsl:call-template>
-
- <xsl:choose>
- <xsl:when
- test="$person.list[position()=$count]/affiliation/shortaffil">
- <xsl:call-template name="gentext.space" />
- <xsl:text>(</xsl:text>
- <xsl:value-of
- select="$person.list[position()=$count]/affiliation/shortaffil" />
- <xsl:text>)</xsl:text>
- </xsl:when>
- </xsl:choose>
-
-
- <xsl:choose>
- <xsl:when test="$person.count = 2 and $count = 1">
- <xsl:call-template name="gentext.template">
- <xsl:with-param name="context" select="'authorgroup'" />
- <xsl:with-param name="name" select="'sep2'" />
- </xsl:call-template>
- </xsl:when>
- <xsl:when
- test="$person.count > 2 and $count+1 = $person.count">
- <xsl:call-template name="gentext.template">
- <xsl:with-param name="context" select="'authorgroup'" />
- <xsl:with-param name="name" select="'seplast'" />
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="$count < $person.count">
- <xsl:call-template name="gentext.template">
- <xsl:with-param name="context" select="'authorgroup'" />
- <xsl:with-param name="name" select="'sep'" />
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
-
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="$person.list" />
- <xsl:with-param name="person.count" select="$person.count" />
- <xsl:with-param name="count" select="$count+1" />
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-
- <xsl:template name="gentext.editors">
- <xsl:text>edited by</xsl:text>
- </xsl:template>
-
- <xsl:template name="gentext.others">
- <xsl:text>and thanks to</xsl:text>
- </xsl:template>
-
-
-</xsl:stylesheet>
\ No newline at end of file
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-04-01 17:14:49 UTC (rev 7787)
@@ -6,18 +6,16 @@
Author: Pete Muir
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
xmlns="http://www.w3.org/TR/xhtml1/transitional"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="#default">
<xsl:import href="classpath:/xslt/org/jboss/main-html.xsl" />
- <xsl:import href="common-xhtml.xsl" />
- <xsl:import href="common.xsl" />
- <xsl:param name="html.stylesheet" select="'css/seamframework.css'" />
-
+ <xsl:param name="html.stylesheet" select="'css/seamframework.css'" />
<xsl:param name="jbossOrgHref" select="'http://www.seamframework.org'" />
<xsl:param name="commDocHref" select="'http://www.seamframework.org/Documentation'" />
-
+
</xsl:stylesheet>
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-04-01 17:14:49 UTC (rev 7787)
@@ -6,181 +6,21 @@
Author: Pete Muir
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
xmlns="http://www.w3.org/TR/xhtml1/transitional"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="#default">
<xsl:import href="classpath:/xslt/org/jboss/main-pdf.xsl" />
- <xsl:import href="common.xsl" />
- <xsl:param name="use.extensions">1</xsl:param>
-
- <!-- Place callout marks at this column in annotated areas -->
-
- <!--###################################################
- Callouts
- ################################################### -->
-
- <!-- We want to use callouts... -->
- <xsl:param name="callout.extensions">1</xsl:param>
-
- <!-- Place callout bullets at this column in programmlisting.-->
- <xsl:param name="callout.defaultcolumn">80</xsl:param>
-
- <!--
- No, don't use crappy graphics for the callout bullets. This setting
- enables some weird Unicode rendering for some fancy bullet points
- in callouts. By default, this can only count to 10 and produces
- strange results if you ever have more than 10 callouts for one
- programlisting. We will fix that next.
- -->
- <xsl:param name="callout.graphics">0</xsl:param>
-
- <!--
- Again, fun with DocBook XSL: The callout bullets are rendered in
- two places: In the programlisting itself and in the list below
- the listing, with the actual callout text. The rendering in the
- programlisting is some XSL transformer extension (e.g. a Saxon
- extension), so we can't change that without messing with the
- extensions. We only can turn it off by setting this limit to
- zero, then, a simple bracket style like "(3)" and "(4)" will
- be used in the programlisting.
- -->
- <xsl:param name="callout.unicode.number.limit" select="'0'"></xsl:param>
-
- <!--
- The callout bullets in the actual callout list will be rendered
- with an XSL FO template. The default template is broken: limited to 10
- nice looking Unicode bullet points and then it doesn't print anything,
- the fallback doesn't work. We implement our own template, which is not
- as complicated, more ugly, but works. As always, function is more
- important than form.
- -->
- <xsl:template name="callout-bug">
- <xsl:param name="conum" select='1' />
- <fo:inline color="black" padding-top="0.1em" padding-bottom="0.1em"
- padding-start="0.2em" padding-end="0.2em" baseline-shift="0.1em"
- font-family="{$monospace.font.family}" font-weight="bold"
- font-size="75%">
- <xsl:text>(</xsl:text>
- <xsl:value-of select="$conum" />
- <xsl:text>)</xsl:text>
- </fo:inline>
-
- </xsl:template>
-
- <!-- Make examples, tables etc. break across pages -->
- <xsl:attribute-set name="formal.object.properties">
- <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
- </xsl:attribute-set>
-
- <!-- Correct placement of titles for figures and examples. -->
- <xsl:param name="formal.title.placement">
- figure after example before equation before table before procedure before
- </xsl:param>
-
- <!-- Prevent blank pages in output -->
- <xsl:template name="book.titlepage.before.verso"></xsl:template>
- <xsl:template name="book.titlepage.verso"></xsl:template>
- <xsl:template name="book.titlepage.separator"></xsl:template>
-
- <!-- Use our own slightly simpler title page (just show title, version, authors) -->
- <xsl:template name="book.titlepage.recto">
- <xsl:choose>
- <xsl:when test="bookinfo/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="bookinfo/title" />
- </xsl:when>
- <xsl:when test="info/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="info/title" />
- </xsl:when>
- <xsl:when test="title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="title" />
- </xsl:when>
- </xsl:choose>
-
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="bookinfo/issuenum" />
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="info/issuenum" />
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="issuenum" />
-
- <xsl:choose>
- <xsl:when test="bookinfo/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="bookinfo/subtitle" />
- </xsl:when>
- <xsl:when test="info/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="info/subtitle" />
- </xsl:when>
- <xsl:when test="subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="subtitle" />
- </xsl:when>
- </xsl:choose>
-
- <fo:block xsl:use-attribute-sets="book.titlepage.recto.style"
- font-size="14pt" space-before="15.552pt">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
- select="bookinfo/releaseinfo" />
- </fo:block>
-
- <fo:block text-align="center" space-before="15.552pt">
- <xsl:call-template name="gentext.by" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="bookinfo/authorgroup/author" />
- </xsl:call-template>
- </fo:block>
-
- <fo:block text-align="center" space-before="15.552pt">
- <xsl:call-template name="gentext.editors" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="bookinfo/authorgroup/editor" />
- </xsl:call-template>
- </fo:block>
-
- <fo:block text-align="center" space-before="15.552pt">
- <xsl:call-template name="gentext.others" />
- <xsl:call-template name="gentext.space" />
- <xsl:call-template name="person.name.list">
- <xsl:with-param name="person.list" select="bookinfo/authorgroup/othercredit" />
- </xsl:call-template>
- </fo:block>
-
- </xsl:template>
-
- <xsl:template name="book.titlepage3.recto">
-
- </xsl:template>
-
<!-- Change the font color for titles to SeamFramework.org one -->
-
<xsl:param name="title.color">#576C74</xsl:param>
<xsl:param name="titlepage.color">#885324</xsl:param>
<xsl:param name="chaptertitle.color">#BA5624</xsl:param>
<xsl:param name="section.level1.title.color">#BA5624</xsl:param>
- <!-- Change to monospace font for programlisting, needed to workaround crappy callouts -->
- <xsl:param name="programlisting.font" select="$monospace.font.family" />
-
- <!-- Make the font for programlisting slightly smaller -->
- <xsl:param name="programlisting.font.size" select="'75%'" />
-
- <!-- Now, set enable scalefit for large images -->
- <xsl:param name="graphicsize.extension" select="'1'" />
-
- <xsl:param name="default.image.width">17.4cm</xsl:param>
-
-
<!-- Style tables to look like SeamFramework.org-->
-
<xsl:param name="table.cell.border.color">#D3D2D1</xsl:param>
<xsl:param name="table.frame.border.color">#D3D2D1</xsl:param>
<xsl:param name="table.cell.border.thickness">0.6pt</xsl:param>
@@ -223,57 +63,4 @@
</xsl:if>
</xsl:template>
-
- <!--###################################################
- Custom TOC (bold chapter titles)
- ################################################### -->
-
- <!-- Improve the TOC. -->
- <xsl:template name="toc.line">
- <xsl:variable name="id">
- <xsl:call-template name="object.id" />
- </xsl:variable>
-
- <xsl:variable name="label">
- <xsl:apply-templates select="." mode="label.markup" />
- </xsl:variable>
-
- <fo:block text-align-last="justify" end-indent="{$toc.indent.width}pt"
- last-line-end-indent="-{$toc.indent.width}pt">
- <fo:inline keep-with-next.within-line="always">
- <fo:basic-link internal-destination="{$id}">
-
- <!-- Chapter titles should be bold. -->
- <xsl:choose>
- <xsl:when test="local-name(.) = 'chapter'">
- <xsl:attribute name="font-weight">bold</xsl:attribute>
- </xsl:when>
- </xsl:choose>
-
- <xsl:if test="$label != ''">
- <xsl:copy-of select="$label" />
- <xsl:value-of select="$autotoc.label.separator" />
- </xsl:if>
- <xsl:apply-templates select="." mode="titleabbrev.markup" />
- </fo:basic-link>
- </fo:inline>
- <fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots" leader-pattern-width="3pt"
- leader-alignment="reference-area"
- keep-with-next.within-line="always" />
- <xsl:text> </xsl:text>
- <fo:basic-link internal-destination="{$id}">
- <fo:page-number-citation ref-id="{$id}" />
- </fo:basic-link>
- </fo:inline>
- </fo:block>
- </xsl:template>
-
- <!-- Include the chapter no -->
- <xsl:param name="section.label.includes.component.label" select="1" />
-
- <!-- Make the section depth in the TOC 2, same as html -->
- <xsl:param name="toc.section.depth">2</xsl:param>
-
</xsl:stylesheet>
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl 2008-04-01 17:14:49 UTC (rev 7787)
@@ -13,10 +13,9 @@
exclude-result-prefixes="#default">
<xsl:import href="classpath:/xslt/org/jboss/nochunk-html.xsl"/>
- <xsl:import href="common-xhtml.xsl" />
- <xsl:import href="common.xsl" />
<xsl:param name="html.stylesheet" select="'css/seamframework-nochunk.css'" />
<xsl:param name="jbossOrgHref" select="'http://www.seamframework.org'" />
<xsl:param name="commDocHref" select="'http://www.seamframework.org/Documentation'" />
+
</xsl:stylesheet>
Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-04-01 13:52:25 UTC (rev 7786)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-04-01 17:14:49 UTC (rev 7787)
@@ -120,15 +120,6 @@
}
/*
- Simpler author style on contents page
- */
-.authorgroup div {
- margin-left: 10px;
- margin-right: 10px;
- margin-bottom: 15px;
-}
-
-/*
Make the seam version info into a title
*/
.releaseinfo {
@@ -137,17 +128,6 @@
}
/*
- For highlighting, looks very odd or broken at the 0px jboss.org stylesheets use
- */
-PRE.JSP {
- LINE-HEIGHT: 8px
-}
-
-PRE.XHTML {
- LINE-HEIGHT: 8px
-}
-
-/*
use sfwk.org tables
*/
.table-contents th {
16 years, 6 months
Seam SVN: r7785 - trunk/ui/src/main/java/org/jboss/seam/ui/renderkit.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-01 08:39:05 -0400 (Tue, 01 Apr 2008)
New Revision: 7785
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java
Log:
Minor, get parameter name from component
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-04-01 12:21:31 UTC (rev 7784)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-04-01 12:39:05 UTC (rev 7785)
@@ -26,7 +26,7 @@
protected abstract LogProvider getLog();
- protected abstract String getParameterName();
+ protected abstract String getParameterName(UIComponent component);
@Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component)
@@ -56,13 +56,13 @@
"if (document.all)" +
"{ " + // what follows should work with NN6 but doesn't in M14"
"input.type = 'hidden';" +
- "input.name = '" + getParameterName() + "';" +
+ "input.name = '" + getParameterName(component) + "';" +
"input.value = '" + parameter.getValue() + "';" +
"}" +
"else if (document.getElementById) " +
"{" + // so here is theNN6 workaround
"input.setAttribute('type', 'hidden');" +
- "input.setAttribute('name', '" + getParameterName() + "');" +
+ "input.setAttribute('name', '" + getParameterName(component) + "');" +
"input.setAttribute('value', '" + parameter.getValue() + "');" +
"}" +
"form.appendChild(input);" +
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2008-04-01 12:21:31 UTC (rev 7784)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2008-04-01 12:39:05 UTC (rev 7785)
@@ -1,5 +1,7 @@
package org.jboss.seam.ui.renderkit;
+import javax.faces.component.UIComponent;
+
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.ui.component.UIConversationName;
@@ -12,7 +14,7 @@
{
private static LogProvider log = Logging.getLogProvider(ConversationNameRendererBase.class);
- private static final String PARAMETER_NAME = "conversationName";
+
@Override
protected LogProvider getLog()
@@ -21,9 +23,9 @@
}
@Override
- protected String getParameterName()
+ protected String getParameterName(UIComponent component)
{
- return PARAMETER_NAME;
+ return ((UIConversationName) component).getName();
}
@Override
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2008-04-01 12:21:31 UTC (rev 7784)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2008-04-01 12:39:05 UTC (rev 7785)
@@ -3,6 +3,8 @@
+import javax.faces.component.UIComponent;
+
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.ui.component.UIConversationPropagation;
@@ -13,8 +15,8 @@
*/
public class ConversationPropagationRendererBase extends CommandButtonParameterRendererBase
{
+
private static LogProvider log = Logging.getLogProvider(ConversationPropagationRendererBase.class);
- private static final String PARAMETER_NAME = "conversationPropagation";
@Override
protected Class getComponentClass()
@@ -29,8 +31,8 @@
}
@Override
- protected String getParameterName()
+ protected String getParameterName(UIComponent component)
{
- return PARAMETER_NAME;
+ return ((UIConversationPropagation) component).getName();
}
}
\ No newline at end of file
16 years, 6 months
Seam SVN: r7784 - trunk/examples/wiki/view.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-01 08:21:31 -0400 (Tue, 01 Apr 2008)
New Revision: 7784
Modified:
trunk/examples/wiki/view/message.xhtml
Log:
JBSEAM-2660
Modified: trunk/examples/wiki/view/message.xhtml
===================================================================
--- trunk/examples/wiki/view/message.xhtml 2008-04-01 01:42:12 UTC (rev 7783)
+++ trunk/examples/wiki/view/message.xhtml 2008-04-01 12:21:31 UTC (rev 7784)
@@ -37,16 +37,16 @@
<h3>Unhandled or wrapper exception:</h3>
-<pre>Top level exception : #{org.jboss.seam.exception.class.name}: #{org.jboss.seam.exception.message}
+<pre>Top level exception : #{org.jboss.seam.caughtException.class.name}: #{org.jboss.seam.caughtException.message}
=========================================================================================================================
-<ui:repeat value="#{org.jboss.seam.exception.stackTrace}" var="stackElement">
+<ui:repeat value="#{org.jboss.seam.caughtException.stackTrace}" var="stackElement">
#{stackElement}</ui:repeat>
</pre>
-<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}
+<s:fragment rendered="#{wiki:unwrap(org.jboss.seam.caughtException) != org.jboss.seam.caughtException}">
+<pre>Root cause exception: #{wiki:unwrap(org.jboss.seam.caughtException).class.name}: #{wiki:unwrap(org.jboss.seam.caughtException).message}
=========================================================================================================================
-<ui:repeat value="#{wiki:unwrap(org.jboss.seam.exception).stackTrace}" var="stackElement">
+<ui:repeat value="#{wiki:unwrap(org.jboss.seam.caughtException).stackTrace}" var="stackElement">
#{stackElement}</ui:repeat>
</pre>
</s:fragment>
16 years, 6 months