JBoss Tools SVN: r14210 - tags.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-03-13 16:01:49 -0400 (Fri, 13 Mar 2009)
New Revision: 14210
Added:
tags/jbosstools-3.0.0.GA/
Log:
tag for GA
Copied: tags/jbosstools-3.0.0.GA (from rev 14209, branches/jbosstools-3.0.x)
15 years, 6 months
JBoss Tools SVN: r14208 - in branches/jbosstools-3.0.x: birt/docs and 22 other directories.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2009-03-13 11:26:47 -0400 (Fri, 13 Mar 2009)
New Revision: 14208
Modified:
branches/jbosstools-3.0.x/as/docs/reference/pom.xml
branches/jbosstools-3.0.x/birt/docs/pom.xml
branches/jbosstools-3.0.x/documentation/guides/Exadel-migration/pom.xml
branches/jbosstools-3.0.x/documentation/guides/GettingStartedGuide/pom.xml
branches/jbosstools-3.0.x/documentation/jbds-docs/index/en/master.xml
branches/jbosstools-3.0.x/documentation/jboss-tools-docs/index/en/master.xml
branches/jbosstools-3.0.x/documentation/jboss-tools-docs/pom.xml
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl
branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl
branches/jbosstools-3.0.x/drools/docs/reference/pom.xml
branches/jbosstools-3.0.x/esb/docs/esb_ref_guide/pom.xml
branches/jbosstools-3.0.x/hibernatetools/docs/reference/pom.xml
branches/jbosstools-3.0.x/jbpm/docs/converter_ref/pom.xml
branches/jbosstools-3.0.x/jbpm/docs/reference/pom.xml
branches/jbosstools-3.0.x/jmx/docs/reference/pom.xml
branches/jbosstools-3.0.x/jsf/docs/jsf_tools_ref_guide/pom.xml
branches/jbosstools-3.0.x/jsf/docs/jsf_tools_tutorial/pom.xml
branches/jbosstools-3.0.x/jsf/docs/userguide/pom.xml
branches/jbosstools-3.0.x/portlet/docs/reference/pom.xml
branches/jbosstools-3.0.x/seam/docs/reference/pom.xml
branches/jbosstools-3.0.x/smooks/docs/reference/pom.xml
branches/jbosstools-3.0.x/struts/docs/struts_tools_ref_guide/pom.xml
branches/jbosstools-3.0.x/struts/docs/struts_tools_tutorial/pom.xml
branches/jbosstools-3.0.x/ws/docs/reference/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-640 - profiles are updated for GA docs
Modified: branches/jbosstools-3.0.x/as/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/as/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/as/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -33,12 +33,13 @@
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
</properties>
</profile>
+
<profile>
<id>diffmk</id>
<properties>
Modified: branches/jbosstools-3.0.x/birt/docs/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/birt/docs/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/birt/docs/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -29,17 +29,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/documentation/guides/Exadel-migration/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/documentation/guides/Exadel-migration/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/guides/Exadel-migration/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -33,11 +33,13 @@
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
</properties>
</profile>
+
<profile>
<id>diffmk</id>
<properties>
Modified: branches/jbosstools-3.0.x/documentation/guides/GettingStartedGuide/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/documentation/guides/GettingStartedGuide/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/guides/GettingStartedGuide/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,16 +20,18 @@
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
+
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/documentation/jbds-docs/index/en/master.xml
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbds-docs/index/en/master.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbds-docs/index/en/master.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -47,9 +47,9 @@
</indexentry>
<indexentry>
- <primaryie>jBPM Tools Reference Guide <ulink url="en/jbpm/html/index.html">(html)</ulink>
- <ulink url="en/jbpm/html_single/index.html">(html single)</ulink>
- <ulink url="en/jbpm/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
+ <primaryie>jBPM Tools Reference Guide <ulink url="en/jboss_jbpm_ref_guide/html/index.html">(html)</ulink>
+ <ulink url="en/jboss_jbpm_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jboss_jbpm_ref_guide/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
</primaryie>
</indexentry>
Modified: branches/jbosstools-3.0.x/documentation/jboss-tools-docs/index/en/master.xml
===================================================================
--- branches/jbosstools-3.0.x/documentation/jboss-tools-docs/index/en/master.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jboss-tools-docs/index/en/master.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -47,9 +47,9 @@
</indexentry>
<indexentry>
- <primaryie>jBPM Tools Reference Guide <ulink url="en/jbpm/html/index.html">(html)</ulink>
- <ulink url="en/jbpm/html_single/index.html">(html single)</ulink>
- <ulink url="en/jbpm/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
+ <primaryie>jBPM Tools Reference Guide <ulink url="en/jboss_jbpm_ref_guide/html/index.html">(html)</ulink>
+ <ulink url="en/jboss_jbpm_ref_guide/html_single/index.html">(html single)</ulink>
+ <ulink url="en/jboss_jbpm_ref_guide/pdf/JBPM_Reference_Guide.pdf">(pdf)</ulink>
</primaryie>
</indexentry>
Modified: branches/jbosstools-3.0.x/documentation/jboss-tools-docs/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/documentation/jboss-tools-docs/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jboss-tools-docs/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -11,8 +11,7 @@
<name>All_Userguides</name>
<modules>
- <module>../jbosstools-docbook-xslt</module>
- <module>../../ws/docs/reference</module>
+ <module>../jbosstools-docbook-xslt</module>
<module>../guides/Exadel-migration</module>
<module>../guides/GettingStartedGuide</module>
<module>../../as/docs/reference</module>
@@ -25,6 +24,7 @@
<module>../../struts/docs/struts_tools_ref_guide</module>
<module>../../struts/docs/struts_tools_tutorial</module>
<module>../../esb/docs/esb_ref_guide</module>
+ <module>../../ws/docs/reference</module>
<module>../../portlet/docs/reference</module>
<module>../../birt/docs</module>
<module>../../drools/docs/reference</module>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -9,9 +9,10 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0">
<!-- XHTML settings -->
-
<xsl:param name="html.stylesheet" select="'css/tools.css'"/>
+
+
<xsl:template name="head.content">
<xsl:param name="node" select="."/>
<xsl:param name="title">
@@ -58,16 +59,21 @@
<xsl:apply-templates select="." mode="head.keywords.content"/>
-
</xsl:template>
+
+
+
<!-- Overriding toc.line -->
<xsl:template name="toc.line">
<xsl:param name="toc-context" select="."/>
<xsl:param name="depth" select="1"/>
<xsl:param name="depth.from.context" select="8"/>
+ <xsl:param name="min-diff" select="10"/>
+ <xsl:param name="pos" select="position()"/>
+
<span>
<xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
@@ -90,26 +96,8 @@
<xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template>
</xsl:attribute>
-
- <xsl:choose>
- <xsl:when test="@role='new' or @role='updated'">
- <xsl:attribute name="class">
- <xsl:value-of select="@role"/>
- </xsl:attribute>
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="@revisionflag='added' or @revisionflag='changed'">
- <xsl:attribute name="class">
- <xsl:value-of select="@revisionflag"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'">
- <xsl:attribute name="class">
- <xsl:value-of select="@diffmk:change"/>
- </xsl:attribute>
- </xsl:when>
- </xsl:choose>
-
+
+
<!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
<!-- * as part of the hyperlinked title -->
<xsl:if test="not($autotoc.label.in.hyperlink = 0)">
@@ -138,70 +126,6 @@
<!-- XHTML and PDF -->
- <xsl:template match="//diffmk:wrapper">
- <xsl:choose>
- <xsl:when test="@diffmk:change='deleted'">
- <xsl:text> </xsl:text>
- </xsl:when>
- <xsl:when test="parent::node()[local-name()='title']">
- <xsl:value-of select="."/>
- </xsl:when>
- <xsl:otherwise>
- <span class="diffmkwrapper">
- <xsl:value-of select="."/>
- </span>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <!--xsl:template match="//node()[@diffmk:change]">
- <xsl:choose>
- <xsl:when test="local-name()='note' or local-name()='tip' or local-name()='important' or local-name()='warning' or local-name()='caution'">
- <xsl:call-template name="my.graphical.admonition"/>
- </xsl:when>
- <xsl:when test="local-name()='diffmk:wrapper'">
- <span class="diffmkwrapper">
- <xsl:value-of select="."/>
- </span>
- </xsl:when>
- </xsl:choose>
- </xsl:template>
- <xsl:template name="my.graphical.admonition">
- <xsl:variable name="admon.type">
- <xsl:choose>
- <xsl:when test="local-name(.)='note'">Note</xsl:when>
- <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
- <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
- <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
- <xsl:when test="local-name(.)='important'">Important</xsl:when>
- <xsl:otherwise>Note</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="alt">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="$admon.type"/>
- </xsl:call-template>
- </xsl:variable>
-
- <div xmlns="http://www.w3.org/1999/xhtml">
- <xsl:apply-templates select="." mode="class.attribute"/>
- <xsl:if test="$admon.style != ''">
- <xsl:attribute name="style">
- <xsl:value-of select="$admon.style"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:call-template name="anchor"/>
- <xsl:if test="$admon.textlabel != 0 or title">
- <h2>
- <xsl:apply-templates select="." mode="object.title.markup"/>
- </h2>
- </xsl:if>
- <div class="diffmkwrapper">
- <xsl:apply-templates />
- </div>
- </div>
- </xsl:template-->
<xsl:template match="abstract" mode="titlepage.mode">
@@ -213,121 +137,7 @@
</xsl:call-template>
</xsl:template>
-<!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES-->
-<xsl:template name="component.title">
- <xsl:param name="node" select="."/>
- <xsl:variable name="level">
- <xsl:choose>
- <xsl:when test="ancestor::section">
- <xsl:value-of select="count(ancestor::section)+1"/>
- </xsl:when>
- <xsl:when test="ancestor::sect5">6</xsl:when>
- <xsl:when test="ancestor::sect4">5</xsl:when>
- <xsl:when test="ancestor::sect3">4</xsl:when>
- <xsl:when test="ancestor::sect2">3</xsl:when>
- <xsl:when test="ancestor::sect1">2</xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <!-- Let's handle the case where a component (bibliography, for example)
- occurs inside a section; will we need parameters for this? -->
-
- <xsl:element name="h{$level+1}">
- <xsl:attribute name="class">
- title
- </xsl:attribute>
- <xsl:if test="$generate.id.attributes = 0">
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$node"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:apply-templates select="$node" mode="object.title.markup">
- <xsl:with-param name="allow-anchors" select="1"/>
- </xsl:apply-templates>
- </xsl:element>
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'">
- <img src="images/new.png" alt="new" class="img_marker" />
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'">
- <img src="images/updated.png" alt="updated" class="img_marker" />
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="section.heading">
- <xsl:param name="section" select="."/>
- <xsl:param name="level" select="1"/>
- <xsl:param name="allow-anchors" select="1"/>
- <xsl:param name="title"/>
- <xsl:param name="class" select="'title'"/>
-
- <xsl:variable name="id">
- <xsl:choose>
- <!-- if title is in an *info wrapper, get the grandparent -->
- <xsl:when test="contains(local-name(..), 'info')">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="../.."/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select=".."/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <!-- HTML H level is one higher than section level -->
- <xsl:variable name="hlevel">
- <xsl:choose>
- <!-- highest valid HTML H level is H6; so anything nested deeper
- than 5 levels down just becomes H6 -->
- <xsl:when test="$level > 5">6</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$level + 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:element name="h{$hlevel}">
- <xsl:attribute name="class">
- <xsl:value-of select="$class"/>
- </xsl:attribute>
- <xsl:if test="$css.decoration != '0'">
- <xsl:if test="$hlevel<3">
- <xsl:attribute name="style">clear: both</xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$section"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
- <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$title"/>
- </xsl:element>
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'">
- <img src="images/new.png" alt="new" class="img_marker" />
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'">
- <img src="images/updated.png" alt="updated" class="img_marker" />
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -10,47 +10,6 @@
<xsl:import href="classpath:/xslt/com/jboss/pdf.xsl"/>
-
- <!--xsl:template name="toc.line">
- <xsl:param name="toc-context" select="NOTANODE"/>
- <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 xsl:use-attribute-sets="toc.line.properties">
- <fo:inline keep-with-next.within-line="always">
-
- <fo:basic-link internal-destination="{$id}"
- background-image="new.png"
- background-repeat="no-repeat"
- background-position-horizontal="right">
-
-
- <xsl:if test="$label != ''">
- <xsl:copy-of select="$label"/>
- <xsl:value-of select="$autotoc.label.separator"/>
- </xsl:if>
- <xsl:apply-templates select="." mode="title.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-->
-
<!-- overwriting links properties -->
<xsl:param name="ulink.show" select="0"></xsl:param>
@@ -104,17 +63,7 @@
</xsl:attribute>
</xsl:attribute-set>
- <!-- tables headers bgcolor overwriting -->
- <!--xsl:template name="table.cell.block.properties">
- <xsl:if test="ancestor::thead or ancestor::tfoot">
- <xsl:attribute name="font-weight">bold</xsl:attribute>
- <xsl:attribute name="background-color">green</xsl:attribute>
- <xsl:attribute name="border-color">green</xsl:attribute>
- <xsl:attribute name="color">white</xsl:attribute>
- </xsl:if>
- </xsl:template-->
-
<!-- highlighting meaningful words -->
<xsl:template match="property">
@@ -124,16 +73,9 @@
</fo:inline>
</xsl:template>
- <xsl:template match="//diffmk:wrapper">
- <xsl:choose>
- <xsl:when test="@diffmk:change='deleted'">
- <fo:inline> </fo:inline>
- </xsl:when>
- <xsl:otherwise>
- <fo:inline background-color="#cce2f6">
- <xsl:value-of select="."/>
- </fo:inline>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+<xsl:template match="//diffmk:wrapper">
+ <fo:inline>
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </fo:inline>
+</xsl:template>
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -19,7 +19,6 @@
<script type="text/javascript" src="script/toggle.js"><xsl:comment>If you see this message, your web browser doesn't support JavaScript or JavaScript is disabled.</xsl:comment></script>
</xsl:template>
-
<xsl:template name="header.navigation">
<xsl:param name="prev" select="/foo"/>
<xsl:param name="next" select="/foo"/>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -1,6 +1,98 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0">
+ <!-- Overriding toc.line -->
+ <xsl:template name="toc.line">
+ <xsl:param name="toc-context" select="."/>
+ <xsl:param name="depth" select="1"/>
+ <xsl:param name="depth.from.context" select="8"/>
+ <xsl:param name="min-diff" select="10"/>
+ <xsl:param name="pos" select="position()"/>
+
+ <span>
+ <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
+
+ <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
+ <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
+ <xsl:if test="$autotoc.label.in.hyperlink = 0">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="context" select="$toc-context"/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ </xsl:call-template>
+ </xsl:attribute>
+
+ <xsl:choose>
+ <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">updated</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
+
+
+ <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
+ <!-- * as part of the hyperlinked title -->
+ <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ </a>
+ </span>
+ </xsl:template>
+ <!-- This template adds proper markers to the titles of guide -->
+ <xsl:template name="markerTypes">
+ <xsl:param name="marker-type" />
+ <xsl:param name="marker-value" />
+ <xsl:choose>
+ <xsl:when test="$marker-type = 'attribute'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="$marker-value" />
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="$marker-type = 'image'">
+ <xsl:choose>
+ <xsl:when test="$marker-value='changed'">
+ <img src="images/updated.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ <xsl:when test="$marker-value='added'">
+ <img src="images/new.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
<!-- This template is used for the diffmk build -->
<xsl:template match="//diffmk:wrapper">
<xsl:choose>
@@ -17,5 +109,142 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES-->
+
+<xsl:template name="component.title">
+ <xsl:param name="node" select="."/>
+ <xsl:param name="pos" select="position()"/>
+ <xsl:param name="min-diff" select="10"/>
+
+ <xsl:variable name="level">
+ <xsl:choose>
+ <xsl:when test="ancestor::section">
+ <xsl:value-of select="count(ancestor::section)+1"/>
+ </xsl:when>
+ <xsl:when test="ancestor::sect5">6</xsl:when>
+ <xsl:when test="ancestor::sect4">5</xsl:when>
+ <xsl:when test="ancestor::sect3">4</xsl:when>
+ <xsl:when test="ancestor::sect2">3</xsl:when>
+ <xsl:when test="ancestor::sect1">2</xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- Let's handle the case where a component (bibliography, for example)
+ occurs inside a section; will we need parameters for this? -->
+
+ <xsl:element name="h{$level+1}">
+ <xsl:attribute name="class">
+ title
+ </xsl:attribute>
+ <xsl:if test="$generate.id.attributes = 0">
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:apply-templates select="$node" mode="object.title.markup">
+ <xsl:with-param name="allow-anchors" select="1"/>
+ </xsl:apply-templates>
+ </xsl:element>
+
+ <!-- These rules add markers to the title of chapter -->
+ <xsl:choose>
+ <xsl:when test="current()/parent::node()[@diffmk:change='added']">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">image</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">image</xsl:with-param>
+ <xsl:with-param name="marker-value">changed</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<!-- ===================== Rules for title of section ====================================== -->
+
+<xsl:template name="section.heading">
+ <xsl:param name="section" select="."/>
+ <xsl:param name="level" select="1"/>
+ <xsl:param name="allow-anchors" select="1"/>
+ <xsl:param name="title"/>
+ <xsl:param name="class" select="'title'"/>
+ <xsl:param name="pos" select="position()"/>
+ <xsl:param name="min-diff" select="10"/>
+
+ <xsl:variable name="id">
+ <xsl:choose>
+ <!-- if title is in an *info wrapper, get the grandparent -->
+ <xsl:when test="contains(local-name(..), 'info')">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="../.."/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select=".."/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- HTML H level is one higher than section level -->
+ <xsl:variable name="hlevel">
+ <xsl:choose>
+ <!-- highest valid HTML H level is H6; so anything nested deeper
+ than 5 levels down just becomes H6 -->
+ <xsl:when test="$level > 5">6</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$level + 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:element name="h{$hlevel}">
+ <xsl:attribute name="class">
+ <xsl:value-of select="$class"/>
+ </xsl:attribute>
+ <xsl:if test="$css.decoration != '0'">
+ <xsl:if test="$hlevel<3">
+ <xsl:attribute name="style">clear: both</xsl:attribute>
+ </xsl:if>
+ </xsl:if>
+ <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="node" select="$section"/>
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
+ <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$title"/>
+ </xsl:element>
+
+ <!-- These rules add markers to the title of section -->
+ <xsl:choose>
+ <xsl:when test="current()/parent::node()[@diffmk:change='added']">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">image</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">image</xsl:with-param>
+ <xsl:with-param name="marker-value">changed</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<!-- ==================================================================== -->
+
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -61,28 +61,6 @@
</xsl:template>
- <!-- This template adds proper markers to the titles of guide -->
- <xsl:template name="markerTypes">
- <xsl:param name="marker-type" />
- <xsl:param name="marker-value" />
- <xsl:choose>
- <xsl:when test="$marker-type = 'attribute'">
- <xsl:attribute name="class">
- <xsl:value-of select="$marker-value" />
- </xsl:attribute>
- </xsl:when>
- <xsl:when test="$marker-type = 'image'">
- <xsl:choose>
- <xsl:when test="$marker-value='changed'">
- <img src="images/updated.png" alt="updated" class="img_marker" />
- </xsl:when>
- <xsl:when test="$marker-value='added'">
- <img src="images/new.png" alt="updated" class="img_marker" />
- </xsl:when>
- </xsl:choose>
- </xsl:when>
- </xsl:choose>
- </xsl:template>
@@ -116,30 +94,7 @@
<xsl:with-param name="context" select="$toc-context"/>
<xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template>
- </xsl:attribute>
-
- <xsl:choose>
- <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">attribute</xsl:with-param>
- <xsl:with-param name="marker-value">added</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">attribute</xsl:with-param>
- <xsl:with-param name="marker-value">added</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">attribute</xsl:with-param>
- <xsl:with-param name="marker-value">updated</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
-
-
+ </xsl:attribute>
<!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
<!-- * as part of the hyperlinked title -->
<xsl:if test="not($autotoc.label.in.hyperlink = 0)">
@@ -161,17 +116,7 @@
<!-- This template is used for the release build -->
<xsl:template match="//diffmk:wrapper">
- <xsl:choose>
- <xsl:when test="@diffmk:change='deleted'">
- <xsl:text> </xsl:text>
- </xsl:when>
- <xsl:when test="parent::node()[local-name()='title']">
- <xsl:value-of select="."/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="."/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="."/>
</xsl:template>
@@ -186,142 +131,6 @@
</xsl:call-template>
</xsl:template>
-<!-- THERE ARE 2 TEMPLATES FOR ADDING 'ADDED', 'CHANGED' ICONS TO ALL OF THE TITLES-->
-<xsl:template name="component.title">
- <xsl:param name="node" select="."/>
- <xsl:param name="pos" select="position()"/>
- <xsl:param name="min-diff" select="10"/>
- <xsl:variable name="level">
- <xsl:choose>
- <xsl:when test="ancestor::section">
- <xsl:value-of select="count(ancestor::section)+1"/>
- </xsl:when>
- <xsl:when test="ancestor::sect5">6</xsl:when>
- <xsl:when test="ancestor::sect4">5</xsl:when>
- <xsl:when test="ancestor::sect3">4</xsl:when>
- <xsl:when test="ancestor::sect2">3</xsl:when>
- <xsl:when test="ancestor::sect1">2</xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <!-- Let's handle the case where a component (bibliography, for example)
- occurs inside a section; will we need parameters for this? -->
-
- <xsl:element name="h{$level+1}">
- <xsl:attribute name="class">
- title
- </xsl:attribute>
- <xsl:if test="$generate.id.attributes = 0">
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$node"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:apply-templates select="$node" mode="object.title.markup">
- <xsl:with-param name="allow-anchors" select="1"/>
- </xsl:apply-templates>
- </xsl:element>
-
- <!-- These rules add markers to the title of chapter -->
- <xsl:choose>
- <xsl:when test="current()/parent::node()[@diffmk:change='added']">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">image</xsl:with-param>
- <xsl:with-param name="marker-value">added</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">image</xsl:with-param>
- <xsl:with-param name="marker-value">changed</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
-
-</xsl:template>
-
-<!-- ===================== Rules for title of section ====================================== -->
-
-<xsl:template name="section.heading">
- <xsl:param name="section" select="."/>
- <xsl:param name="level" select="1"/>
- <xsl:param name="allow-anchors" select="1"/>
- <xsl:param name="title"/>
- <xsl:param name="class" select="'title'"/>
- <xsl:param name="pos" select="position()"/>
- <xsl:param name="min-diff" select="10"/>
-
- <xsl:variable name="id">
- <xsl:choose>
- <!-- if title is in an *info wrapper, get the grandparent -->
- <xsl:when test="contains(local-name(..), 'info')">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="../.."/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select=".."/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <!-- HTML H level is one higher than section level -->
- <xsl:variable name="hlevel">
- <xsl:choose>
- <!-- highest valid HTML H level is H6; so anything nested deeper
- than 5 levels down just becomes H6 -->
- <xsl:when test="$level > 5">6</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$level + 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:element name="h{$hlevel}">
- <xsl:attribute name="class">
- <xsl:value-of select="$class"/>
- </xsl:attribute>
- <xsl:if test="$css.decoration != '0'">
- <xsl:if test="$hlevel<3">
- <xsl:attribute name="style">clear: both</xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$section"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
- <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$title"/>
- </xsl:element>
-
- <!-- These rules add markers to the title of section -->
- <xsl:choose>
- <xsl:when test="current()/parent::node()[@diffmk:change='added']">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">image</xsl:with-param>
- <xsl:with-param name="marker-value">added</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']">
- <xsl:call-template name="markerTypes">
- <xsl:with-param name="marker-type">image</xsl:with-param>
- <xsl:with-param name="marker-value">changed</xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -37,4 +37,71 @@
</fo:inline>
</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>
+
+ <!--xsl:choose>
+ <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">added</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper">
+ <xsl:call-template name="markerTypes">
+ <xsl:with-param name="marker-type">attribute</xsl:with-param>
+ <xsl:with-param name="marker-value">updated</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose-->
+ <fo:external-graphic src="images/new.png"/>
+ <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>
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -6,7 +6,7 @@
Author: Mark Newton <mark.newton(a)jboss.org>
-->
-<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:diffmk="http://diffmk.sf.net/ns/diff">
<xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
<xsl:import href="common.xsl"/>
@@ -88,5 +88,4 @@
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
</xsl:template>
-
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl
===================================================================
--- branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl 2009-03-13 15:26:47 UTC (rev 14208)
@@ -6,7 +6,7 @@
Author: Mark Newton <mark.newton(a)jboss.org>
-->
-<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:diffmk="http://diffmk.sf.net/ns/diff">
<xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
<xsl:import href="common.xsl"/>
Modified: branches/jbosstools-3.0.x/drools/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/drools/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/drools/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -33,8 +33,8 @@
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
</properties>
Modified: branches/jbosstools-3.0.x/esb/docs/esb_ref_guide/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/esb/docs/esb_ref_guide/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/esb/docs/esb_ref_guide/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/hibernatetools/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/hibernatetools/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/hibernatetools/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jbpm/docs/converter_ref/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jbpm/docs/converter_ref/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jbpm/docs/converter_ref/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -19,17 +19,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jbpm/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jbpm/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jbpm/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jmx/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jmx/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jmx/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,16 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseTest</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
- </properties>
- </profile>
- <profile>
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jsf/docs/jsf_tools_ref_guide/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jsf/docs/jsf_tools_ref_guide/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jsf/docs/jsf_tools_ref_guide/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jsf/docs/jsf_tools_tutorial/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jsf/docs/jsf_tools_tutorial/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/jsf/docs/userguide/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/jsf/docs/userguide/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/jsf/docs/userguide/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -15,27 +15,28 @@
<id>release</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
- </properties>
- </profile>
- <profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
<xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
<xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-diff.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-diff.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf-diff.xsl</xsl-pdf>
</properties>
</profile>
</profiles>
@@ -128,9 +129,9 @@
<properties>
<stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
<master>master.xml</master>
<translation>en-US</translation>
Modified: branches/jbosstools-3.0.x/portlet/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/portlet/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/portlet/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -33,8 +33,8 @@
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
</properties>
Modified: branches/jbosstools-3.0.x/seam/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/seam/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/seam/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -24,8 +24,8 @@
<id>releaseJBDS</id>
<properties>
<master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
<xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
</properties>
Modified: branches/jbosstools-3.0.x/smooks/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/smooks/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/smooks/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -29,17 +29,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/struts/docs/struts_tools_ref_guide/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/struts/docs/struts_tools_ref_guide/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/struts/docs/struts_tools_ref_guide/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -20,17 +20,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
Modified: branches/jbosstools-3.0.x/struts/docs/struts_tools_tutorial/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/struts/docs/struts_tools_tutorial/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/struts/docs/struts_tools_tutorial/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -10,36 +10,46 @@
<packaging>jdocbook</packaging>
<name>Struts_Tools_Tutorial</name>
- <profiles>
- <profile>
- <id>release</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
- </properties>
- </profile>
- <profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
- <id>diffmk</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf>
- </properties>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseTest</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
+ <profile>
+ <id>diffmk</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
Modified: branches/jbosstools-3.0.x/ws/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-3.0.x/ws/docs/reference/pom.xml 2009-03-13 11:58:17 UTC (rev 14207)
+++ branches/jbosstools-3.0.x/ws/docs/reference/pom.xml 2009-03-13 15:26:47 UTC (rev 14208)
@@ -29,17 +29,17 @@
<xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf>
</properties>
</profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
<profile>
- <id>releaseJBDS</id>
- <properties>
- <master>master_output.xml</master>
- <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
- <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
- <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
- <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
- </properties>
- </profile>
- <profile>
<id>diffmk</id>
<properties>
<master>master_output.xml</master>
15 years, 6 months
JBoss Tools SVN: r14207 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-03-13 07:58:17 -0400 (Fri, 13 Mar 2009)
New Revision: 14207
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/AbsoluteFilePathAttributeValueLoader.java
Log:
JBIDE-4011
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/AbsoluteFilePathAttributeValueLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/AbsoluteFilePathAttributeValueLoader.java 2009-03-13 11:06:17 UTC (rev 14206)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/AbsoluteFilePathAttributeValueLoader.java 2009-03-13 11:58:17 UTC (rev 14207)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.jboss.tools.common.model.XModelBuffer;
import org.jboss.tools.common.model.XModelException;
@@ -39,10 +40,18 @@
}
public void fillTagAttributes(IDropWizardModel model) {
- IFileEditorInput input = ((IFileEditorInput)model.getDropData().getEditorInput());
- IProject project = input.getFile().getProject();
+ IFile file = DropUtils.getResourceForMimeData(model.getDropData());
+ if(file == null) return;
+ IProject project = null;
+ IEditorInput editorInput = model.getDropData().getEditorInput();
+ IFileEditorInput input = null;
+ if(editorInput instanceof IFileEditorInput) {
+ input = (IFileEditorInput)editorInput;
+ project = input.getFile().getProject();
+ } else {
+ project = file.getProject();
+ }
IContainer container = DropUtils.getWebRootContainer(project);
- IFile file = DropUtils.getResourceForMimeData(model.getDropData());
if(file != null){
IPath filePath = file.getProjectRelativePath();
IPath containerPath = container.getProjectRelativePath();
@@ -51,7 +60,7 @@
// TODO Eskimo - think, how deside what url to image use, absolute or relative
// Now it is absolute.
// TODO Eskimo - think what we have to do id dropped file is not from WEB-ROOT folder
- String v = dropFileToFile(file, input.getFile(), model);
+ String v = (input == null) ? null : dropFileToFile(file, input.getFile(), model);
if(v == null) v = "/"+filePath.toString();
model.setAttributeValue(fPathAttributeName, v);
}
15 years, 6 months
JBoss Tools SVN: r14206 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-03-13 07:06:17 -0400 (Fri, 13 Mar 2009)
New Revision: 14206
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java
Log:
JBIDE-3936
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java 2009-03-13 09:29:16 UTC (rev 14205)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java 2009-03-13 11:06:17 UTC (rev 14206)
@@ -28,6 +28,7 @@
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
+import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite.AttributeDescriptorValue;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager;
@@ -122,6 +123,8 @@
if(target == null && f.exists()) {
target = EclipseResourceUtil.createObjectForResource(f);
}
+ } else if(input instanceof IModelObjectEditorInput) {
+ target = ((IModelObjectEditorInput)input).getXModelObject();
}
if(target == null) {
initialize2();
15 years, 6 months
JBoss Tools SVN: r14205 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-13 05:29:16 -0400 (Fri, 13 Mar 2009)
New Revision: 14205
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java
Log:
Added an extra class extenders can use as their label provider
Added: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java (rev 0)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java 2009-03-13 09:29:16 UTC (rev 14205)
@@ -0,0 +1,27 @@
+package org.jboss.tools.jmx.ui.internal.views.navigator;
+
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.jmx.core.IConnectionWrapper;
+
+public class EmbedableLabelProvider extends LabelProvider {
+ private MBeanExplorerLabelProvider delegate;
+ public EmbedableLabelProvider() {
+ delegate = new MBeanExplorerLabelProvider();
+ }
+
+ public void dispose() {
+ delegate.dispose();
+ }
+
+ public String getText(Object element) {
+ if( element instanceof IConnectionWrapper ) {
+ return "JMX";
+ }
+ return delegate.getText(element);
+ }
+
+ public Image getImage(Object element) {
+ return delegate.getImage(element);
+ }
+}
15 years, 6 months
JBoss Tools SVN: r14204 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: wizards and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-13 05:06:51 -0400 (Fri, 13 Mar 2009)
New Revision: 14204
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
Liberalize the wizard to give warnings instead of errors if you use the wrong version.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-03-13 09:06:16 UTC (rev 14203)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-03-13 09:06:51 UTC (rev 14204)
@@ -40,9 +40,11 @@
public static String rwf_Explanation;
public static String rwf_BaseName;
public static String rwf_NameInUse;
- public static String rwf_invalidDirectory;
+ public static String rwf_homeMissingFiles;
+ public static String rwf_homeIncorrectVersion;
public static String rwf_nameTextBlank;
public static String rwf_homeDirBlank;
+ public static String rwf_NoVMSelected;
public static String swf_Title;
public static String swf_RuntimeInformation;
public static String swf_AuthorizationDescription;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-03-13 09:06:16 UTC (rev 14203)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-03-13 09:06:51 UTC (rev 14204)
@@ -10,9 +10,11 @@
rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can be used to set up classpaths for projects which depend on this runtime,\nas well as by a "server" which will be able to start and stop instances of JBoss.
rwf_BaseName=JBoss _VERSION_ Runtime
rwf_NameInUse=Runtime name already in use
-rwf_invalidDirectory=The home directory does not exist, is missing key files, or is of the incorrect version.
+rwf_homeMissingFiles=The home directory does not exist or is missing the run.jar.
+rwf_homeIncorrectVersion=The server's home directory is of the incorrect version.
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
+rwf_NoVMSelected=No VM selected
JBAS_version=JBoss Application Server {0}
JBEAP_version=JBoss Enterprise Application Platform {0}
swf_Title=Create a new JBoss Server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-03-13 09:06:16 UTC (rev 14203)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-03-13 09:06:51 UTC (rev 14204)
@@ -445,9 +445,13 @@
private void updateErrorMessage() {
String error = getErrorString();
- if (error == null)
- handle.setMessage(null, IMessageProvider.NONE);
- else
+ if (error == null) {
+ String warn = getWarningString();
+ if( warn != null )
+ handle.setMessage(warn, IMessageProvider.WARNING);
+ else
+ handle.setMessage(null, IMessageProvider.NONE);
+ } else
handle.setMessage(error, IMessageProvider.ERROR);
}
@@ -462,7 +466,7 @@
}
if (!isHomeValid())
- return Messages.rwf_invalidDirectory;
+ return Messages.rwf_homeMissingFiles;
if (name == null || name.equals(""))
return Messages.rwf_nameTextBlank;
@@ -471,19 +475,31 @@
return Messages.rwf_homeDirBlank;
if (jreComboIndex < 0)
- return "No VM selected";
+ return Messages.rwf_NoVMSelected;
return null;
}
+
+ private String getWarningString() {
+ if( !isHomeVersionValid())
+ return Messages.rwf_homeIncorrectVersion;
+ return null;
+ }
protected boolean isHomeValid() {
if( homeDir == null || !(new File(homeDir).exists())) return false;
+ IRuntime rt = (IRuntime) getTaskModel().getObject(
+ TaskModel.TASK_RUNTIME);
+ String v = rt.getRuntimeType().getVersion();
+ return new Path(homeDir).append("bin").append("run.jar").toFile().exists();
+ }
+
+ protected boolean isHomeVersionValid() {
String version = new ServerBeanLoader().getFullServerVersion(new File(homeDir, JBossServerType.AS.getSystemJarPath()));
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
String v = rt.getRuntimeType().getVersion();
- return new Path(homeDir).append("bin").append("run.jar").toFile().exists()
- && version.startsWith(v);
+ return version.startsWith(v);
}
private void browseHomeDirClicked() {
15 years, 6 months
JBoss Tools SVN: r14203 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-13 05:06:16 -0400 (Fri, 13 Mar 2009)
New Revision: 14203
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
Log:
There was a silly little character added which botched the view. Doh
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-03-13 05:50:58 UTC (rev 14202)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-03-13 09:06:16 UTC (rev 14203)
@@ -49,7 +49,7 @@
if( element == ServerContentProvider.INITIALIZING)
return Messages.viewInitializing;
- return "-";
+ return null;
}
public Image getImage(Object element) {
Image image = null;
15 years, 6 months
JBoss Tools SVN: r14202 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-03-13 01:50:58 -0400 (Fri, 13 Mar 2009)
New Revision: 14202
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java
Log:
JBIDE-3953
When select "ftl" type , the parameter table will be hidden ; when select "xsl" , the table will be shown.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2009-03-13 05:28:48 UTC (rev 14201)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2009-03-13 05:50:58 UTC (rev 14202)
@@ -3,8 +3,11 @@
*/
package org.jboss.tools.smooks.ui.editors;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -26,6 +29,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.events.HyperlinkEvent;
@@ -45,7 +49,7 @@
*/
public class DocumentResourceTypeDetailPage extends
AbstractSmooksModelDetailPage implements ParamaterChangeLitener {
-
+ private List tempParameterList = null;
private static final int INNER = 0;
private static final int EXTERNAL = 1;
private Text text;
@@ -62,6 +66,7 @@
// private static final String PARAM_VALUE_PRO = "__param_value_pro";
private ParamaterTableViewerCreator creator;
+ private Label parameterLabel;
public DocumentResourceTypeDetailPage(SmooksFormEditor parentEditor,
EditingDomain domain) {
@@ -196,6 +201,7 @@
typeCombo.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
+ if(!canFireChange) return;
resetResourceType();
}
@@ -238,23 +244,40 @@
if (type != null) {
type = type.trim();
}
-
ResourceType resource = resourceConfig.getResource();
if (resource != null) {
resource.setType(type);
+ if (type.equals("ftl") && creator != null) {
+ creator.setVisible(false);
+ parameterLabel.setVisible(false);
+ tempParameterList = new ArrayList(resourceConfig.getParam());
+ resourceConfig.getParam().clear();
+ } else {
+ creator.setVisible(true);
+ parameterLabel.setVisible(true);
+ if(tempParameterList != null){
+ for (Iterator iterator = tempParameterList.iterator(); iterator
+ .hasNext();) {
+ ParamType obj = (ParamType) iterator.next();
+ resourceConfig.getParam().add(obj);
+ }
+ tempParameterList.clear();
+ tempParameterList = null;
+ }
+ }
parentEditor.fireEditorDirty(true);
}
+
}
protected void createParamerTable(Composite parent) {
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- formToolKit.createLabel(parent, "Paramater List : ").setLayoutData(gd);
- creator = new ParamaterTableViewerCreator(
- parent, formToolKit, SWT.NONE);
+ parameterLabel = formToolKit.createLabel(parent, "Parameter List : ");
+ parameterLabel.setLayoutData(gd);
+ creator = new ParamaterTableViewerCreator(parent, formToolKit, SWT.NONE);
creator.addParamaterListener(this);
}
-
protected void createInnerContentsGUI(Composite parent) {
GridData gd = new GridData(GridData.BEGINNING);
gd.verticalAlignment = GridData.BEGINNING;
@@ -268,6 +291,7 @@
innerContentText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
+ if(!canFireChange) return;
resetCDATA();
}
@@ -312,6 +336,7 @@
SmooksModelUtils.setTextToAnyType(resource, text);
}
}
+ if(!canFireChange) return;
this.parentEditor.fireEditorDirty(true);
}
@@ -348,7 +373,15 @@
String type = resource.getType();
if (type != null) {
typeCombo.setText(type);
+ if (type.equals("ftl")) {
+ creator.setVisible(false);
+ parameterLabel.setVisible(false);
+ } else {
+ creator.setVisible(true);
+ parameterLabel.setVisible(true);
+ }
}
+
if (isInit) {
creator.setInput(resourceConfig);
creator.setResourceConfig(resourceConfig);
15 years, 6 months
JBoss Tools SVN: r14201 - in trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core: runtime and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-13 01:28:48 -0400 (Fri, 13 Mar 2009)
New Revision: 14201
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
JBIDE-4006 - webbeans classpath
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2009-03-13 04:49:17 UTC (rev 14200)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2009-03-13 05:28:48 UTC (rev 14201)
@@ -41,6 +41,7 @@
public static final String JBOSSWEB_SAR = "jbossweb.sar"; //$NON-NLS-1$
public static final String JBOSS_WEB_SERVICE_JAR = "jboss-web-service.jar"; //$NON-NLS-1$
public static final String EJB3_DEPLOYER = "ejb3.deployer"; //$NON-NLS-1$
+ public static final String WEBBEANS_DEPLOYER = "webbeans.deployer"; //$NON-NLS-1$
public static final String AS5_AOP_DEPLOYER = "jboss-aop-jboss5.deployer"; //$NON-NLS-1$
public static final String AOP_JDK5_DEPLOYER = "jboss-aop-jdk50.deployer"; //$NON-NLS-1$
public static final String JBOSS_AOP_JDK5_JAR = "jboss-aop-jdk50.jar"; //$NON-NLS-1$
@@ -58,6 +59,7 @@
public static final String HIBERNATE_CLIENT_JAR = "hibernate-client.jar"; //$NON-NLS-1$
public static final String JBOSSALL_CLIENT_JAR = "jbossall-client.jar"; //$NON-NLS-1$
public static final String JBOSSWEB_TOMCAT_50_SAR = "jbossweb-tomcat50.sar"; //$NON-NLS-1$
+ public static final String JSR299_API_JAR = "jsr299-api.jar"; //$NON-NLS-1$
public static final String JAVAX_SERVLET_JAR = "javax.servlet.jar"; //$NON-NLS-1$
public static final String JAVAX_SERVLET_JSP_JAR = "javax.servlet.jsp.jar"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-03-13 04:49:17 UTC (rev 14200)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-03-13 05:28:48 UTC (rev 14201)
@@ -109,6 +109,7 @@
addEntries(deployPath.append(JBOSSWEB_SAR).append(JBOSS_WEB_SERVICE_JAR),list);
addEntries(deployerPath.append(AS5_AOP_DEPLOYER), list);
addEntries(deployerPath.append(EJB3_DEPLOYER), list);
+ addEntries(deployerPath.append(WEBBEANS_DEPLOYER).append(JSR299_API_JAR), list);
return list.toArray(new IClasspathEntry[list.size()]);
}
15 years, 6 months