[531608] Duplicate template id warnings in error log on each Eclipse start

7 files changed, 8 insertions, 12 deletions

diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF
index a906c64b50..c4e4d05f6d 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.wst.xml.xpath.ui;singleton:=true
-Bundle-Version: 1.1.102.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-Activator: org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml
index fb67810724..145aae77b5 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml.xpath.ui</artifactId>
-  <version>1.1.102-SNAPSHOT</version>
+  <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml
index 245228c69a..79c4cdbeca 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml
@@ -95,10 +95,10 @@
 	          autoinsert="true" context="xsl_xpath" deleted="false"
 	          description='The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang returns false. If there is such an attribute, then lang returns true if the attribute value is equal to the argument ignoring case, or if there is some suffix starting with - such that the attribute value is equal to the argument ignoring that suffix of the attribute value and ignoring case.'
 	          enabled="true" name="lang(string)">lang(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.number"
+	<template id="org.eclipse.wst.xslt.templates.xpath.boolean"
 	          autoinsert="true" context="xsl_xpath" deleted="false"
 	          description='Returns a boolean false value.'
-	          enabled="true" name="number(arg)">number(${cursor})</template>
+	          enabled="true" name="boolean(arg)">number(${cursor})</template>
 	<template id="org.eclipse.wst.xslt.templates.xpath.number"
 	          autoinsert="true" context="xsl_xpath" deleted="false"
 	          description='Returns the numeric value of the argument. The argument could be a boolean, string, or node-set.'
@@ -119,10 +119,6 @@
 	          autoinsert="true" context="xsl_xpath" deleted="false"
 	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
 	          enabled="true" name="round(number)">round(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.round"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
-	          enabled="true" name="round(number)">round(${cursor})</template>
 	          
 	<!-- XSL XPath Extensions -->
 	<template id="org.eclipse.wst.xslt.templates.xpath.xslkey"
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
index 524340871d..b819cc8294 100644
--- a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
+++ b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xsl.feature"
       label="%featureName"
-      version="1.3.401.qualifier"
+      version="1.3.500.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.xsl"
       license-feature="org.eclipse.license"
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml
index d9e6e13b93..89b053dc4e 100644
--- a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml
+++ b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xsl.feature</artifactId>
-  <version>1.3.401-SNAPSHOT</version>
+  <version>1.3.500-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <name>XSLT FeaturePlugin</name>
 
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
index 24a2e31ecb..4f9a2dfaeb 100644
--- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
+++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.xsl_sdk.feature"
       label="%featureName"
-      version="1.1.502.qualifier"
+      version="1.1.600.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
index a52e2867c6..fe29b9d7fc 100644
--- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
+++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xsl_sdk.feature</artifactId>
-  <version>1.1.502-SNAPSHOT</version>
+  <version>1.1.600-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>