### Eclipse Workspace Patch 1.0
#P devstudio-2.1.x
Index: devstudio-installer/build.xml
===================================================================
--- devstudio-installer/build.xml	(revision 5581)
+++ devstudio-installer/build.xml	(working copy)
@@ -18,20 +18,22 @@
 
 	<!-- Manifest version info -->
 	<property name="specification.title" value="JBDS Installer" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}" />
-	<property name="specification.vendor" value="JBoss (http://www.jboss.org/)" />
+	
+	<!-- 2.1.0.v200909091234R-H123-GA -->
+	<property name="specification.version"  value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="specification.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="specification.version.presentstring" value="${version.presentstring}" />
+
 	<property name="implementation.title" value="JBDS Installer [${version.name}]" />
 	<property name="implementation.url" value="http://www.jboss.org/" />
-	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build.id=${build.id})" />
-	<property name="implementation.vendor" value="JBoss, a division of Red Hat" />
+	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="implementation.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="implementation.vendor.id" value="${implementation.url}" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}-${product.buildQualifier}" />
 
 	<!-- should be set explicit externally to "win32", "rhel" or "mac" -->
 	<property name="platform.name" value="unknown" />
-	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}-${product.buildQualifier}" />
-	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}-${product.buildQualifier}" />
+	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}" />
+	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}" />
 
 	<property name="thirdparty.licenses" value="${basedir}/thirdparty/licenses" />	
 	<property name="thirdparty.root" value="${basedir}/thirdparty" />
@@ -242,11 +244,25 @@
 	</target>
 
 	<target name="prepare-transforms" depends="prepare-distribution-properties" unless="test.build">
+		<property environment="env" />
+
 		<!-- It uses vetsionTag.richfaces because product feature build invoked inside richfaces build if branding is enabled -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
+		<condition property="product.buildQualifierSuffix" value="-H${env.BUILD_NUMBER}" else="">
+			<and>
+				<isset property="env.BUILD_ID" />
+			</and>
+		</condition>
+		<propertyregex property="versionTags.richfaces.qualified"
+		               input="${versionTags.richfaces}"
+		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
+		               override="true"
+		/>
 		<echo file="${distribution.dir}/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" append="true">org.eclipse.equinox.transforms.hook,1.0.0.v20080610,file:plugins/org.eclipse.equinox.transforms.hook_1.0.0.v20080610.jar,4,false
 org.eclipse.equinox.transforms.xslt,1.0.0.v20080610,file:plugins/org.eclipse.equinox.transforms.xslt_1.0.0.v20080610.jar,1,true
-org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces}-${product.buildQualifier},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces}-${product.buildQualifier}.jar,1,true
-com.jboss.jbds.product,${versionTags.richfaces}-${product.buildQualifier},file:plugins/com.jboss.jbds.product_${versionTags.richfaces}-${product.buildQualifier}.jar,4,false
+org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces.qualified},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces.qualified}.jar,1,true
+com.jboss.jbds.product,${versionTags.richfaces.qualified},file:plugins/com.jboss.jbds.product_${versionTags.richfaces.qualified}.jar,4,false
 </echo>
 	</target>
 
@@ -288,10 +304,9 @@
 	        depends="prepare-distribution-properties, prepare-eclipse, prepare-jbosseap, prepare-jbds, prepare-springide, prepare-testng, prepare-branding, prepare-transforms, remove-optional"
 	        description="Copies the needed files into the distribution dir as needed by install.xml"
 	>
-		
-		<condition property="dash.qualifier" value="" else="-${product.buildQualifier}">
+		<condition property="nightly_build_qualifier" value="-${product.buildQualifier}-${version.tag}" else="-${version.tag}">
 			<and>
-				<equals arg1="${product.buildType}" arg2="R" />
+				<equals arg1="${product.buildType}" arg2="N" />
 			</and>
 		</condition>
 
