JBoss Tools SVN: r14200 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-03-13 00:49:17 -0400 (Fri, 13 Mar 2009)
New Revision: 14200
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
Log:
JBIDE-3557 Externalise English strings (eliminating string concatenation)
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-03-12 18:35:17 UTC (rev 14199)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-03-13 04:49:17 UTC (rev 14200)
@@ -1,5 +1,6 @@
package org.jboss.tools.smooks.utils;
+import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -19,4 +20,8 @@
return '!' + key + '!';
}
}
+
+ public static String getString(String key, Object... args) {
+ return MessageFormat.format(getString(key), args);
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-03-12 18:35:17 UTC (rev 14199)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-03-13 04:49:17 UTC (rev 14200)
@@ -42,7 +42,6 @@
import org.jboss.tools.smooks.javabean.model.SelectorAttributes;
import org.jboss.tools.smooks.javabean.ui.BeanPopulatorMappingAnalyzer;
import org.jboss.tools.smooks.model.AbstractResourceConfig;
-import org.jboss.tools.smooks.model.ParamType;
import org.jboss.tools.smooks.model.ResourceConfigType;
import org.jboss.tools.smooks.model.SmooksPackage;
import org.jboss.tools.smooks.model.SmooksResourceListType;
@@ -148,9 +147,9 @@
throw new InvocationTargetException(
new Exception(
Messages
- .getString("UIUtils.SelectorCheckErrorMessage1") + splitString //$NON-NLS-1$
- + Messages
- .getString("UIUtils.SelectorCheckErrorMessage2") + selector + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
+ .getString("UIUtils.SelectorCheckErrorMessage", //$NON-NLS-1$
+ splitString,
+ selector)));
}
}
}
@@ -278,8 +277,8 @@
compositeCommand.setResolveDescription(Messages
.getString("UIUtils.ConnectAllConnections")); //$NON-NLS-1$
disconnectCommand.setResolveDescription(Messages
- .getString("UIUtils.DisconnectAllConnections") //$NON-NLS-1$
- + currentNode.getName() + Messages.getString("UIUtils.Node")); //$NON-NLS-1$
+ .getString("UIUtils.DisconnectAllConnections", //$NON-NLS-1$
+ currentNode.getName()));
AbstractStructuredDataModel targetNode = UIUtils.findGraphModel(root,
currentNode);
if (targetNode instanceof IConnectableModel) {
@@ -304,12 +303,12 @@
if (tempMap.get(sourceParentNode) == null) {
JavaModelConnectionResolveCommand connectParent = new JavaModelConnectionResolveCommand(
context);
- connectParent.setResolveDescription(Messages
- .getString("UIUtils.ConnectNode1") //$NON-NLS-1$
- + context.getSourceViewerLabelProvider().getText(
- sourceParent)
- + Messages.getString("UIUtils.ConnectNode2") //$NON-NLS-1$
- + parentNode.getName() + "\""); //$NON-NLS-1$
+ String desc = Messages
+ .getString("UIUtils.ConnectNode", //$NON-NLS-1$
+ context.getSourceViewerLabelProvider().getText(
+ sourceParent),
+ parentNode.getName());
+ connectParent.setResolveDescription(desc);
connectParent.setSourceModel(sourceParentNode);
connectParent.setTargetModel(targetParentNode);
result.addResolveCommand(connectParent);
@@ -352,12 +351,9 @@
if (((IConnectableModel) pgm)
.getModelTargetConnections().isEmpty()) {
String errorMessage = Messages
- .getString("UIUtils.ParentNodeConnectErrorMessage1") //$NON-NLS-1$
- + javaModel.getName()
- + "\" : \"" //$NON-NLS-1$
- + parent.getName()
- + Messages
- .getString("UIUtils.ParentNodeConnectErrorMessage2"); //$NON-NLS-1$
+ .getString("UIUtils.ParentNodeConnectErrorMessage", //$NON-NLS-1$
+ javaModel.getName(),
+ parent.getName());
DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult();
dr.setErrorMessage(errorMessage);
createJavaModelConnectionErrorResolveCommand(dr,
@@ -402,17 +398,15 @@
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
.setErrorMessage(Messages
- .getString("UIUtils.InstanceLoadedErrorMessage1") //$NON-NLS-1$
- + ((JavaBeanModel) refObj).getName()
- + Messages
- .getString("UIUtils.InstanceLoadedErrorMessage2") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.InstanceLoadedErrorMessage", //$NON-NLS-1$
+ ((JavaBeanModel) refObj).getName(),
+ instanceName));
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
command
.setResolveDescription(Messages
- .getString("UIUtils.InstanceLoadedResolveMessage1") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.InstanceLoadedResolveMessage", //$NON-NLS-1$
+ instanceName));
command.setInstanceName(instanceName);
command.setJavaBean((JavaBeanModel) refObj);
result.addResolveCommand(command);
@@ -422,11 +416,9 @@
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
.setErrorMessage(Messages
- .getString("UIUtils.JavaModelLoadedErrorMessage1") //$NON-NLS-1$
- + ((JavaBeanModel) refObj).getName()
- + Messages
- .getString("UIUtils.JavaModelLoadedErrorMessage2") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.JavaModelLoadedErrorMessage", //$NON-NLS-1$
+ ((JavaBeanModel) refObj).getName(),
+ instanceName));
if (List.class.isAssignableFrom(instanceClazz)) {
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-03-12 18:35:17 UTC (rev 14199)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-03-13 04:49:17 UTC (rev 14200)
@@ -1,19 +1,10 @@
-# START NON-TRANSLATABLE
-# FIXME translation disabled until the concatenation is eliminated
UIUtils.ConnectAllConnections=Make all necessary connections
-UIUtils.ConnectNode1=Connect the "
-UIUtils.ConnectNode2=" to the "
-UIUtils.DisconnectAllConnections=Disconnect all connections of the current "
+UIUtils.ConnectNode=Connect the "{0}" to the "{1}"
+UIUtils.DisconnectAllConnections=Disconnect all connections of the current "{0}"node
UIUtils.InstanceClassResolveMessage1=Change the instance class to "java.util.ArrayList"
UIUtils.InstanceClassResolveMessage2=java.util.ArrayList
-UIUtils.InstanceLoadedErrorMessage1=The instance class of "
-UIUtils.InstanceLoadedErrorMessage2=" can not be loaded. The instance name is "
-UIUtils.InstanceLoadedResolveMessage1=Change the instance class to "
-UIUtils.JavaModelLoadedErrorMessage1=Java model "
-UIUtils.JavaModelLoadedErrorMessage2=" can not be instantiated. The instance name is "
-UIUtils.Node="node
-UIUtils.ParentNodeConnectErrorMessage1=The parent of Java node "
-UIUtils.ParentNodeConnectErrorMessage2=" is not connected to any source node
-UIUtils.SelectorCheckErrorMessage1=The Selector string does not support "
-UIUtils.SelectorCheckErrorMessage2=" character. Selector is "
-# END NON-TRANSLATABLE
+UIUtils.InstanceLoadedErrorMessage=The instance class of "{0}" can not be loaded. The instance name is "{1}"
+UIUtils.InstanceLoadedResolveMessage=Change the instance class to "{0}"
+UIUtils.JavaModelLoadedErrorMessage=Java model "{0}" can not be instantiated. The instance name is "{1}"
+UIUtils.ParentNodeConnectErrorMessage=The parent of Java node "{0}" : "{1}" is not connected to any source node
+UIUtils.SelectorCheckErrorMessage=The Selector string does not support "{0}" character. Selector is "{1}"
15 years, 3 months
JBoss Tools SVN: r14199 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-03-12 14:35:17 -0400 (Thu, 12 Mar 2009)
New Revision: 14199
Modified:
workspace/snjeza/seam-examples/dvdstore-ear.zip
workspace/snjeza/seam-examples/dvdstoreall.zip
Log:
https://jira.jboss.org/jira/browse/JBIDE-4003
Modified: workspace/snjeza/seam-examples/dvdstore-ear.zip
===================================================================
(Binary files differ)
Modified: workspace/snjeza/seam-examples/dvdstoreall.zip
===================================================================
(Binary files differ)
15 years, 3 months
JBoss Tools SVN: r14198 - in trunk: birt/docs and 20 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-03-12 14:09:57 -0400 (Thu, 12 Mar 2009)
New Revision: 14198
Modified:
trunk/as/docs/reference/pom.xml
trunk/birt/docs/pom.xml
trunk/documentation/guides/Exadel-migration/pom.xml
trunk/documentation/guides/GettingStartedGuide/pom.xml
trunk/documentation/jbds-docs/index/en/master.xml
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl
trunk/drools/docs/reference/pom.xml
trunk/esb/docs/esb_ref_guide/pom.xml
trunk/hibernatetools/docs/reference/pom.xml
trunk/jbpm/docs/converter_ref/pom.xml
trunk/jbpm/docs/reference/pom.xml
trunk/jmx/docs/reference/pom.xml
trunk/jsf/docs/jsf_tools_ref_guide/pom.xml
trunk/jsf/docs/jsf_tools_tutorial/pom.xml
trunk/jsf/docs/userguide/pom.xml
trunk/portlet/docs/reference/pom.xml
trunk/seam/docs/reference/pom.xml
trunk/smooks/docs/reference/pom.xml
trunk/struts/docs/struts_tools_ref_guide/pom.xml
trunk/struts/docs/struts_tools_tutorial/pom.xml
trunk/ws/docs/reference/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-640 - profiles are updated, styles and sxl are also updated
Modified: trunk/as/docs/reference/pom.xml
===================================================================
--- trunk/as/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/as/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/birt/docs/pom.xml
===================================================================
--- trunk/birt/docs/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/birt/docs/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/documentation/guides/Exadel-migration/pom.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/guides/Exadel-migration/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/documentation/guides/GettingStartedGuide/pom.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/guides/GettingStartedGuide/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/documentation/jbds-docs/index/en/master.xml
===================================================================
--- trunk/documentation/jbds-docs/index/en/master.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbds-docs/index/en/master.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -6,9 +6,13 @@
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/com/jboss/xhtml.xsl"/>
- <xsl:import href="common.xsl"/>
<xsl:import href="xhtml.xsl"/>
+ <xsl:import href="common-diff.xsl"/>
<xsl:param name="html.stylesheet" select="'css/tools_release.css'"/>
+ <!-- This template is used for the release build -->
+ <xsl:template match="//diffmk:wrapper">
+ <xsl:value-of select="."/>
+ </xsl:template>
</xsl:stylesheet>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -6,9 +6,13 @@
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/com/jboss/xhtml.xsl"/>
- <xsl:import href="common.xsl"/>
<xsl:import href="xhtml-single.xsl"/>
+ <xsl:import href="common-diff.xsl"/>
<xsl:param name="html.stylesheet" select="'css/tools_release.css'"/>
+ <!-- This template is used for the release build -->
+ <xsl:template match="//diffmk:wrapper">
+ <xsl:value-of select="."/>
+ </xsl:template>
</xsl:stylesheet>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -115,19 +115,9 @@
<!-- 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:template-->
+ <xsl:template match="//diffmk:wrapper">
+ <xsl:value-of select="."/>
+ </xsl:template>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -6,9 +6,13 @@
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_diff.xsl"/>
<xsl:import href="xhtml.xsl"/>
+ <xsl:import href="common-diff.xsl"/>
<xsl:param name="html.stylesheet" select="'css/tools_release.css'"/>
+ <!-- This template is used for the release build -->
+ <xsl:template match="//diffmk:wrapper">
+ <xsl:value-of select="."/>
+ </xsl:template>
</xsl:stylesheet>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -6,9 +6,13 @@
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_diff.xsl"/>
<xsl:import href="xhtml-single.xsl"/>
+ <xsl:import href="common-diff.xsl"/>
<xsl:param name="html.stylesheet" select="'css/tools_release.css'"/>
+ <!-- This template is used for the release build -->
+ <xsl:template match="//diffmk:wrapper">
+ <xsl:value-of select="."/>
+ </xsl:template>
</xsl:stylesheet>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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"/>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml.xsl 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/drools/docs/reference/pom.xml
===================================================================
--- trunk/drools/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/drools/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/esb/docs/esb_ref_guide/pom.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/esb/docs/esb_ref_guide/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/hibernatetools/docs/reference/pom.xml
===================================================================
--- trunk/hibernatetools/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/hibernatetools/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jbpm/docs/converter_ref/pom.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jbpm/docs/converter_ref/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jbpm/docs/reference/pom.xml
===================================================================
--- trunk/jbpm/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jbpm/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jmx/docs/reference/pom.xml
===================================================================
--- trunk/jmx/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jmx/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jsf/docs/jsf_tools_ref_guide/pom.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jsf/docs/jsf_tools_ref_guide/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/jsf/docs/userguide/pom.xml
===================================================================
--- trunk/jsf/docs/userguide/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/jsf/docs/userguide/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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>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: trunk/portlet/docs/reference/pom.xml
===================================================================
--- trunk/portlet/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/portlet/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/seam/docs/reference/pom.xml
===================================================================
--- trunk/seam/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/seam/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/smooks/docs/reference/pom.xml
===================================================================
--- trunk/smooks/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/smooks/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/struts/docs/struts_tools_ref_guide/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/struts/docs/struts_tools_ref_guide/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/struts/docs/struts_tools_tutorial/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/struts/docs/struts_tools_tutorial/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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: trunk/ws/docs/reference/pom.xml
===================================================================
--- trunk/ws/docs/reference/pom.xml 2009-03-12 17:21:43 UTC (rev 14197)
+++ trunk/ws/docs/reference/pom.xml 2009-03-12 18:09:57 UTC (rev 14198)
@@ -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, 3 months
JBoss Tools SVN: r14197 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-03-12 13:21:43 -0400 (Thu, 12 Mar 2009)
New Revision: 14197
Modified:
workspace/snjeza/seam-examples/dvdstore-ear.zip
workspace/snjeza/seam-examples/dvdstoreall.zip
Log:
https://jira.jboss.org/jira/browse/JBIDE-4003
Modified: workspace/snjeza/seam-examples/dvdstore-ear.zip
===================================================================
(Binary files differ)
Modified: workspace/snjeza/seam-examples/dvdstoreall.zip
===================================================================
(Binary files differ)
15 years, 3 months
JBoss Tools SVN: r14196 - in trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el: internal/core/parser/token and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-03-12 13:08:12 -0400 (Thu, 12 Mar 2009)
New Revision: 14196
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/SyntaxError.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java
Log:
JBIDE-3951
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/SyntaxError.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/SyntaxError.java 2009-03-12 17:00:00 UTC (rev 14195)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/SyntaxError.java 2009-03-12 17:08:12 UTC (rev 14196)
@@ -37,7 +37,7 @@
return problem;
}
- void setProblem(String problem) {
+ public void setProblem(String problem) {
this.problem = problem;
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java 2009-03-12 17:00:00 UTC (rev 14195)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java 2009-03-12 17:08:12 UTC (rev 14196)
@@ -11,7 +11,9 @@
package org.jboss.tools.common.el.internal.core.parser.token;
import org.jboss.tools.common.el.core.parser.ITokenDescription;
+import org.jboss.tools.common.el.core.parser.SyntaxError;
import org.jboss.tools.common.el.core.parser.Tokenizer;
+import org.jboss.tools.common.el.internal.core.parser.rule.BasicStates;
/**
*
@@ -81,6 +83,7 @@
private boolean readNumber(Tokenizer tokenizer, int offset) {
int i = offset;
int dotCount = 1;
+ int dotOffset = -1;
if(tokenizer.startsWith("0x")) {
i += 2;
dotCount = 0;
@@ -94,6 +97,8 @@
if(dotCount < 0) {
lastCharIsWrong = true;
break;
+ } else {
+ dotOffset = tokenizer.getCurrentIndex() - 1;
}
} else if(!Character.isDigit(ch)) {
if(inE) {
@@ -131,6 +136,13 @@
if(lastCharIsWrong) {
tokenizer.releaseChar();
}
+ if(tokenizer.getLastToken() != null
+ && tokenizer.getLastToken().getType() == ArgStartTokenDescription.ARG_START
+ && dotCount < 1) {
+ SyntaxError error = new SyntaxError(dotOffset, BasicStates.STATE_EXPECTING_ARG);
+ error.setProblem("Argument must resolve to integer or string.");
+ tokenizer.getErrors().add(error);
+ }
tokenizer.addToken(getType(), offset, i);
return true;
}
15 years, 3 months
JBoss Tools SVN: r14195 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-12 13:00:00 -0400 (Thu, 12 Mar 2009)
New Revision: 14195
Modified:
trunk/seam/docs/reference/en/modules/seam_editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-603
Add Navigation Rule dialog is documented
Modified: trunk/seam/docs/reference/en/modules/seam_editors.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_editors.xml 2009-03-12 16:22:48 UTC (rev 14194)
+++ trunk/seam/docs/reference/en/modules/seam_editors.xml 2009-03-12 17:00:00 UTC (rev 14195)
@@ -220,17 +220,17 @@
<listitem><para><emphasis role="bold">Auto Layout</emphasis> formats the layout of the diagram automatically</para></listitem>
<listitem><para><emphasis role="bold">Select Element</emphasis> calls the <property>Select Element Wizard</property> with a filter to perform a quick search through the <property>pages.xml</property> file </para></listitem>
</itemizedlist>
- <para>Rightclicking on a <emphasis>
+ <para>Rightclicking on a selected<emphasis>
<property><page></property>
</emphasis> element calls a context menu where you can choose the following options if you click on the <emphasis role="bold">New</emphasis> menu item: </para>
<itemizedlist>
- <listitem><para><emphasis role="bold">Rule</emphasis> defines a new navigation rule for the element </para></listitem>
- <listitem><para><emphasis role="bold">Param</emphasis> adds a <emphasis>
+ <listitem><para><emphasis role="bold">Rule</emphasis> opens the <property>Add Navigation Rule</property> dialog in which you can browse your project for a view page to set the view-id in the navigation rule and specify <emphasis role="bold">render</emphasis> or <emphasis role="bold">redirect</emphasis> navigation options </para></listitem>
+ <listitem><para><emphasis role="bold">Param</emphasis> calls a dialog box where you can define a parameter (using the <emphasis>
<property><param></property>
- </emphasis> tag to the <emphasis>
+ </emphasis> tag) for the <emphasis>
<property><page></property>
</emphasis> element</para></listitem>
</itemizedlist>
15 years, 3 months
JBoss Tools SVN: r14192 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: wizards/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-03-12 11:56:40 -0400 (Thu, 12 Mar 2009)
New Revision: 14192
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
Log:
JBIDE-3987
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2009-03-12 15:48:20 UTC (rev 14191)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2009-03-12 15:56:40 UTC (rev 14192)
@@ -473,7 +473,8 @@
private boolean isDefaultLocation(String projectLocation) {
String root = ModelPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
- return (projectLocation.replace('\\','/') + "/").startsWith(root + "/" + getProject().getName() + "/");
+ return (projectLocation.replace('\\','/') + "/").equals(root + "/" + getProject().getName() + "/");
+// return (projectLocation.replace('\\','/') + "/").startsWith(root + "/" + getProject().getName() + "/");
}
private String createLinks(String projectLocation) throws CoreException {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2009-03-12 15:48:20 UTC (rev 14191)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2009-03-12 15:56:40 UTC (rev 14192)
@@ -168,7 +168,7 @@
String location = getProperty(PROJECT_LOCATION_ID).replace('\\', '/');
String root = ModelPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
String wsProjectLocation = (root + "/" + getProject().getName()).replace('\\', '/');;
- if(location.equals(wsProjectLocation)) return true;
+ if(location.equals(wsProjectLocation) || location.startsWith(wsProjectLocation + "/")) return true;
File wsf = new File(wsProjectLocation);
if(!wsf.isDirectory()) return true;
File[] cs = wsf.listFiles();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2009-03-12 15:48:20 UTC (rev 14191)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2009-03-12 15:56:40 UTC (rev 14192)
@@ -178,6 +178,9 @@
getContainer().updateButtons();
if(linkAdapter != null) {
support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink(), (Composite)getControl());
+ if(!mayNeedLink() && linkAdapter != null) {
+ linkAdapter.setValue("false");
+ }
}
}
};
@@ -191,6 +194,9 @@
if(linkAdapter != null) {
support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink(), (Composite)getControl());
}
+ if(!mayNeedLink() && linkAdapter != null) {
+ linkAdapter.setValue("false");
+ }
}
}
);
@@ -198,7 +204,7 @@
new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
String v = linkAdapter.getStringValue(false);
- context.setLinkingToProjectOutsideWorkspace(!"false".equals(v));
+ context.setLinkingToProjectOutsideWorkspace(!"false".equals(v) && mayNeedLink());
}
}
);
15 years, 3 months
JBoss Tools SVN: r14191 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-12 11:48:20 -0400 (Thu, 12 Mar 2009)
New Revision: 14191
Modified:
trunk/seam/docs/reference/en/modules/seam_editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-553
Preferences for Seam Page Diagram
Modified: trunk/seam/docs/reference/en/modules/seam_editors.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_editors.xml 2009-03-12 15:48:05 UTC (rev 14190)
+++ trunk/seam/docs/reference/en/modules/seam_editors.xml 2009-03-12 15:48:20 UTC (rev 14191)
@@ -234,6 +234,26 @@
<property><page></property>
</emphasis> element</para></listitem>
</itemizedlist>
+
+
+ <section>
+ <title>Seam Pages Diagram Preferences</title>
+
+
+
+ <para>In order to customize the layout of Diagram you can go to
+ <property>Window > Preferences > JBoss Tools > Web > Seam > Editors > Seam Pages Diagram</property>.
+ </para>
+
+ <figure>
+ <title>Preferences of Seam Pages Diagram</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_editors/seam_editors_11.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
</section>
@@ -307,11 +327,14 @@
</section>
+
</section>
+
+
<section>
15 years, 3 months