Seam SVN: r7967 - maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam.
by seam-commits@lists.jboss.org
Author: newtonm
Date: 2008-04-18 05:26:33 -0400 (Fri, 18 Apr 2008)
New Revision: 7967
Added:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl
Log:
Forgot to add new common.xsl file during the refactoring commit.
Added: 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 (rev 0)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/common.xsl 2008-04-18 09:26:33 UTC (rev 7967)
@@ -0,0 +1,35 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:param name="use.simplified.author.group" select="1"/>
+
+ <!-- XHTML settings -->
+ <xsl:param name="html.stylesheet" select="'css/seamframework.css'"/>
+
+ <xsl:param name="siteHref" select="'http://www.seamframework.org'"/>
+ <xsl:param name="docHref" select="'http://www.seamframework.org/Documentation'"/>
+ <xsl:param name="siteLinkText" select="'SeamFramework.org'"/>
+
+ <!-- XHTML and PDF -->
+ <xsl:param name="callout.graphics.path">
+ <xsl:if test="$img.src.path != ''">
+ <xsl:value-of select="$img.src.path"/>
+ </xsl:if>
+ <xsl:text>images/seamframework/docbook/callouts/</xsl:text>
+ </xsl:param>
+
+ <xsl:param name="admon.graphics.path">
+ <xsl:if test="$img.src.path != ''">
+ <xsl:value-of select="$img.src.path"/>
+ </xsl:if>
+ <xsl:text>images/seamframework/docbook/</xsl:text>
+ </xsl:param>
+
+</xsl:stylesheet>
16 years, 7 months
Seam SVN: r7966 - in maven-plugins/trunk: seam-jdocbook-style/src/main/css/css and 1 other directory.
by seam-commits@lists.jboss.org
Author: newtonm
Date: 2008-04-18 05:25:27 -0400 (Fri, 18 Apr 2008)
New Revision: 7966
Added:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/eclipse.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/pdf.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml-single.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml.xsl
maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-single.css
Removed:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-eclipse.xsl
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-nochunk.css
Log:
Renamed stylesheets/CSS and refactored contents for clarity and ease of maintenance.
Copied: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/eclipse.xsl (from rev 7965, maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-eclipse.xsl)
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/eclipse.xsl (rev 0)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/eclipse.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/eclipse.xsl"/>
+ <xsl:import href="common.xsl"/>
+
+ <xsl:param name="html.stylesheet" select="'css/seamframework-eclipse.css'"/>
+
+</xsl:stylesheet>
Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-eclipse.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-eclipse.xsl 2008-04-17 12:29:47 UTC (rev 7965)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-eclipse.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2007 Red Hat, Inc.
- License: GPL
- Author: Mark Newton <mark.newton(a)jboss.org>
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:exsl="http://exslt.org/common"
- version="1.0"
- exclude-result-prefixes="exsl">
-
- <xsl:import href="classpath:/xslt/org/jboss/main-eclipse.xsl" />
-
- <xsl:param name="use.simplified.author.group" select="1"/>
- <xsl:param name="html.stylesheet" select="'css/seamframework-eclipse.css'" />
- <xsl:param name="callout.graphics.path">images/seamframework/docbook/callouts/</xsl:param>
- <xsl:param name="callout.icon.size">17px</xsl:param>
-
-</xsl:stylesheet>
Deleted: 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-17 12:29:47 UTC (rev 7965)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -1,23 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2008 JBoss, a division of Red Hat
- License: LGPL
- 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:import href="classpath:/xslt/org/jboss/main-html.xsl" />
-
- <xsl:param name="html.stylesheet" select="'css/seamframework.css'" />
- <xsl:param name="siteHref" select="'http://www.seamframework.org'" />
- <xsl:param name="docHref" select="'http://www.seamframework.org/Documentation'" />
- <xsl:param name="siteLinkText" select="'SeamFramework.org'" />
- <xsl:param name="callout.graphics.path">images/seamframework/docbook/callouts/</xsl:param>
-
-</xsl:stylesheet>
Deleted: 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-17 12:29:47 UTC (rev 7965)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -1,85 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2007 Red Hat, Inc.
- License: LGPL
- 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:import href="classpath:/xslt/org/jboss/main-pdf.xsl" />
-
-<!-- Callouts -->
- <xsl:param name="callout.graphics.path">
- <xsl:if test="$img.src.path != ''">
- <xsl:value-of select="$img.src.path"/>
- </xsl:if>
- <xsl:text>images/seamframework/docbook/callouts/</xsl:text>
- </xsl:param>
-
-<!-- Admonitions -->
- <xsl:param name="admon.graphics.path">
- <xsl:if test="$img.src.path != ''">
- <xsl:value-of select="$img.src.path"/>
- </xsl:if>
- <xsl:text>images/seamframework/docbook/</xsl:text>
- </xsl:param>
-
- <!-- TODO: Add SVG images and then remove this as the default is .svg -->
- <xsl:param name="admon.graphics.extension" select="'.png'"/>
-
- <!-- 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="chapter.title.color">#BA5624</xsl:param>
- <xsl:param name="section.title.color">#BA5624</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>
-
- <xsl:param name="table.frame.border.thickness">0.6pt</xsl:param>
- <xsl:param name="table.cell.border.right.color">white</xsl:param>
- <xsl:param name="table.cell.border.left.color">#D3D2D1</xsl:param>
- <xsl:param name="table.frame.border.right.color">white</xsl:param>
- <xsl:param name="table.frame.border.left.color">white</xsl:param>
-
- <xsl:template name="table.cell.block.properties">
- <!-- highlight this entry? -->
- <xsl:if test="ancestor::thead or ancestor::tfoot">
- <xsl:attribute name="font-weight">bold</xsl:attribute>
- <xsl:attribute name="background-color">#EDE8DB</xsl:attribute>
- <xsl:attribute name="color">black</xsl:attribute>
- </xsl:if>
- </xsl:template>
-
- <!--
- From: fo/table.xsl
- Reason: Table Header format
- Version:1.72
- -->
- <!-- customize this template to add row properties -->
- <xsl:template name="table.row.properties">
- <xsl:variable name="bgcolor">
- <xsl:call-template name="dbfo-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbfo')" />
- <xsl:with-param name="attribute" select="'bgcolor'" />
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="$bgcolor != ''">
- <xsl:attribute name="background-color">
- <xsl:value-of select="$bgcolor" />
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="ancestor::thead or ancestor::tfoot">
- <xsl:attribute name="background-color">#EDE8DB</xsl:attribute>
- </xsl:if>
- </xsl:template>
-
-</xsl:stylesheet>
Deleted: 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-17 12:29:47 UTC (rev 7965)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -1,24 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- Copyright 2008 JBoss, a division of Red Hat
- License: LGPL
- 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:import href="classpath:/xslt/org/jboss/nochunk-html.xsl"/>
-
- <xsl:param name="html.stylesheet" select="'css/seamframework-nochunk.css'" />
- <xsl:param name="siteHref" select="'http://www.seamframework.org'" />
- <xsl:param name="docHref" select="'http://www.seamframework.org/Documentation'" />
- <xsl:param name="siteLinkText" select="'SeamFramework.org'" />
- <xsl:param name="callout.graphics.path">images/seamframework/docbook/callouts/</xsl:param>
- <xsl:param name="callout.icon.size">17px</xsl:param>
-
-</xsl:stylesheet>
Copied: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/pdf.xsl (from rev 7965, 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/pdf.xsl (rev 0)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/pdf.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -0,0 +1,68 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<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/pdf.xsl"/>
+ <xsl:import href="common.xsl"/>
+
+ <!-- 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="chapter.title.color">#BA5624</xsl:param>
+ <xsl:param name="section.title.color">#BA5624</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>
+
+ <xsl:param name="table.frame.border.thickness">0.6pt</xsl:param>
+ <xsl:param name="table.cell.border.right.color">white</xsl:param>
+ <xsl:param name="table.cell.border.left.color">#D3D2D1</xsl:param>
+ <xsl:param name="table.frame.border.right.color">white</xsl:param>
+ <xsl:param name="table.frame.border.left.color">white</xsl:param>
+
+ <xsl:template name="table.cell.block.properties">
+ <!-- highlight this entry? -->
+ <xsl:if test="ancestor::thead or ancestor::tfoot">
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="background-color">#EDE8DB</xsl:attribute>
+ <xsl:attribute name="color">black</xsl:attribute>
+ </xsl:if>
+ </xsl:template>
+
+ <!--
+ From: fo/table.xsl
+ Reason: Table Header format
+ Version:1.72
+ -->
+ <!-- customize this template to add row properties -->
+ <xsl:template name="table.row.properties">
+ <xsl:variable name="bgcolor">
+ <xsl:call-template name="dbfo-attribute">
+ <xsl:with-param name="pis" select="processing-instruction('dbfo')" />
+ <xsl:with-param name="attribute" select="'bgcolor'" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:if test="$bgcolor != ''">
+ <xsl:attribute name="background-color">
+ <xsl:value-of select="$bgcolor" />
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="ancestor::thead or ancestor::tfoot">
+ <xsl:attribute name="background-color">#EDE8DB</xsl:attribute>
+ </xsl:if>
+ </xsl:template>
+
+</xsl:stylesheet>
Copied: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml-single.xsl (from rev 7965, 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/xhtml-single.xsl (rev 0)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml-single.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -0,0 +1,17 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
+ <xsl:import href="common.xsl"/>
+
+ <xsl:param name="html.stylesheet" select="'css/seamframework-single.css'"/>
+
+</xsl:stylesheet>
Copied: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml.xsl (from rev 7965, 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/xhtml.xsl (rev 0)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/xhtml.xsl 2008-04-18 09:25:27 UTC (rev 7966)
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
+ <xsl:import href="common.xsl"/>
+
+</xsl:stylesheet>
Deleted: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css 2008-04-17 12:29:47 UTC (rev 7965)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css 2008-04-18 09:25:27 UTC (rev 7966)
@@ -1,5 +0,0 @@
-@import url("seamframework.css");
-
-.title {
- margin-top: 30px;
-}
\ No newline at end of file
Copied: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-single.css (from rev 7965, maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css)
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-single.css (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-single.css 2008-04-18 09:25:27 UTC (rev 7966)
@@ -0,0 +1,5 @@
+@import url("seamframework.css");
+
+.title {
+ margin-top: 30px;
+}
\ No newline at end of file
16 years, 7 months
Seam SVN: r7965 - in maven-plugins/trunk: seam-jdocbook-style/src/main/images/images/seamframework/docbook and 1 other directory.
by seam-commits@lists.jboss.org
Author: newtonm
Date: 2008-04-17 08:29:47 -0400 (Thu, 17 Apr 2008)
New Revision: 7965
Added:
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/caution.svg
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/important.svg
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/note.svg
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/tip.svg
maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/warning.svg
Modified:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl
Log:
Moved callout.icon.size XSL param to JBoss Community style and added Seam admonition SVGs.
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-17 09:44:58 UTC (rev 7964)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-04-17 12:29:47 UTC (rev 7965)
@@ -19,6 +19,5 @@
<xsl:param name="docHref" select="'http://www.seamframework.org/Documentation'" />
<xsl:param name="siteLinkText" select="'SeamFramework.org'" />
<xsl:param name="callout.graphics.path">images/seamframework/docbook/callouts/</xsl:param>
- <xsl:param name="callout.icon.size">17px</xsl:param>
</xsl:stylesheet>
Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/caution.svg
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/caution.svg (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/caution.svg 2008-04-17 12:29:47 UTC (rev 7965)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="39.802" height="39.772"
+ viewBox="0 0 39.802 39.772" overflow="visible" enable-background="new 0 0 39.802 39.772" xml:space="preserve">
+<linearGradient id="XMLID_34_" gradientUnits="userSpaceOnUse" x1="-77.0532" y1="-129.1733" x2="20.4764" y2="-269.2308" gradientTransform="matrix(0.7071 -0.7071 -0.7071 -0.7071 -37.4263 -129.5991)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+</linearGradient>
+<path fill="url(#XMLID_34_)" stroke="#AFADAE" stroke-width="0.75" d="M36.118,13.255c3.709,3.709,4.368,9.062,1.473,11.957
+ L25.212,37.593c-2.896,2.894-8.25,2.236-11.958-1.473l-9.602-9.604c-3.708-3.707-4.367-9.062-1.473-11.958l12.38-12.38
+ c2.896-2.896,8.25-2.234,11.957,1.474L36.118,13.255z"/>
+<g>
+
+ <linearGradient id="XMLID_35_" gradientUnits="userSpaceOnUse" x1="37.2217" y1="5.1494" x2="-0.7783" y2="37.1493" gradientTransform="matrix(1 0 0 -1 0 39.4482)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4831" style="stop-color:#BC6F29"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path fill="url(#XMLID_35_)" d="M11.685,26.943c0-0.545,0.128-0.992,0.384-1.345l2.688-3.407H11.35
+ c-0.673,0-1.169-0.279-1.488-0.84c-0.32-0.561-0.479-1.113-0.479-1.656c0-0.191,0.039-0.416,0.119-0.672s0.192-0.504,0.336-0.744
+ c0.145-0.239,0.312-0.438,0.504-0.6c0.192-0.16,0.4-0.24,0.625-0.24h3.791c-0.16-0.479-0.416-0.896-0.768-1.248
+ c-0.352-0.353-0.696-0.705-1.032-1.057c-0.336-0.353-0.632-0.72-0.888-1.104c-0.256-0.385-0.384-0.832-0.384-1.344
+ c0-0.672,0.208-1.225,0.624-1.656c0.416-0.431,0.96-0.647,1.632-0.647c0.544,0,0.952,0.063,1.224,0.19
+ c0.271,0.129,0.584,0.4,0.937,0.816c0.128,0.16,0.368,0.457,0.72,0.889c0.352,0.433,0.729,0.889,1.128,1.367
+ c0.399,0.48,0.784,0.938,1.151,1.368c0.369,0.433,0.633,0.728,0.793,0.888h0.048h0.097l0.239-0.239l3.792-4.513
+ c0.288-0.318,0.656-0.56,1.104-0.72c0.031-0.032,0.145-0.048,0.336-0.048h0.385c0.703,0,1.271,0.2,1.703,0.6
+ c0.433,0.4,0.648,0.969,0.648,1.705c0,0.287-0.009,0.527-0.023,0.719c-0.018,0.193-0.137,0.416-0.36,0.672l-2.688,3.361h3.793
+ c0.224,0,0.439,0.088,0.648,0.264c0.207,0.177,0.391,0.385,0.551,0.624c0.16,0.24,0.289,0.505,0.385,0.792
+ c0.097,0.288,0.145,0.527,0.145,0.721c0,0.479-0.191,0.992-0.576,1.536c-0.384,0.544-0.848,0.815-1.392,0.815h-3.456l0.145,0.336
+ c0.256,0.32,0.553,0.647,0.889,0.983s0.646,0.681,0.936,1.032c0.289,0.351,0.527,0.729,0.721,1.128
+ c0.191,0.399,0.287,0.823,0.287,1.271c0,0.672-0.207,1.225-0.623,1.655c-0.416,0.433-0.977,0.646-1.681,0.646
+ c-0.479,0-0.872-0.088-1.177-0.264c-0.303-0.176-0.615-0.455-0.936-0.84c-0.16-0.16-0.424-0.455-0.793-0.888
+ c-0.367-0.433-0.752-0.889-1.15-1.368c-0.4-0.479-0.777-0.937-1.129-1.367c-0.352-0.433-0.592-0.729-0.719-0.889
+ c-0.064,0.031-0.152,0.104-0.265,0.216c-0.113,0.112-0.185,0.2-0.216,0.265c-0.16,0.16-0.424,0.455-0.793,0.889
+ c-0.367,0.433-0.752,0.888-1.151,1.367c-0.4,0.48-0.776,0.937-1.128,1.367c-0.352,0.434-0.592,0.729-0.721,0.89
+ c-0.512,0.416-1.088,0.622-1.727,0.622c-0.673,0-1.232-0.223-1.681-0.672C11.908,28.127,11.685,27.583,11.685,26.943z"/>
+</g>
+<linearGradient id="XMLID_36_" gradientUnits="userSpaceOnUse" x1="20.4722" y1="28.5327" x2="67.0424" y2="-79.2686" gradientTransform="matrix(1 0 0 -1 0 39.4482)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D6D8D8"/>
+</linearGradient>
+<path opacity="0.37" fill="url(#XMLID_36_)" enable-background="new " d="M31.552,8.386l5.334,5.167c0,0,5.832,5.834,1,12
+ l-13,12.666c0,0-2.666,2.834-8.333,0.667C16.552,38.886,16.22,22.886,31.552,8.386z"/>
+</svg>
Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/important.svg
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/important.svg (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/important.svg 2008-04-17 12:29:47 UTC (rev 7965)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33.348" height="33.322"
+ viewBox="0 0 33.348 33.322" overflow="visible" enable-background="new 0 0 33.348 33.322" xml:space="preserve">
+<g id="important">
+
+ <linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="4.6685" y1="-716.4585" x2="102.1993" y2="-856.5178" gradientTransform="matrix(1 0 0 -1 0 -716.8516)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+ </linearGradient>
+ <path fill="url(#XMLID_4_)" stroke="#AFADAF" stroke-width="0.75" d="M32.71,23.451c0,5.245-3.317,9.496-7.412,9.496H7.789
+ c-4.093,0-7.414-4.251-7.414-9.496V9.872c0-5.243,3.321-9.497,7.414-9.497h17.509c4.095,0,7.412,4.254,7.412,9.497V23.451z"/>
+
+ <linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="38.2446" y1="-748.2598" x2="-6.2642" y2="-712.8549" gradientTransform="matrix(1 0 0 -1 0 -716.8516)">
+ <stop offset="0" style="stop-color:#B5C0C3"/>
+ <stop offset="0.8652" style="stop-color:#87969B"/>
+ </linearGradient>
+ <polygon fill="url(#XMLID_5_)" points="16.541,9.463 25.005,4.013 23.389,13.439 30.236,20.112 20.773,21.487 16.541,30.064
+ 12.309,21.487 2.846,20.112 9.693,13.439 8.077,5.014 "/>
+</g>
+<linearGradient id="XMLID_6_" gradientUnits="userSpaceOnUse" x1="16.0688" y1="-724.5874" x2="63.2826" y2="-833.8784" gradientTransform="matrix(1 0 0 -1 0 -716.8516)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D6D8D8"/>
+</linearGradient>
+<path opacity="0.25" fill="url(#XMLID_6_)" enable-background="new " d="M10.043,33.161l16-0.25c0,0,5.5,0.25,6.75-8
+ s0-16.5,0-16.5s-0.25-3.5-2-4.75C30.792,3.661,13.543,13.661,10.043,33.161z"/>
+</svg>
Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/note.svg
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/note.svg (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/note.svg 2008-04-17 12:29:47 UTC (rev 7965)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33.135" height="39.158"
+ viewBox="0 0 33.135 39.158" overflow="visible" enable-background="new 0 0 33.135 39.158" xml:space="preserve">
+<g id="white-log">
+ <g>
+
+ <linearGradient id="XMLID_6_" gradientUnits="userSpaceOnUse" x1="2.04" y1="-712.271" x2="90.0864" y2="-838.71" gradientTransform="matrix(1 0 0 -1 0 -710.8633)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+ </linearGradient>
+ <path fill="url(#XMLID_6_)" stroke="#AFADAF" stroke-width="0.75" d="M25.563,27.947c0,0-3.404,5.787,1.361,10.552
+ c0,0-8.85-2.042-9.871-10.891L25.563,27.947z"/>
+
+ <linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="5.8193" y1="-709.6255" x2="93.8927" y2="-836.1031" gradientTransform="matrix(1 0 0 -1 0 -710.8633)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+ </linearGradient>
+ <path fill="url(#XMLID_7_)" stroke="#AFADAF" stroke-width="0.75" d="M32.711,19.909c0,4.439-3.318,8.038-7.414,8.038H7.789
+ c-4.092,0-7.414-3.599-7.414-8.038V8.414c0-4.438,3.321-8.039,7.414-8.039h17.508c4.096,0,7.414,3.604,7.414,8.039V19.909
+ L32.711,19.909z"/>
+ </g>
+
+ <linearGradient id="XMLID_8_" gradientUnits="userSpaceOnUse" x1="2.5029" y1="-711.9365" x2="90.5785" y2="-838.4175" gradientTransform="matrix(1 0 0 -1 0 -710.8633)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+ </linearGradient>
+ <rect x="17.649" y="26.982" fill="url(#XMLID_8_)" width="6.979" height="1.703"/>
+ <g enable-background="new ">
+ <path fill="#BCBCBC" d="M12.44,23.624v-0.828c0.843-0.061,1.325-0.125,1.446-0.194c0.119-0.07,0.195-0.203,0.226-0.398
+ c0.073-0.412,0.109-1.475,0.109-3.184c0-2.351-0.031-3.687-0.095-4.009c-0.029-0.146-0.078-0.243-0.146-0.293
+ c-0.15-0.096-0.664-0.146-1.54-0.153v-0.859c1.135-0.117,1.991-0.242,2.569-0.375c0.578-0.134,1.211-0.336,1.894-0.609
+ l0.271,0.146c-0.094,1.168-0.141,2.266-0.141,3.291v3.82c0,1.303,0.028,2.069,0.09,2.312c0.028,0.135,0.088,0.227,0.178,0.271
+ c0.201,0.098,0.691,0.159,1.468,0.188v0.875c-1.065-0.031-2.224-0.047-3.476-0.047C14.217,23.577,13.265,23.593,12.44,23.624z
+ M15.543,7.358c0.478,0,0.881,0.169,1.213,0.506c0.332,0.338,0.498,0.742,0.498,1.215c0,0.48-0.166,0.889-0.498,1.229
+ c-0.333,0.338-0.735,0.507-1.213,0.507c-0.471,0-0.873-0.169-1.209-0.507C14,9.968,13.832,9.563,13.832,9.079
+ c0-0.473,0.166-0.877,0.496-1.215C14.66,7.526,15.064,7.358,15.543,7.358z"/>
+ </g>
+ <g enable-background="new ">
+
+ <linearGradient id="XMLID_9_" gradientUnits="userSpaceOnUse" x1="24.563" y1="1511.4541" x2="16.1616" y2="1515.0824" gradientTransform="matrix(1 0 0 1 0 -1499.7266)">
+ <stop offset="0" style="stop-color:#949FAE"/>
+ <stop offset="1" style="stop-color:#182028"/>
+ </linearGradient>
+ <path fill="url(#XMLID_9_)" stroke="#412816" d="M13.969,22.48v-0.828c0.843-0.062,1.324-0.125,1.445-0.197
+ c0.121-0.07,0.195-0.205,0.227-0.396c0.072-0.412,0.109-1.478,0.109-3.187c0-2.349-0.031-3.684-0.095-4.006
+ c-0.03-0.15-0.079-0.246-0.147-0.293c-0.149-0.097-0.664-0.148-1.539-0.156v-0.857c1.135-0.118,1.99-0.243,2.57-0.377
+ c0.577-0.136,1.209-0.334,1.893-0.607l0.271,0.146c-0.096,1.169-0.143,2.267-0.143,3.29v3.818c0,1.303,0.027,2.074,0.09,2.314
+ c0.029,0.135,0.088,0.225,0.18,0.27c0.199,0.098,0.689,0.162,1.467,0.191v0.875c-1.064-0.031-2.223-0.049-3.476-0.049
+ C15.744,22.433,14.793,22.446,13.969,22.48z M17.069,6.212c0.479,0,0.883,0.17,1.213,0.506c0.334,0.341,0.499,0.742,0.499,1.219
+ c0,0.479-0.165,0.889-0.499,1.228C17.952,9.5,17.547,9.67,17.069,9.67c-0.47,0-0.872-0.17-1.208-0.506
+ c-0.335-0.339-0.503-0.746-0.503-1.228c0-0.477,0.166-0.878,0.497-1.219C16.188,6.382,16.592,6.212,17.069,6.212z"/>
+ </g>
+</g>
+<linearGradient id="XMLID_10_" gradientUnits="userSpaceOnUse" x1="15.9683" y1="-716.814" x2="76.5372" y2="-857.0197" gradientTransform="matrix(1 0 0 -1 0 -710.8633)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D6D8D8"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#XMLID_10_)" enable-background="new " d="M30.801,2.48c0,0,2.334,2.5,2,5.167l0.334,12.833
+ c0,0-0.334,7.166-7.668,8c0,0-2.666,6.334,2.5,10.667c0,0-9.832-1.833-11.332-10.833H8.802C8.802,28.314,13.803,10.647,30.801,2.48z
+ "/>
+</svg>
Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/tip.svg
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/tip.svg (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/tip.svg 2008-04-17 12:29:47 UTC (rev 7965)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33.611" height="33.438"
+ viewBox="0 0 33.611 33.438" overflow="visible" enable-background="new 0 0 33.611 33.438" xml:space="preserve">
+<g id="tip">
+
+ <linearGradient id="XMLID_23_" gradientUnits="userSpaceOnUse" x1="4.6677" y1="759.4817" x2="102.1961" y2="899.5373" gradientTransform="matrix(1 0 0 1 0 -759.874)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#969897"/>
+ </linearGradient>
+ <path fill="url(#XMLID_23_)" stroke="#AFADAE" stroke-width="0.75" d="M32.711,23.452c0,5.243-3.317,9.495-7.413,9.495H7.789
+ c-4.093,0-7.414-4.252-7.414-9.495V9.872c0-5.243,3.321-9.497,7.414-9.497h17.509c4.096,0,7.413,4.254,7.413,9.497V23.452z"/>
+ <g>
+ <polygon fill="#020202" stroke="#9E9D9E" stroke-width="0.4664" points="16.321,31.053 17.786,31.053 19.819,29.019
+ 19.819,24.577 16.321,24.577 12.823,24.577 12.823,29.019 14.856,31.053 "/>
+ <path fill="#FFFFFF" d="M16.448,2.201c4.802,0,8.571,3.895,8.571,8.696c0,0.739-0.26,1.839-0.757,2.806
+ c-0.55,1.068-1.513,2.49-2.521,5.391s-1.008,3.779-1.008,3.779s0.028,1.263-0.568,1.263c-2.016,0-3.717,0-3.717,0s-1.703,0-3.72,0
+ c-0.6,0-0.567-1.263-0.567-1.263s0-0.881-1.009-3.779c-1.007-2.899-1.872-4.328-2.49-5.359c-0.662-1.101-0.789-2.097-0.789-2.836
+ C7.875,6.095,11.643,2.201,16.448,2.201z"/>
+ <g>
+
+ <image opacity="0.29" enable-background="new " width="50" height="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAABDDAAAQwwHmNsGNAAAA
+BGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAARBSURB
+VHja3JoNbtswDIUtW06adMUusN3/YNsN1jaJf6TWgwi8vpGyFCcYkACElZ86/PpIiZTSNg/yaB8F
+xN/jpn9+/8y+//Lj182/093Rceve8R5g7obOu8L7x9zza6HcRgC3Ms6BxNxrtUDuCginOLs2Rodj
+wfjvtQbGbYAoNQ2kxKpgXCUAQ7Rgy/OOXrdAQrrOMA4wrgZyhfmASrTkbAfXjuBa+LtIDocEMsM4
+ENgXoByMuwKiJQhvXFkVBJnBpmQzgYUaGF8Yes4AWKxXTN7TQMT5MdkyHmDs0mfkEXJrUFYRUoPz
+gQF2n7ZPV7GelGlADYQYkl1gPJJKHGqqKr5SjQ7U6BPAYk/J9gTVgSoSKgxwpnzSpupAyq6DKAse
+KoIQosQh2THBHABGVBEHJgBZAE4EG0k9gXH4/uIjq+IzalhhJRBPyflnsgPA9AoIQryRctp6EwhG
+VaUk2TVFdhBShwTwLdlzAtyDkw7y45IgelIiKDOZ/ANRmXjNrNUQRGeockwQL+l6TIA7+A7Jjwso
+5WgSEMV6JeFdcT9ilCGtkR9PkBsC8T1dnyG8GOQMYdcqs9kAs5oHZQKG16evX1Z7Xzgt54D2AHSE
+MJPwwtAS5zDUJGesqbuoi63JEWcshjslZw6kiCxyXskXBvA0k+WK0OpW1wozVmZPQHtyfkj3EyVw
+3UEluMRxWxRxSn+xVnt5sp4UCfR+p1TQue9rrJkrBxJztY2hlgaHU6zmdOl/PeZW9pJEisYCxc+D
+Ah8L7mlVukHrS2r3tXLtqFaKWxaM/iP3+bkWoibZo+HURDaSeQibWfnMpFgwVKpO9mgUcMFwBqvY
+M4wxyeV6gc/gGEv4gVb0kOnp9dBS6nwtlmdahS9kJwKTApFBz/TaABBTJsRUX31houNmgQaCDsua
+IKqOsI4sn31PdlJgtKaqKMR84XSnQTDIifoQB+uGhNYAEAijdYizokp5jiySLQUZzOsBnEKQi9Kn
+c8nOuTIm51+Xui9d3wDqUhBesbbVtUJsMkKrhw0HUVCrfkUNhDgbisQts1Zj7M3OsBKPVBPhqjxT
+Rav1I9IdviZDRXKhVZcjKbwsRTC8OjIH0IPSIWK//p5gTqDImJl6my37WtFYFGeoYFulZR2pZ9f6
+D5kgTjB1j7ncuCq0ClVpk2OOQlBCSJsArEV0dbbKbZn6wkRnVRpjKxT/472xQYe7iwMl+QhlSqxJ
+9trd+NxmnVe2TK2dxilTd6mlydpufM30yzvqVlE5Ke0q7uNaG9hX5UbVQU/mkKc1jhfald14Pkaw
+jhSKD3tqjqe1DbJATrbJKewWrQkjbGjMNh+95Xp3p+x88HfEgo6zKT3cucWprnYU16xANEa3qe0P
+xLue6q7A5I6rc9N5sxXiapAMUM09//nhwJZfQNzkJxzKuUqzElpNyWr9X0AKwe7yg5qHejzM77U+
+BBgAO2cOSWi+veEAAAAASUVORK5CYII=" transform="matrix(0.6461 0 0 0.6487 0.3748 0.3752)">
+ </image>
+ <g>
+
+ <radialGradient id="XMLID_24_" cx="16.1804" cy="770.6858" r="10.4068" gradientTransform="matrix(1 0 0 1 0 -759.874)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F5EB15"/>
+ <stop offset="0.0224" style="stop-color:#F6EC38"/>
+ <stop offset="0.0874" style="stop-color:#F7EF6F"/>
+ <stop offset="0.1581" style="stop-color:#F8F294"/>
+ <stop offset="0.233" style="stop-color:#FBF5B1"/>
+ <stop offset="0.3132" style="stop-color:#FCF8C8"/>
+ <stop offset="0.4001" style="stop-color:#FBFADB"/>
+ <stop offset="0.4966" style="stop-color:#FDFCEB"/>
+ <stop offset="0.6077" style="stop-color:#FEFDF5"/>
+ <stop offset="0.7465" style="stop-color:#FFFFFC"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </radialGradient>
+ <path fill="url(#XMLID_24_)" d="M16.448,2.201c4.802,0,8.571,3.895,8.571,8.696c0,0.739-0.26,1.839-0.757,2.806
+ c-0.55,1.068-1.513,2.49-2.521,5.391s-1.008,3.779-1.008,3.779s0.028,1.263-0.568,1.263c-2.016,0-3.717,0-3.717,0
+ s-1.703,0-3.72,0c-0.6,0-0.567-1.263-0.567-1.263s0-0.881-1.009-3.779c-1.007-2.899-1.872-4.328-2.49-5.359
+ c-0.662-1.101-0.789-2.097-0.789-2.836C7.875,6.095,11.643,2.201,16.448,2.201z"/>
+ </g>
+ </g>
+ <g>
+ <path fill="#020202" d="M15.471,31.053c0,0.261,0.212,0.473,0.472,0.473h0.758c0.261,0,0.472-0.212,0.472-0.473l0,0
+ c0-0.262-0.211-0.475-0.472-0.475h-0.758C15.681,30.581,15.471,30.792,15.471,31.053L15.471,31.053z"/>
+ <g>
+
+ <radialGradient id="XMLID_25_" cx="16.321" cy="-728.4543" r="2.4816" gradientTransform="matrix(1 0 0 -1 0 -701.562)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#E7E6E7"/>
+ </radialGradient>
+ <rect x="12.823" y="26.609" fill="url(#XMLID_25_)" width="6.996" height="0.567"/>
+
+ <radialGradient id="XMLID_26_" cx="16.321" cy="-730.1555" r="2.4815" gradientTransform="matrix(1 0 0 -1 0 -701.562)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#E7E6E7"/>
+ </radialGradient>
+ <rect x="12.823" y="28.312" fill="url(#XMLID_26_)" width="6.996" height="0.563"/>
+
+ <radialGradient id="XMLID_27_" cx="16.321" cy="-729.3064" r="2.4817" gradientTransform="matrix(1 0 0 -1 0 -701.562)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#E7E6E7"/>
+ </radialGradient>
+ <rect x="12.823" y="27.459" fill="url(#XMLID_27_)" width="6.996" height="0.565"/>
+ <polygon fill="#6F6D6C" points="14.856,31.053 16.321,31.053 17.786,31.053 19.677,29.163 12.965,29.163 "/>
+
+ <radialGradient id="XMLID_28_" cx="16.321" cy="-727.6023" r="2.4815" gradientTransform="matrix(1 0 0 -1 0 -701.562)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#E7E6E7"/>
+ </radialGradient>
+ <rect x="12.823" y="25.758" fill="url(#XMLID_28_)" width="6.996" height="0.564"/>
+
+ <radialGradient id="XMLID_29_" cx="16.321" cy="-726.5876" r="2.4937" gradientTransform="matrix(1 0 0 -1 0 -701.562)" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#E7E6E7"/>
+ </radialGradient>
+ <polygon fill="url(#XMLID_29_)" points="19.819,24.577 16.321,24.577 12.823,24.577 12.823,25.474 19.819,25.474 "/>
+ </g>
+ </g>
+ <polyline fill="none" stroke="#676767" stroke-width="0.4664" stroke-linecap="round" points="15.092,23.063 14.808,16.493
+ 12.775,11.339 12.775,10.394 "/>
+ <polyline fill="none" stroke="#676767" stroke-width="0.4664" stroke-linecap="round" points="17.93,23.063 18.211,16.493
+ 20.245,11.339 20.245,10.394 "/>
+ <path fill="none" stroke="#E3A833" stroke-width="0.4664" stroke-linecap="round" d="M13.437,10.63c0,0,2.315,1.655,6.239,0.095"
+ />
+ </g>
+</g>
+<linearGradient id="XMLID_30_" gradientUnits="userSpaceOnUse" x1="16.3303" y1="767.885" x2="63.5468" y2="877.1823" gradientTransform="matrix(1 0 0 1 0 -759.874)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D6D8D8"/>
+</linearGradient>
+<path opacity="0.25" fill="url(#XMLID_30_)" enable-background="new " d="M10.305,33.438l16-0.25c0,0,5.5,0.25,6.75-8
+ s0-16.5,0-16.5s-0.25-3.5-2-4.75C31.055,3.938,13.805,13.938,10.305,33.438z"/>
+</svg>
Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/warning.svg
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/warning.svg (rev 0)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamframework/docbook/warning.svg 2008-04-17 12:29:47 UTC (rev 7965)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="34.804" height="30.276"
+ viewBox="0 0 34.804 30.276" overflow="visible" enable-background="new 0 0 34.804 30.276" xml:space="preserve">
+<g>
+ <polygon fill="#FFFFFF" stroke="#AFADAF" stroke-linejoin="round" points="0.5,29.776 17.398,0.5 34.304,29.776 "/>
+ <polygon fill="none" stroke="#FFFFFF" stroke-width="1.4677" stroke-linejoin="round" points="2.862,28.402 17.415,3.198
+ 31.966,28.402 "/>
+
+ <linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="-7.4136" y1="-714.397" x2="47.5844" y2="-748.3956" gradientTransform="matrix(1 0 0 -1 0 -709.4482)">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4831" style="stop-color:#B76C29"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <polygon fill="url(#XMLID_2_)" points="2.862,28.402 17.415,3.198 31.966,28.402 "/>
+ <g>
+ <path fill="#FFFFFF" d="M17.468,24.36c0.475,0,0.875,0.16,1.204,0.479c0.329,0.319,0.493,0.719,0.493,1.191
+ c0,0.457-0.177,0.858-0.521,1.205c-0.348,0.348-0.75,0.521-1.205,0.521c-0.457,0-0.854-0.17-1.188-0.508
+ c-0.336-0.34-0.51-0.733-0.51-1.19c0-0.493,0.164-0.899,0.493-1.22C16.563,24.52,16.974,24.36,17.468,24.36z M16.054,8.668
+ c0-0.398,0.131-0.736,0.395-1.013c0.265-0.272,0.596-0.411,0.992-0.411c0.416,0,0.756,0.139,1.021,0.411
+ c0.262,0.273,0.395,0.62,0.395,1.04v11.635c0,0.401-0.137,0.734-0.408,1c-0.271,0.267-0.604,0.396-1.006,0.396
+ c-0.396,0-0.729-0.139-0.992-0.411c-0.264-0.274-0.395-0.61-0.395-1.013L16.054,8.668L16.054,8.668z"/>
+ </g>
+</g>
+</svg>
16 years, 7 months
Seam SVN: r7964 - tags.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-04-17 05:44:58 -0400 (Thu, 17 Apr 2008)
New Revision: 7964
Added:
tags/Seam_EAP_4_3_CP03_RC1/
Log:
creating tag for EAP 4.2 CP03 and EAP 4.3 CP01 after reparation - RC1
Copied: tags/Seam_EAP_4_3_CP03_RC1 (from rev 7963, branches/Seam_1_2_1_AP)
16 years, 7 months
Seam SVN: r7963 - branches/Seam_1_2_1_AP/examples/itext/view.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-04-17 05:34:06 -0400 (Thu, 17 Apr 2008)
New Revision: 7963
Modified:
branches/Seam_1_2_1_AP/examples/itext/view/anchor.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/images.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/lists.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/pages.xhtml
Log:
JBPAPP-738 work around
Modified: branches/Seam_1_2_1_AP/examples/itext/view/anchor.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/anchor.xhtml 2008-04-17 05:10:32 UTC (rev 7962)
+++ branches/Seam_1_2_1_AP/examples/itext/view/anchor.xhtml 2008-04-17 09:34:06 UTC (rev 7963)
@@ -1,6 +1,9 @@
-<p:document xmlns:ui="http://java.sun.com/jsf/facelets"
+<p:document xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://jboss.com/products/seam/pdf">
+ <f:view contentType="text/html"/>
+
<p:image alignment="right" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph>Ten Good Reasons To Use Seam</p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/images.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/images.xhtml 2008-04-17 05:10:32 UTC (rev 7962)
+++ branches/Seam_1_2_1_AP/examples/itext/view/images.xhtml 2008-04-17 09:34:06 UTC (rev 7963)
@@ -1,4 +1,8 @@
-<p:document xmlns:p="http://jboss.com/products/seam/pdf">
+<p:document xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:p="http://jboss.com/products/seam/pdf">
+
+ <f:view contentType="text/html"/>
+
<p:image alignment="right" wrap="true" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingAfter="50">Dynamic Image</p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/lists.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/lists.xhtml 2008-04-17 05:10:32 UTC (rev 7962)
+++ branches/Seam_1_2_1_AP/examples/itext/view/lists.xhtml 2008-04-17 09:34:06 UTC (rev 7963)
@@ -1,6 +1,9 @@
-<p:document xmlns:ui="http://java.sun.com/jsf/facelets"
+<p:document xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:p="http://jboss.com/products/seam/pdf">
+
+ <f:view contentType="text/html"/>
<p:image alignment="right" wrap="true" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingAfter="50">List examples</p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/pages.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/pages.xhtml 2008-04-17 05:10:32 UTC (rev 7962)
+++ branches/Seam_1_2_1_AP/examples/itext/view/pages.xhtml 2008-04-17 09:34:06 UTC (rev 7963)
@@ -1,7 +1,10 @@
-<p:document xmlns:ui="http://java.sun.com/jsf/facelets"
+<p:document xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:p="http://jboss.com/products/seam/pdf">
-
+
+ <f:view contentType="text/html"/>
+
<ui:repeat value="#{lists.numbers}" var="number">
<p:newPage />
<p:image alignment="right" resource="/jboss.jpg" />
16 years, 7 months
Seam SVN: r7962 - in trunk/src: test/integration/src/org/jboss/seam/test/integration and 1 other directory.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-17 01:10:32 -0400 (Thu, 17 Apr 2008)
New Revision: 7962
Added:
trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
trunk/src/test/integration/src/org/jboss/seam/test/integration/NamespaceResolverTest.java
Modified:
trunk/src/main/org/jboss/seam/init/Initialization.java
trunk/src/main/org/jboss/seam/init/NamespaceDescriptor.java
trunk/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
Log:
JBSEAM-2775
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-04-17 04:30:44 UTC (rev 7961)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-04-17 05:10:32 UTC (rev 7962)
@@ -63,6 +63,7 @@
*/
public class Initialization
{
+ public static final String COMPONENT_NAMESPACE = "http://jboss.com/products/seam/components";
public static final String COMPONENT_SUFFIX = ".component";
private static final LogProvider log = Logging.getLogProvider(Initialization.class);
@@ -73,6 +74,7 @@
private Set<Class> installedComponentClasses = new HashSet<Class>();
//private Set<String> importedPackages = new HashSet<String>();
private Map<String, NamespaceDescriptor> namespaceMap = new HashMap<String, NamespaceDescriptor>();
+ private NamespacePackageResolver namespacePackageResolver = new NamespacePackageResolver();
private Map<String, EventListenerDescriptor> eventListenerDescriptors = new HashMap<String, EventListenerDescriptor>();
private Collection<String> globalImports = new ArrayList<String>();
@@ -173,117 +175,119 @@
}
}
+ private List<Element> elements(Element rootElement, String name) {
+ return rootElement.elements(name);
+ }
+
@SuppressWarnings("unchecked")
private void installComponentsFromXmlElements(Element rootElement, Properties replacements)
- throws DocumentException, ClassNotFoundException
+ throws DocumentException, ClassNotFoundException
{
- /*List<Element> importJavaElements = rootElement.elements("import-java-package");
- for (Element importElement : importJavaElements)
- {
- String pkgName = importElement.getTextTrim();
- importedPackages.add(pkgName);
- addNamespace( Package.getPackage(pkgName) );
- }*/
+ /*List<Element> importJavaElements = rootElement.elements("import-java-package");
+ for (Element importElement : importJavaElements)
+ {
+ String pkgName = importElement.getTextTrim();
+ importedPackages.add(pkgName);
+ addNamespace( Package.getPackage(pkgName) );
+ }*/
- List<Element> importElements = rootElement.elements("import");
- for (Element importElement : importElements)
- {
- globalImports.add( importElement.getTextTrim() );
- }
-
- List<Element> componentElements = rootElement.elements("component");
- for (Element component : componentElements)
- {
- installComponentFromXmlElement(component, component.attributeValue("name"), component
- .attributeValue("class"), replacements);
- }
+ for (Element importElement: elements(rootElement,"import")) {
+ globalImports.add( importElement.getTextTrim() );
+ }
- List<Element> factoryElements = rootElement.elements("factory");
- for (Element factory : factoryElements)
- {
- installFactoryFromXmlElement(factory);
- }
+ for (Element component: elements(rootElement,"component")) {
+ installComponentFromXmlElement(component,
+ component.attributeValue("name"),
+ component.attributeValue("class"),
+ replacements);
+ }
- List<Element> elements = rootElement.elements("event");
- for (Element event: elements)
- {
- installEventListenerFromXmlElement(event);
- }
-
- for (Element elem : (List<Element>) rootElement.elements())
- {
- String ns = elem.getNamespace().getURI();
- NamespaceDescriptor nsInfo = namespaceMap.get(ns);
- if (nsInfo == null )
- {
- if ( ns!=null && ns.length()>0 && !ns.equals("http://jboss.com/products/seam/components") )
- {
- log.warn("namespace declared in components.xml does not resolve to a package annotated @Namespace: " + ns);
- }
- }
- else
- {
- String name = elem.attributeValue("name");
- String elemName = toCamelCase( elem.getName(), true );
-
- String className = elem.attributeValue("class");
- if (className == null)
- {
- className = nsInfo.getPackage().getName() + '.' + elemName;
- }
-
- try
- {
- //get the class implied by the namespaced XML element name
- Class<Object> clazz = Reflections.classForName(className);
- Name nameAnnotation = clazz.getAnnotation(Name.class);
-
- //if the name attribute is not explicitly specified in the XML,
- //imply the name from the @Name annotation on the class implied
- //by the XML element name
- if (name == null && nameAnnotation!=null)
- {
- name = nameAnnotation.value();
- }
-
- //if this class already has the @Name annotation, the XML element
- //is just adding configuration to the existing component, don't
- //add another ComponentDescriptor (this is super-important to
- //allow overriding!)
- if ( nameAnnotation!=null && nameAnnotation.value().equals(name) )
- {
- Install install = clazz.getAnnotation(Install.class);
- if ( install == null || install.value() )
- {
- className = null;
- }
- }
- }
- catch (ClassNotFoundException cnfe)
- {
- //there is no class implied by the XML element name so the
- //component must be defined some other way, assume that we are
- //just adding configuration, don't add a ComponentDescriptor
- //TODO: this is problematic, it results in elements getting
- // ignored when mis-spelled or given the wrong namespace!!
- className = null;
- }
+ for (Element factory: elements(rootElement,"factory")) {
+ installFactoryFromXmlElement(factory);
+ }
- //finally, if we could not get the name from the XML name attribute,
- //or from an @Name annotation on the class, imply it
- if (name == null)
- {
- String prefix = nsInfo.getNamespace().prefix();
- String componentName = toCamelCase(elem.getName(), false);
- name = Strings.isEmpty(prefix) ?
- componentName : prefix + '.' + componentName;
- }
+ for (Element event: elements(rootElement, "event")) {
+ installEventListenerFromXmlElement(event);
+ }
- installComponentFromXmlElement(elem, name, className, replacements);
- }
- }
+ for (Element elem : (List<Element>) rootElement.elements()) {
+ String ns = elem.getNamespace().getURI();
+ NamespaceDescriptor nsInfo = resolveNamespace(ns);
+ if (nsInfo == null && !ns.equals(COMPONENT_NAMESPACE)) {
+ log.warn("namespace declared in components.xml does not resolve to a package: " + ns);
+ } else {
+ String name = elem.attributeValue("name");
+ String elemName = toCamelCase(elem.getName(), true);
+
+ String className = elem.attributeValue("class");
+ if (className == null) {
+ className = nsInfo.getPackageName() + '.' + elemName;
+ }
+
+ try {
+ //get the class implied by the namespaced XML element name
+ Class<Object> clazz = Reflections.classForName(className);
+ Name nameAnnotation = clazz.getAnnotation(Name.class);
+
+ //if the name attribute is not explicitly specified in the XML,
+ //imply the name from the @Name annotation on the class implied
+ //by the XML element name
+ if (name == null && nameAnnotation!=null) {
+ name = nameAnnotation.value();
+ }
+
+ //if this class already has the @Name annotation, the XML element
+ //is just adding configuration to the existing component, don't
+ //add another ComponentDescriptor (this is super-important to
+ //allow overriding!)
+ if (nameAnnotation!=null && nameAnnotation.value().equals(name)) {
+ Install install = clazz.getAnnotation(Install.class);
+ if (install == null || install.value()) {
+ className = null;
+ }
+ }
+ } catch (ClassNotFoundException cnfe) {
+ //there is no class implied by the XML element name so the
+ //component must be defined some other way, assume that we are
+ //just adding configuration, don't add a ComponentDescriptor
+ //TODO: this is problematic, it results in elements getting
+ // ignored when mis-spelled or given the wrong namespace!!
+ className = null;
+ }
+
+ //finally, if we could not get the name from the XML name attribute,
+ //or from an @Name annotation on the class, imply it
+ if (name == null) {
+ String prefix = nsInfo.getComponentPrefix();
+ String componentName = toCamelCase(elem.getName(), false);
+ name = Strings.isEmpty(prefix) ?
+ componentName : prefix + '.' + componentName;
+ }
+
+ installComponentFromXmlElement(elem, name, className, replacements);
+ }
+ }
}
+ private NamespaceDescriptor resolveNamespace(String namespace) {
+ if (Strings.isEmpty(namespace)) {
+ return null;
+ }
+
+ NamespaceDescriptor descriptor = namespaceMap.get(namespace);
+ if (descriptor == null) {
+ try {
+ String packageName = namespacePackageResolver.resolve(namespace);
+ descriptor = new NamespaceDescriptor(namespace, packageName);
+ namespaceMap.put(namespace, descriptor);
+ } catch (Exception e) {
+ log.warn("Could not determine java package for namespace: " + namespace, e);
+ }
+ }
+
+ return descriptor;
+ }
+
@SuppressWarnings("unchecked")
private void installEventListenerFromXmlElement(Element event)
{
@@ -792,27 +796,26 @@
private void addNamespace(Package pkg)
{
- if (pkg != null)
- {
- Namespace ns = pkg.getAnnotation(Namespace.class);
- if (ns != null)
- {
- log.info("Namespace: " + ns.value() + ", package: " + pkg.getName() + ", prefix: " + ns.prefix());
- NamespaceDescriptor old = namespaceMap.put(ns.value(), new NamespaceDescriptor(ns, pkg));
- if ( old!=null && !old.getPackage().equals(pkg) )
- {
- throw new IllegalStateException("two packages with the same @Namespace: " + ns.value());
- }
- }
- }
+ if (pkg != null) {
+ Namespace ns = pkg.getAnnotation(Namespace.class);
+ if (ns != null) {
+ log.info("Namespace: " + ns.value() + ", package: " + pkg.getName() +
+ ", prefix: " + ns.prefix());
+
+ NamespaceDescriptor old = namespaceMap.put(ns.value(),
+ new NamespaceDescriptor(ns, pkg));
+ if (old!=null && !old.getPackageName().equals(pkg.getName())) {
+ throw new IllegalStateException("two packages with the same @Namespace: " + ns.value());
+ }
+ }
+ }
}
private void addNamespaces()
{
- for ( Package pkg : standardDeploymentStrategy.getScannedNamespaces() )
- {
- addNamespace(pkg);
- }
+ for (Package pkg: standardDeploymentStrategy.getScannedNamespaces()) {
+ addNamespace(pkg);
+ }
}
private void initPropertiesFromServletContext()
Modified: trunk/src/main/org/jboss/seam/init/NamespaceDescriptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/NamespaceDescriptor.java 2008-04-17 04:30:44 UTC (rev 7961)
+++ trunk/src/main/org/jboss/seam/init/NamespaceDescriptor.java 2008-04-17 05:10:32 UTC (rev 7962)
@@ -4,28 +4,38 @@
class NamespaceDescriptor
{
- private Namespace namespace;
- private Package pkg;
+ private String namespace;
+ private String packageName;
+ private String componentPrefix;
- NamespaceDescriptor(Namespace namespace, Package pkg)
- {
- this.namespace = namespace;
- this.pkg = pkg;
- }
+ NamespaceDescriptor(Namespace namespaceAnnotation, Package pkg)
+ {
+ this.namespace = namespaceAnnotation.value();
+ this.componentPrefix = namespaceAnnotation.prefix();
+ this.packageName = pkg.getName();
+ }
+
+ NamespaceDescriptor(String namespace, String packageName) {
+ this.namespace = namespace;
+ this.packageName = packageName;
+ this.componentPrefix = "";
+ }
- public Namespace getNamespace()
- {
- return namespace;
- }
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public String getComponentPrefix() {
+ return componentPrefix;
+ }
- public Package getPackage()
- {
- return pkg;
- }
+ public String getPackageName() {
+ return packageName;
+ }
- @Override
- public String toString()
- {
- return "EventListenerDescriptor(" + namespace + ')';
- }
+ @Override
+ public String toString()
+ {
+ return "NamespaceDescriptor(" + namespace + ')';
+ }
}
\ No newline at end of file
Added: trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java (rev 0)
+++ trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2008-04-17 05:10:32 UTC (rev 7962)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package org.jboss.seam.init;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.testng.Assert;
+
+/**
+ * <p>Converts an <a href="http://www.w3.org/TR/xml-names/">XML namespace</a> to a Java package name.</p>
+ *
+ * <p>The conversion algorithm is as follows:
+ * <ul>
+ * <li>The XML namespace is parsed using <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html">
+ * java.net.URI</a></code>. Only absolute URIs are supported (i.e., a scheme must be specified).</li>
+ * <li>URIs must be <i>hierarchical</i> (i.e., the scheme must be followed by <code>//</code>) with one exception:
+ * <ul><li>If the scheme is <code>seam:</code>, the URI is considered <i>opaque</i>, and is converted to a Java
+ * package using <a href="#seam_scheme">alternate rules</a>.</li></ul></li>
+ * <li>The authority component must be <i>server-based</i> (nearly all URI schemes currently in use are server-based).
+ * <li>The host portion of the namespace is converted as described by <a
+ * href="http://java.sun.com/docs/books/jls/third_edition/html/packages.html#7.7">Section 7.7</a> of the
+ * <i>Java Language Specification, 3rd Edition</i></li>. That is, "subdomains" are reversed from left-to-right to
+ * right-to-left order. The top-level domain becomes the root Java package. </li>
+ * <li>The path, as returned by <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html#getPath()">
+ * URI.getPath()</a></code> is mapped to further Java packages such that each path element becomes another Java package
+ * appended in left-to-right order.</li>
+ * <li>A leading <code>www</code> subdomain, if specified, is ignored.</li>
+ * <li>Values returned by <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html#getUserInfo()">
+ * URI.getUserInfo()</a></code>, <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html#getPort()">
+ * URI.getPort()</a></code>, <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html#getQuery()">
+ * URI.getQuery()</a></code>, and <code><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URI.html#getFragment()">
+ * URI.getFragment()</a></code> are ignored.</li>
+ * </ul></p>
+ *
+ * <h2><a id="seam_proto" name="#seam_scheme">The <code>seam:</code> Scheme</a></h2>
+ *
+ * <p>If the scheme is <code>seam:</code>, the URI is considered <i>opaque</i>, and is converted to a Java package using
+ * these rules:
+ * <ul>
+ * <li>The <i>scheme-specific-part</i> is parsed into components using the Java package delimiter, <code>period</code> (".")</li>
+ * <li>Each component is appended, in left-to-right order, to build a complete Java package.</li>
+ * </ul>
+ * </p>
+ *
+ * <p>Characters specified in the URI which are not valid characters for Java packages result in {@link #resolve(String)}
+ * throwing <code>IllegalArgumentException</code>, with one exception: the hyphen ("-") character is converted to
+ * the valid Java package characer, the underscore ("_").</p>
+ *
+ * <h3>Valid Examples</h3>
+ *
+ * <ul>
+ * <li>seam:com.company.department.product ==> com.company.department.product</li>
+ * <li>seam:org.acme-widgets.shipping.persistence ==> org.acme_widgets.shipping.persistence</li>
+ * <li>http://www.company.com/department/product ==> com.company.department.product</li>
+ * <li>https://my-company.com/department/product ==> com.my_company.department.product</li>
+ * <li>http://ericjung:password@www.company.com:8080/foo/bar/baz#anchor?param1=3... ==> com.company.foo.bar.baz</li>
+ * </ul>
+ * <h3>Invalid Examples</h3>
+ * <ul>
+ * <li>http://cats.import.com (<code>import</code> is a java keyword)</li>
+ * <li>http://bar#foo#com</li>
+ * <li>seam:com!company!department</li>
+ * <li>com.company.department</li>
+ * <li>mailto:java-net@java.sun.com</li>
+ * <li>news:comp.lang.java</li>
+ * <li>urn:isbn:096139210x</li>
+ * </ul>
+ *
+ * @author <a href="mailto:eric DOT jung AT yahoo DOT com">Eric H. Jung</a>
+ */
+public class NamespacePackageResolver {
+ private static final String JAVA_SCHEME = "java";
+
+ private static final LogProvider log =
+ Logging.getLogProvider(NamespacePackageResolver.class);
+
+
+ /**
+ * <p>Converts an XML namespace, <code>ns</code>, to a Stringified package name according to the rules
+ * detailed in this class's javadoc.</p>
+ *
+ * <p>Characters specified in <code>ns</code> which are not valid characters
+ * for Java packages result <code>IllegalArgumentException</code> being thrown, with one exception. The
+ * hyphen ("-") character is converted to the valid Java package characer, the underscore ("_").</p>
+ *
+ * @param ns the xml namespace to convert
+ *
+ * @returns a namespace descriptor
+ */
+ public String resolve(final String ns) {
+ try {
+ return parseURI(new URI(ns));
+ } catch (Exception e) {
+ // the exact exception doesn't matter here. The caller
+ // can log if needed
+ return null;
+ }
+ }
+
+ private String parseURI(URI uri) {
+ if (!uri.isAbsolute()) {
+ throw new IllegalArgumentException(uri + " is not an absolute URI");
+ }
+
+ return uri.isOpaque() ? parseOpaqueURI(uri) : parseHierarchicalURI(uri);
+ }
+
+
+ /**
+ * java:package
+ * seam:component
+ * seam:package:prefix
+ */
+ private String parseOpaqueURI(URI uri) {
+ if (uri.getScheme().equalsIgnoreCase(JAVA_SCHEME)) {
+ return uri.getSchemeSpecificPart();
+ }
+ throw new IllegalArgumentException("Unrecognized scheme in " + uri);
+ }
+
+ private String parseHierarchicalURI(URI uri) {
+ String scheme = uri.getScheme().toLowerCase();
+ if (!scheme.equals("http") && !scheme.equals("https")) {
+ throw new IllegalArgumentException("Hierarchical URLs must use http or https scheme " + uri);
+ }
+
+ StringBuffer buf = new StringBuffer();
+
+ appendToPackageName(buf, hostnameToPackage(uri.getHost()));
+ appendToPackageName(buf, pathToPackage(uri.getPath()));
+
+ return buf.toString();
+ }
+
+ /**
+ * Convert path elements to package names in forward order
+ */
+ String pathToPackage(String path) {
+ StringBuffer buf = new StringBuffer();
+
+ if (path != null) {
+ String[] pathElements = path.split("/");
+ for (int i = 1, len = pathElements.length; i < len; i++) {
+ appendToPackageName(buf, pathElements[i]);
+ }
+ }
+
+ return buf.toString();
+ }
+
+ String hostnameToPackage(String hostname) {
+ StringBuffer result = new StringBuffer();
+
+ String[] subdomains = hostname.split("\\.");
+
+ //Iterate through the subdomains in reverse converting each to a package name.
+ for (int i = subdomains.length - 1; i >= 0; i--) {
+ String subdomain = subdomains[i];
+ if (i > 0 || !subdomain.equalsIgnoreCase("www")) {
+ appendToPackageName(result, subdomain);
+ }
+ }
+
+ return result.toString();
+ }
+
+ private void appendToPackageName(StringBuffer buf, String subdomain) {
+ if (subdomain.length()>0) {
+ subdomain = makeSafeForJava(subdomain);
+
+ if (buf.length() > 0) {
+ buf.append('.');
+ }
+
+ buf.append(subdomain);
+ }
+ }
+
+ /**
+ * Converts characters in <code>subdomain</code> which aren't java-friendly
+ * into java-friendly equivalents. Right now, we only support the conversion
+ * of hyphens ("-") to underscores ("_"). We could do other things like toLowerCase(),
+ * but there are instances of upper-case package names in widespread use even by the
+ * likes of IBM (e.g., <a href="http://publib.boulder.ibm.com/infocenter/db2luw/v8/index.jsp?topic=/com.i...">
+ * COM.ibm.db2 classnames</a>).
+ *
+ * @param subdomain
+ * @return
+ */
+ private String makeSafeForJava(String subdomain) {
+ return subdomain.replace("-", "_");
+ }
+
+}
Added: trunk/src/test/integration/src/org/jboss/seam/test/integration/NamespaceResolverTest.java
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/NamespaceResolverTest.java (rev 0)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/NamespaceResolverTest.java 2008-04-17 05:10:32 UTC (rev 7962)
@@ -0,0 +1,51 @@
+package org.jboss.seam.test.integration;
+
+import org.jboss.seam.init.NamespacePackageResolver;
+import org.jboss.seam.mock.SeamTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class NamespaceResolverTest
+ extends SeamTest
+{
+ NamespacePackageResolver resolver = new NamespacePackageResolver();
+
+ @Test
+ public void testResolver() {
+
+ test("java:foo", "foo");
+ test("java:com.company.department",
+ "com.company.department");
+ test("java:com.company.department.product",
+ "com.company.department.product");
+ test("http://www.company.com/department/product",
+ "com.company.department.product");
+ test("https://my-company.com/department/product",
+ "com.my_company.department.product");
+ test("http://ericjung:password@www.company.com:8080/foo/bar/baz#anchor?param1=3...",
+ "com.company.foo.bar.baz");
+ test("http://cats.import.com",
+ "com.import.cats");
+
+
+ //testFail("http://bar#foo#com");
+
+ testFail("java:");
+
+ // need to think about this one
+ //testFail("java:foo!bar");
+
+ testFail("mailto:java-net@java.sun.com");
+ testFail("news:comp.lang.java");
+ testFail("urn:isbn:096139210x");
+
+ }
+
+ private void test(String namespace, String packageName) {
+ Assert.assertEquals(resolver.resolve(namespace), packageName);
+ }
+
+ private void testFail(String namespace) {
+ Assert.assertNull(resolver.resolve(namespace), namespace);
+ }
+}
Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/testng.xml
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2008-04-17 04:30:44 UTC (rev 7961)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/testng.xml 2008-04-17 05:10:32 UTC (rev 7962)
@@ -8,9 +8,9 @@
<class name="org.jboss.seam.test.integration.ImportTest" />
<class name="org.jboss.seam.test.integration.NamespaceTest" />
<class name="org.jboss.seam.test.integration.JavaBeanEqualsTest"/>
+ <class name="org.jboss.seam.test.integration.NamespaceResolverTest" />
</classes>
</test>
-
<test name="Seam Integration Tests: Persistence">
<classes>
<class name="org.jboss.seam.test.integration.EntityTest"/>
16 years, 7 months
Seam SVN: r7961 - trunk/examples/dvdstore/src/com/jboss/dvd/seam.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-17 00:30:44 -0400 (Thu, 17 Apr 2008)
New Revision: 7961
Modified:
trunk/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java
Log:
clean up
Modified: trunk/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java
===================================================================
--- trunk/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java 2008-04-16 17:34:58 UTC (rev 7960)
+++ trunk/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java 2008-04-17 04:30:44 UTC (rev 7961)
@@ -106,7 +106,6 @@
@Begin(join = true)
public void selectFromRequest() {
- System.out.println("*** ID=" + id);
if (id != null) {
dvd = em.find(Product.class, id);
} else if (selectedProduct != null) {
@@ -199,7 +198,6 @@
}
public void setSelectedId(Long id) {
- System.out.println("- set id " + id);
this.id = id;
}
16 years, 7 months
Seam SVN: r7960 - trunk/src/main/org/jboss/seam/framework and 1 other directory.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-16 13:34:58 -0400 (Wed, 16 Apr 2008)
New Revision: 7960
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
trunk/src/main/org/jboss/seam/framework/PersistenceController.java
Log:
Definitely should be true by default!
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-16 15:18:09 UTC (rev 7959)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-16 17:34:58 UTC (rev 7960)
@@ -31,7 +31,7 @@
protected boolean isPersistenceContextOpen(T persistenceContext)
{
- return false;
+ return true;
}
}
Modified: trunk/src/main/org/jboss/seam/framework/PersistenceController.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-16 15:18:09 UTC (rev 7959)
+++ trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-16 17:34:58 UTC (rev 7960)
@@ -31,7 +31,7 @@
protected boolean isPersistenceContextOpen(T persistenceContext)
{
- return false;
+ return true;
}
}
16 years, 7 months
Seam SVN: r7959 - branches/Seam_1_2_1_AP/examples/dvdstore/web/admin.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-16 11:18:09 -0400 (Wed, 16 Apr 2008)
New Revision: 7959
Modified:
branches/Seam_1_2_1_AP/examples/dvdstore/web/admin/admin.xhtml
Log:
Backport r4682, JBPAPP-766
Modified: branches/Seam_1_2_1_AP/examples/dvdstore/web/admin/admin.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/dvdstore/web/admin/admin.xhtml 2008-04-15 10:44:45 UTC (rev 7958)
+++ branches/Seam_1_2_1_AP/examples/dvdstore/web/admin/admin.xhtml 2008-04-16 15:18:09 UTC (rev 7959)
@@ -65,7 +65,8 @@
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
- columnClasses="dvdtablecol">
+ columnClasses="dvdtablecol"
+ value="#{pooledTaskInstanceList}">
<h:column>
<f:facet name="header">Order Id</f:facet>
#{task.variables['orderId']}
16 years, 7 months
Seam SVN: r7958 - in branches/Seam_1_2_1_AP: examples/hibernate2 and 2 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-15 06:44:45 -0400 (Tue, 15 Apr 2008)
New Revision: 7958
Modified:
branches/Seam_1_2_1_AP/
branches/Seam_1_2_1_AP/examples/hibernate2/
branches/Seam_1_2_1_AP/examples/jpa/
branches/Seam_1_2_1_AP/src/main/org/jboss/seam/
Log:
Update ignores
Property changes on: branches/Seam_1_2_1_AP
___________________________________________________________________
Name: svn:ignore
- *.ipr
*.iws
*.iml
jboss-seam.jar
jboss-seam-ui.jar
jboss-seam-debug.jar
jboss-seam-gen.jar
jboss-seam-pdf.jar
jboss-seam-mail.jar
jboss-seam-remoting.jar
jboss-seam-ioc.jar
test-output
testng-failures.xml
report
output
build
+ *.ipr
*.iws
*.iml
jboss-seam.jar
jboss-seam-ui.jar
jboss-seam-debug.jar
jboss-seam-gen.jar
jboss-seam-pdf.jar
jboss-seam-mail.jar
jboss-seam-remoting.jar
jboss-seam-ioc.jar
test-output
testng-failures.xml
report
output
build
dist
Property changes on: branches/Seam_1_2_1_AP/examples/hibernate2
___________________________________________________________________
Name: svn:ignore
+ build
Property changes on: branches/Seam_1_2_1_AP/examples/jpa
___________________________________________________________________
Name: svn:ignore
+ build
Property changes on: branches/Seam_1_2_1_AP/src/main/org/jboss/seam
___________________________________________________________________
Name: svn:ignore
+ text
16 years, 7 months