@@ -303,11 +318,12 @@
 				<exclude name="**/*.ico" />
 			</fileset>
 			<filterset>
-				<filter token="full_version" value="${specification.version}" />
+				<!-- [JBIDE-4200] full_version is now just x.y.z; for R builds get x.y.z.GA; all others get x.y.z.vYYYYMMDDhhmmN-H123-M4 -->
+				<filter token="full_version" value="${version.major}.${version.minor}.${version.revision}" />
 				<filter token="version_name" value="${version.presentstring}" />
 				<filter token="major_version" value="${version.major}" />
 				<filter token="version_string" value="${version.presentstring}" />
-				<filter token="nightly_build_qualifier" value="${dash.qualifier}" />
+				<filter token="nightly_build_qualifier" value="${nightly_build_qualifier}" />
 			</filterset>
 		</copy>
 
@@ -431,7 +447,7 @@
 		
 		<antcall target="installer" >
 			<param name="product.buildType" value="N" />
-			<param name="product.buildQualifier" value="R200811001100" />
+			<param name="product.buildQualifier" value="v200811001100R-H123" />
 		</antcall>
 	</target>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/build.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/build.xml	(revision 5580)
+++ releng/org.jboss.ide.eclipse.releng/builders/build.xml	(working copy)
@@ -116,11 +116,11 @@
 			</then>
 		</if>
 
-		<!-- eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
 		<propertyregex property="product.versionTag"
 		               input="${releaseNumber}"
 		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
-		               replace="\1.\2.\3.${product.buildQualifier}-\4${product.buildQualifierSuffix}"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
 		               override="true"
 		/>
 		<property name="jbds.download.root" value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
Index: releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(revision 5580)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(working copy)
@@ -68,11 +68,11 @@
 			</then>
 		</if>
 
-		<!-- eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
 		<propertyregex property="product.versionTag"
 		               input="${releaseNumber}"
 		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
-		               replace="\1.\2.\3.${product.buildQualifier}-\4${product.buildQualifierSuffix}"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
 		               override="true"
 		/>
 		<stopwatch name="buildTimer" />
@@ -119,8 +119,8 @@
 							</sequential>
 						</for>
 						<ant antfile="../builder-wrap.xml" target="main">
-							<property name="ant-file" value="${basedir}/productBuild.xml"/>
-							<property name="ant-target" value="build.standalone.release"/>
+							<property name="ant-file" value="${basedir}/productBuild.xml" />
+							<property name="ant-target" value="build.standalone.release" />
 						</ant>
 						<!--runtarget target="build.standalone.release" /-->
 						<mkdir dir="${product.build.directory}/tests/test-results/" />
@@ -172,8 +172,8 @@
 					</case>
 					<case value="tests">
 						<ant antfile="../builder-wrap.xml" target="main">
-							<property name="ant-file" value="${basedir}/productBuild.xml"/>
-							<property name="ant-target" value="tests"/>
+							<property name="ant-file" value="${basedir}/productBuild.xml" />
+							<property name="ant-target" value="tests" />
 						</ant>
 					</case>
 					<case value="installer">
@@ -184,8 +184,8 @@
 					</case>
 					<case value="compile">
 						<ant antfile="../builder-wrap.xml" target="main">
-							<property name="ant-file" value="${basedir}/productBuild.xml"/>
-							<property name="ant-target" value="run.builders"/>
+							<property name="ant-file" value="${basedir}/productBuild.xml" />
+							<property name="ant-target" value="run.builders" />
 						</ant>
 					</case>
 				</switch>
@@ -194,19 +194,19 @@
 	</target>
 
 	<target name="tests">
-		<property file="${tags-file}" prefix="versionTags" />		
+		<property file="${tags-file}" prefix="versionTags" />
 		<property file="${build.output.directory}/buildData.properties" />
 		<runBuilder builder="tests" />
 		<ant target="testBuild" antfile="${builder.root}/tests/testBuild.xml" dir="${builder.root}/tests" />
 	</target>
 
 	<target name="tests.run">
-		<property file="${tags-file}" prefix="versionTags" />		
+		<property file="${tags-file}" prefix="versionTags" />
 		<property file="${build.output.directory}/buildData.properties" />
 		<ant target="testBuild" antfile="${builder.root}/tests/testBuild.xml" dir="${builder.root}/tests" />
 	</target>
 
-	
+
 	<target name="post-build">
 		<property file="${product.build.root}/buildData.properties" />
 		<!--ant antfile="buildResults.xml" dir="buildResults" target="build.results" inheritall="true"/-->
@@ -417,7 +417,7 @@
 	<target name="build.standalone.release" depends="build-sources,run.builders,extract.features.and.plugins">
 		<for list="${platform.names}" param="platform" parallel="true" threadcount="2">
 			<sequential>
-				
+
 				<echo>build.dest.@{platform}=${build.dest.@{platform}}</echo>
 				<zip destfile="${build.dest.@{platform}}.zip" basedir="${build.dest.@{platform}}" />
 				<!-- TODO: Ant 1.7.x required for format="MD5SUM" -->
@@ -470,7 +470,7 @@
 			</sequential>
 		</for>
 	</target>
-	
+
 	<target name="build.bundled.release.zip" depends="build.bundled.release">
 		<zip destfile="${build.dest}.zip" basedir="${build.dest}" />
 		<!-- TODO: Ant 1.7.x required for format="MD5SUM" -->
@@ -556,7 +556,7 @@
 	</target>
 
 	<target name="build.installer">
-		<property file="${tags-file}" prefix="versionTags" />		
+		<property file="${tags-file}" prefix="versionTags" />
 		<property file="${build.output.directory}/buildData.properties" />
 		<ant antfile="buildInstaller.xml" inheritall="true" />
 	</target>
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(revision 5575)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(working copy)
@@ -117,29 +117,29 @@
 		<property name="jbds-download-root" value="${jbds.download.root}" />
 
 		<property name="jbds-installer-win32-filename"
-		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}-${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-filename"
-		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-macosx-carbon-filename"
-		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-installer-eap-win32-filename"
-		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-filename"
-		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-macosx-carbon-filename"
-		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-all-win32-filename" value="${product.name}-ALL-win32-${product.versionTag}.zip" />
#P devstudio-trunk
Index: devstudio-installer/build.xml
===================================================================
--- devstudio-installer/build.xml	(revision 5575)
+++ devstudio-installer/build.xml	(working copy)
@@ -16,20 +16,22 @@
 
 	<!-- Manifest version info -->
 	<property name="specification.title" value="JBDS Installer" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}" />
-	<property name="specification.vendor" value="JBoss (http://www.jboss.org/)" />
+	
+	<!-- 2.1.0.v200909091234R-H123-GA -->
+	<property name="specification.version"  value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="specification.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="specification.version.presentstring" value="${version.presentstring}" />
+
 	<property name="implementation.title" value="JBDS Installer [${version.name}]" />
 	<property name="implementation.url" value="http://www.jboss.org/" />
-	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build.id=${build.id})" />
-	<property name="implementation.vendor" value="JBoss by Red Hat" />
+	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="implementation.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="implementation.vendor.id" value="${implementation.url}" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}-${product.buildQualifier}" />
 
 	<!-- should be set explicit externally to "win32", "rhel" or "mac" -->
 	<property name="platform.name" value="unknown" />
-	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}-${product.buildQualifier}" />
-	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}-${product.buildQualifier}" />
+	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}" />
+	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}" />
 
 	<property name="thirdparty.licenses" value="${basedir}/../thirdparty/licenses" />
 	<property name="thirdparty.root" value="${basedir}/../thirdparty" />
@@ -260,11 +262,25 @@
 	</target>
 
 	<target name="prepare-transforms" depends="prepare-distribution-properties" unless="test.build">
+		<property environment="env" />
+
 		<!-- It uses vetsionTag.richfaces because product feature build invoked inside richfaces build if branding is enabled -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
+		<condition property="product.buildQualifierSuffix" value="-H${env.BUILD_NUMBER}" else="">
+			<and>
+				<isset property="env.BUILD_ID" />
+			</and>
+		</condition>
+		<propertyregex property="versionTags.richfaces.qualified"
+		               input="${versionTags.richfaces}"
+		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
+		               override="true"
+		/>
 		<echo file="${distribution.dir}/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" append="true">org.eclipse.equinox.transforms.hook,${org.eclipse.equinox.transforms.hook.version},file:plugins/org.eclipse.equinox.transforms.hook_${org.eclipse.equinox.transforms.hook.version}.jar,4,false
 org.eclipse.equinox.transforms.xslt,${org.eclipse.equinox.transforms.xslt.version},file:plugins/org.eclipse.equinox.transforms.xslt_${org.eclipse.equinox.transforms.xslt.version}.jar,1,true
-org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces}-${product.buildQualifier},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces}-${product.buildQualifier}.jar,1,true
-com.jboss.jbds.product,${versionTags.richfaces}-${product.buildQualifier},file:plugins/com.jboss.jbds.product_${versionTags.richfaces}-${product.buildQualifier}.jar,4,false
+org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces.qualified},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces.qualified}.jar,1,true
+com.jboss.jbds.product,${versionTags.richfaces.qualified},file:plugins/com.jboss.jbds.product_${versionTags.richfaces.qualified}.jar,4,false
 </echo>
 	</target>
 
@@ -325,10 +341,9 @@
 	        depends="prepare-distribution-properties, prepare-eclipse, prepare-jbosseap, prepare-jbds, prepare-springide, prepare-testng, prepare-branding, prepare-transforms, remove-optional"
 	        description="Copies the needed files into the distribution dir as needed by install.xml"
 	>
-
-		<condition property="dash.qualifier" value="" else="-${product.buildQualifier}">
+		<condition property="nightly_build_qualifier" value="-${product.buildQualifier}-${version.tag}" else="-${version.tag}">
 			<and>
-				<equals arg1="${product.buildType}" arg2="R" />
+				<equals arg1="${product.buildType}" arg2="N" />
 			</and>
 		</condition>
 
@@ -340,11 +355,12 @@
 				<exclude name="**/*.ico" />
 			</fileset>
 			<filterset>
-				<filter token="full_version" value="${specification.version}" />
+				<!-- [JBIDE-4200] full_version is now just x.y.z; for R builds get x.y.z.GA; all others get x.y.z.vYYYYMMDDhhmmN-H123-M4 -->
+				<filter token="full_version" value="${version.major}.${version.minor}.${version.revision}" />
 				<filter token="version_name" value="${version.presentstring}" />
 				<filter token="major_version" value="${version.major}" />
 				<filter token="version_string" value="${version.presentstring}" />
-				<filter token="nightly_build_qualifier" value="${dash.qualifier}" />
+				<filter token="nightly_build_qualifier" value="${nightly_build_qualifier}" />
 			</filterset>
 		</copy>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(revision 5580)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(working copy)
@@ -127,29 +127,29 @@
 		<property name="jbds-download-root" value="${jbds.download.root}" />
 
 		<property name="jbds-installer-win32-filename"
-		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}-${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-filename"
-		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-macosx-carbon-filename"
-		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-installer-eap-win32-filename"
-		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-filename"
-		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-macosx-carbon-filename"
-		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-all-win32-filename" value="${product.name}-ALL-win32-${product.versionTag}.zip" />
Index: releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(revision 5580)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(working copy)
@@ -41,14 +41,17 @@
 
 	<target name="build">
 		<property environment="env" />
+		<!-- eg: 3.1.0.M3 -->
 		<property name="product.releaseNumber" value="${releaseNumber}" />
 		<property file="${tags-file}" prefix="versionTags" />
 
-		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier: see also ../build.xml#init -->
 		<!-- eg., 200901311234 -->
 		<var name="product.buildTimestamp" value="${DSTAMP}${TSTAMP}" />
-		<!-- N200901311234 or N200901311234-H123 -->
-		<var name="product.buildQualifier" value="${product.buildType}${product.buildTimestamp}" />
+		<!-- v200901311234N -->
+		<var name="product.buildQualifier" value="v${product.buildTimestamp}${product.buildType}" />
+		<var name="product.buildQualifierSuffix" value="" />
+
+		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier: see also ../build.xml#init -->
 		<if>
 			<isset property="env.BUILD_ID" />
 			<then>
@@ -59,12 +62,20 @@
 				               replace="\1\2\3\4\5"
 				               override="true"
 				/>
-				<var name="product.buildQualifier" value="${product.buildType}${product.buildTimestamp}-H${env.BUILD_NUMBER}" />
+				<var name="product.buildQualifier" value="v${product.buildTimestamp}${product.buildType}" />
+				<!-- -H123 -->
+				<var name="product.buildQualifierSuffix" value="-H${env.BUILD_NUMBER}" />
 			</then>
 		</if>
-		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier -->
+
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
+		<propertyregex property="product.versionTag"
+		               input="${releaseNumber}"
+		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
+		               override="true"
+		/>
 
-		<property name="product.versionTag" value="${releaseNumber}-${product.buildQualifier}" />
 		<stopwatch name="buildTimer" />
 		<property name="jbds.download.root" value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
 		<property name="product.build.directory" value="${product.build.root}/${releaseNumber}/${product.buildTimestamp}" />
@@ -97,18 +108,16 @@
 			</sequential>
 		</for>
 	</target>
-	
-    <target name="standalone.product">
-    	<for list="${platform.names}" param="platform">
+
+	<target name="standalone.product">
+		<for list="${platform.names}" param="platform">
 			<sequential>
-				<var name="build.dest.@{platform}"
-				     value="${product.build.directory}/all/${product.name}-ALL-@{platform}-${product.versionTag}"
-				/>
+				<var name="build.dest.@{platform}" value="${product.build.directory}/all/${product.name}-ALL-@{platform}-${product.versionTag}" />
 			</sequential>
 		</for>
 		<ant antfile="../builder-wrap.xml" target="main">
-			<property name="ant-file" value="${basedir}/productBuild.xml"/>
-			<property name="ant-target" value="build.standalone.release"/>
+			<property name="ant-file" value="${basedir}/productBuild.xml" />
+			<property name="ant-target" value="build.standalone.release" />
 		</ant>
 		<mkdir dir="${product.build.directory}/tests/test-results/" />
 		<!-- obviously two echos below should be replaces by copying two files -->
@@ -147,42 +156,42 @@
 				&lt;/data&gt;
 			&lt;/report&gt;
 		</echo>
-    </target>
-	
-    <target name="update-site">
+	</target>
+
+	<target name="update-site">
 		<!--./build-site.sh development $builddir $releasetype -DnoPublish=true -Dtags-file=$WORKSPACE/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbosstools/3.0.0.Beta1.tags -->
 		<property name="noPublish" value="true" />
 		<ant antfile="buildSite.xml" target="${product.expandedBuildDesc}" inheritall="true" />
-    </target> 
+	</target>
 
 	<target name="build-results" depends="sources">
 		<property file="${product.build.root}/buildData.properties" />
 		<ant antfile="buildResults.xml" dir="buildResults" target="build.results" inheritall="true" />
 	</target>
-	
+
 	<target name="tests" unless="skipBuildTest">
-		<property file="${tags-file}" prefix="versionTags" />		
+		<property file="${tags-file}" prefix="versionTags" />
 		<property file="${build.output.directory}/buildData.properties" />
 		<ant target="testBuild" antfile="${builder.root}/tests/testBuild.xml" dir="${builder.root}/tests" />
 	</target>
-	
+
 	<target name="installer" unless="skipInstaller">
 		<runtarget target="build.installer" />
 	</target>
-	
+
 	<target name="reports" unless="skipReports">
 		<property name="skipReports" value="1" />
 		<ant dir="${builder.root}/reports" />
 	</target>
-	
+
 	<target name="bundle.eclipse">
 		<foreach target="build.platform" param="platform.archive" inheritall="true">
 			<path>
 				<fileset dir="${eclipse.archive.path}" includes="eclipse-SDK*" />
 			</path>
 		</foreach>
-    </target>
-	
+	</target>
+
 	<target name="sources" unless="skipSources">
 		<property name="skipSources" value="1" />
 		<!-- 
@@ -215,8 +224,8 @@
 				</if>
 			</sequential>
 		</for>
-	</target>	
-	
+	</target>
+
 	<target name="post-build">
 		<property file="${product.build.root}/buildData.properties" />
 		<!--ant antfile="buildResults.xml" dir="buildResults" target="build.results" inheritall="true"/-->
@@ -269,17 +278,17 @@
 		<delete file="${build.dest}/temp.tar" />
 	</target>
 
-	<target name="product" depends="standalone.product,installer,bundle.eclipse,reports,tests,update-site,build-results"/>
-	
-	<target name="product-tests" depends="standalone.product,tests"/>
-	
-	<target name="product-compilation" >
+	<target name="product" depends="standalone.product,installer,bundle.eclipse,reports,tests,update-site,build-results" />
+
+	<target name="product-tests" depends="standalone.product,tests" />
+
+	<target name="product-compilation">
 		<ant antfile="../builder-wrap.xml" target="main">
-			<property name="ant-file" value="${basedir}/productBuild.xml"/>
-			<property name="ant-target" value="run.builders"/>
+			<property name="ant-file" value="${basedir}/productBuild.xml" />
+			<property name="ant-target" value="run.builders" />
 		</ant>
 	</target>
-	
+
 	<macrodef name="runBuilder">
 		<attribute name="builder" />
 		<sequential>
@@ -406,7 +415,7 @@
 			</if>
 		</sequential>
 	</macrodef>
-	
+
 	<target name="run.builders" unless="builders.built">
 		<property name="builders.built" value="1" />
 		<echo>builders = ${builders}</echo>
Index: releng/org.jboss.ide.eclipse.releng/builders/build.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/build.xml	(revision 5580)
+++ releng/org.jboss.ide.eclipse.releng/builders/build.xml	(working copy)
@@ -97,14 +97,17 @@
 
 	<target name="init">
 		<property environment="env" />
+		<!-- eg: 3.1.0.M3 -->
 		<property name="product.releaseNumber" value="${releaseNumber}" />
 		<property file="${tags-file}" prefix="versionTags" />
 
-		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier: see also product/productBuild.xml#build -->
 		<!-- eg., 200901311234 -->
 		<var name="product.buildTimestamp" value="${DSTAMP}${TSTAMP}" />
-		<!-- N200901311234 or N200901311234-H123 -->
-		<var name="product.buildQualifier" value="${product.buildType}${product.buildTimestamp}" />
+		<!-- v200901311234N -->
+		<var name="product.buildQualifier" value="v${product.buildTimestamp}${product.buildType}" />
+		<var name="product.buildQualifierSuffix" value="" />
+
+		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier: see also product/productBuild.xml#build -->
 		<if>
 			<isset property="env.BUILD_ID" />
 			<then>
@@ -115,12 +118,19 @@
 				               replace="\1\2\3\4\5"
 				               override="true"
 				/>
-				<var name="product.buildQualifier" value="${product.buildType}${product.buildTimestamp}-H${env.BUILD_NUMBER}" />
+				<var name="product.buildQualifier" value="v${product.buildTimestamp}${product.buildType}" />
+				<!-- -H123 -->
+				<var name="product.buildQualifierSuffix" value="-H${env.BUILD_NUMBER}" />
 			</then>
 		</if>
-		<!-- [JBIDE-3700] if running in Hudson, use that timestamp & ID instead of creating new qualifier -->
 
-		<property name="product.versionTag" value="${releaseNumber}-${product.buildQualifier}" />
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
+		<propertyregex property="product.versionTag"
+		               input="${releaseNumber}"
+		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
+		               override="true"
+		/>
 		<property name="jbds.download.root" value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
 		<property name="product.build.directory" value="${product.build.root}/${releaseNumber}/${product.buildTimestamp}" />
 	</target>
#P devstudio-3.0.0.M3
Index: devstudio-installer/build.xml
===================================================================
--- devstudio-installer/build.xml	(revision 5575)
+++ devstudio-installer/build.xml	(working copy)
@@ -16,20 +16,21 @@
 
 	<!-- Manifest version info -->
 	<property name="specification.title" value="JBDS Installer" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}" />
-	<property name="specification.vendor" value="JBoss (http://www.jboss.org/)" />
+	
+	<!-- 2.1.0.v200909091234R-H123-GA -->
+	<property name="specification.version"  value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="specification.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="specification.version.presentstring" value="${version.presentstring}" />
 	<property name="implementation.title" value="JBDS Installer [${version.name}]" />
 	<property name="implementation.url" value="http://www.jboss.org/" />
-	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build.id=${build.id})" />
-	<property name="implementation.vendor" value="JBoss by Red Hat" />
+	<property name="implementation.version" value="${version.major}.${version.minor}.${version.revision}.${product.buildQualifier}-${version.tag}" />
+	<property name="implementation.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
 	<property name="implementation.vendor.id" value="${implementation.url}" />
-	<property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}-${product.buildQualifier}" />
 
 	<!-- should be set explicit externally to "win32", "rhel" or "mac" -->
 	<property name="platform.name" value="unknown" />
-	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}-${product.buildQualifier}" />
-	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}-${product.buildQualifier}" />
+	<property name="installer.name" value="jbdevstudio-${platform.name}-${specification.version}" />
+	<property name="installer.eap.name" value="jbdevstudio-eap-${platform.name}-${specification.version}" />
 
 	<property name="thirdparty.licenses" value="${basedir}/../thirdparty/licenses" />
 	<property name="thirdparty.root" value="${basedir}/../thirdparty" />
@@ -260,11 +261,25 @@
 	</target>
 
 	<target name="prepare-transforms" depends="prepare-distribution-properties" unless="test.build">
+		<property environment="env" />
+
 		<!-- It uses vetsionTag.richfaces because product feature build invoked inside richfaces build if branding is enabled -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
+		<condition property="product.buildQualifierSuffix" value="-H${env.BUILD_NUMBER}" else="">
+			<and>
+				<isset property="env.BUILD_ID" />
+			</and>
+		</condition>
+		<propertyregex property="versionTags.richfaces.qualified"
+		               input="${versionTags.richfaces}"
+		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
+		               override="true"
+		/>
 		<echo file="${distribution.dir}/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" append="true">org.eclipse.equinox.transforms.hook,${org.eclipse.equinox.transforms.hook.version},file:plugins/org.eclipse.equinox.transforms.hook_${org.eclipse.equinox.transforms.hook.version}.jar,4,false
 org.eclipse.equinox.transforms.xslt,${org.eclipse.equinox.transforms.xslt.version},file:plugins/org.eclipse.equinox.transforms.xslt_${org.eclipse.equinox.transforms.xslt.version}.jar,1,true
-org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces}-${product.buildQualifier},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces}-${product.buildQualifier}.jar,1,true
-com.jboss.jbds.product,${versionTags.richfaces}-${product.buildQualifier},file:plugins/com.jboss.jbds.product_${versionTags.richfaces}-${product.buildQualifier}.jar,4,false
+org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces.qualified},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces.qualified}.jar,1,true
+com.jboss.jbds.product,${versionTags.richfaces.qualified},file:plugins/com.jboss.jbds.product_${versionTags.richfaces.qualified}.jar,4,false
 </echo>
 	</target>
 
@@ -325,10 +340,9 @@
 	        depends="prepare-distribution-properties, prepare-eclipse, prepare-jbosseap, prepare-jbds, prepare-springide, prepare-testng, prepare-branding, prepare-transforms, remove-optional"
 	        description="Copies the needed files into the distribution dir as needed by install.xml"
 	>
-
-		<condition property="dash.qualifier" value="" else="-${product.buildQualifier}">
+		<condition property="nightly_build_qualifier" value="-${product.buildQualifier}-${version.tag}" else="-${version.tag}">
 			<and>
-				<equals arg1="${product.buildType}" arg2="R" />
+				<equals arg1="${product.buildType}" arg2="N" />
 			</and>
 		</condition>
 
@@ -340,11 +354,12 @@
 				<exclude name="**/*.ico" />
 			</fileset>
 			<filterset>
-				<filter token="full_version" value="${specification.version}" />
+				<!-- [JBIDE-4200] full_version is now just x.y.z; for R builds get x.y.z.GA; all others get x.y.z.vYYYYMMDDhhmmN-H123-M4 -->
+				<filter token="full_version" value="${version.major}.${version.minor}.${version.revision}" />
 				<filter token="version_name" value="${version.presentstring}" />
 				<filter token="major_version" value="${version.major}" />
 				<filter token="version_string" value="${version.presentstring}" />
-				<filter token="nightly_build_qualifier" value="${dash.qualifier}" />
+				<filter token="nightly_build_qualifier" value="${nightly_build_qualifier}" />
 			</filterset>
 		</copy>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/build.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/build.xml	(revision 5579)
+++ releng/org.jboss.ide.eclipse.releng/builders/build.xml	(working copy)
@@ -124,11 +124,11 @@
 			</then>
 		</if>
 
-		<!-- eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-H123-M3 or 3.1.0.v200901311234N-M3 -->
 		<propertyregex property="product.versionTag"
 		               input="${releaseNumber}"
 		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
-		               replace="\1.\2.\3.${product.buildQualifier}-\4${product.buildQualifierSuffix}"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
 		               override="true"
 		/>
 		<property name="jbds.download.root" value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
Index: releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(revision 5579)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml	(working copy)
@@ -68,11 +68,11 @@
 			</then>
 		</if>
 
-		<!-- eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
+		<!-- [JBIDE-4200] eg: from 3.1.0.M3 we get 3.1.0.v200901311234N-M3-H123 or 3.1.0.v200901311234N-M3 -->
 		<propertyregex property="product.versionTag"
 		               input="${releaseNumber}"
 		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.]+)"
-		               replace="\1.\2.\3.${product.buildQualifier}-\4${product.buildQualifierSuffix}"
+		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
 		               override="true"
 		/>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(revision 5575)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(working copy)
@@ -127,29 +127,29 @@
 		<property name="jbds-download-root" value="${jbds.download.root}" />
 
 		<property name="jbds-installer-win32-filename"
-		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}-${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-filename"
-		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-macosx-carbon-filename"
-		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-installer-eap-win32-filename"
-		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-win32-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-filename"
-		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-linux-gtk-x86_64-filename"
-		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-linux-gtk-x86_64-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 		<property name="jbds-installer-eap-macosx-carbon-filename"
-		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${installer.version.tag}-${product.buildQualifier}.jar"
+		          value="jbdevstudio-eap-macosx-carbon-${installer.version.major}.${installer.version.minor}.${installer.version.revision}.${product.buildQualifier}.${installer.version.tag}.jar"
 		/>
 
 		<property name="jbds-all-win32-filename" value="${product.name}-ALL-win32-${product.versionTag}.zip" />