JBDS-3612 refactor 'jbds' and 'jbdevstudio' to 'devstudio'

JBDS-3606 wrong uninstall icon filename; fix .gitignores; fix DEVSTUDIO_LOCATION in Unpacker.java

another place to switch from jbdevstudio to devstudio

Author: nickboldt

Diff for: .gitignore

@@ -1,5 +1,5 @@
 workspace
-jbds-echoproperties.txt
+*echoproperties.txt
 .DS_Store
 target*/
 bin

Diff for: README.md

@@ -44,7 +44,7 @@ After a successful build, three artifacts are produced:
 * an update site (also known as a p2 repository)
 
 
-Installer jar(s) will be produced in installer/target/ and can be installed using 'java -jar jbdevstudio-*.jar'
+Installer jar(s) will be produced in installer/target/ and can be installed using 'java -jar devstudio-*.jar'
 
 Sources zip can be found in results/target/; you can build from the source zip in there by unpacking it, then using the same instructions above.
 
@@ -53,7 +53,7 @@ An unpacked update site, which can be used to perform an initial install or to i
 The installer jar can be used as an archived update site. Launch Eclipse or Red Hat Developer Studio, then select:
 
   Help > Install New Software... > Add... > Archive... > Browse for the Red Hat Developer Studio installer jar > OK > 
-    Work with: jar:file:/path/to/jbdevstudio-product-*.jar!/ > Install the Red Hat Developer Studio feature(s) > 
+    Work with: jar:file:/path/to/devstudio-product-*.jar!/ > Install the Red Hat Developer Studio feature(s) > 
       Restart when prompted. 
 
 

Diff for: features/com.jboss.devstudio.core.feature/feature.xml

@@ -177,7 +177,7 @@
     <import feature="org.eclipse.tm.terminal.connector.ssh.feature" version="4.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.tm.terminal.connector.telnet.feature" version="4.0.0" match="greaterOrEqual"/>
 
-    <!-- JBDS-3495 add plugins instead of feature to avoid p2.inf instruction which forces JBDS to include Docker nightly update site in disabled state -->
+    <!-- JBDS-3495 add plugins instead of feature to avoid p2.inf instruction which forces devstudio to include Docker nightly update site in disabled state -->
     <import plugin="org.eclipse.linuxtools.docker.core" version="1.1.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.linuxtools.docker.ui" version="1.1.0" match="greaterOrEqual"/>
     <!-- do we actually need this? -->

Diff for: features/pom.xml

@@ -10,7 +10,7 @@
 	<groupId>com.jboss.devstudio.core</groupId>
 	<artifactId>features</artifactId>
 	<version>10.0.0-SNAPSHOT</version>
-	<name>JBDS - Product Features - Core</name>
+	<name>devstudio - Product Features - Core</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>com.jboss.devstudio.core.feature</module>

Diff for: installer/build.xml

@@ -1,7 +1,7 @@
 <!-- A build file to create an IzPack (http://www.izforge.com/izpack/) installer.
 $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
 -->
-<project name="JBDS Installer" default="installer">
+<project name="Red Hat Developer Studio Installer" default="installer">
   <taskdef resource="net/sf/antcontrib/antlib.xml" />
 
   <property file="local.properties" />
@@ -15,7 +15,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
   <property name="build.id" value="${build.number}" />
 
   <!-- Manifest version info -->
-  <property name="specification.title" value="JBDS Installer" />
+  <property name="specification.title" value="Red Hat Developer Studio Installer" />
 
   <property name="implementation.vendor" value="JBoss by Red Hat (http://www.jboss.com/)" />
   <property name="implementation.vendor.id" value="${implementation.url}" />
@@ -28,7 +28,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
   <property name="thirdparty.root" value="${basedir}/../thirdparty" />
 
   <property name="project.root" value="${basedir}/" />
-  <property name="izpack.home" value="${project.root}/../releng/jbds-build/IzPack-4.3.4" />
+  <property name="izpack.home" value="${project.root}/../releng/devstudio-build/IzPack-4.3.4" />
   <property name="izpack.langpacks" value="${basedir}/etc/local-izpack/bin/langpacks/installer" />
 
   <property name="distribution.dir" location="${build.dir}/distribution" />
@@ -53,8 +53,8 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
 
   <target name="buildcustompanels">
     <echo message="Building panels ..." />
-    <echoproperties destfile="${build.dir}/../../jbds-echoproperties.txt" />
-    <echo>Build properties written to ${build.dir}/../../jbds-echoproperties.txt</echo>
+    <echoproperties destfile="${build.dir}/../../devstudio-echoproperties.txt" />
+    <echo>Build properties written to ${build.dir}/../../devstudio-echoproperties.txt</echo>
     <mkdir dir="${build.dir}/classes" />
     <mkdir dir="${build.dir}/izpack-panels" />
 
@@ -204,7 +204,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
     </if>
   </target>
 
-  <target name="prepare-jbds" depends="prepare-distribution-properties">
+  <target name="prepare-devstudio" depends="prepare-distribution-properties">
     <delete includeemptydirs="true" defaultexcludes="false" failonerror="false">
       <fileset dir="${studio.dist}" />
     </delete>
@@ -237,7 +237,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
   </macrodef>
 
   <target name="prepare-distribution"
-    depends="prepare-distribution-properties, prepare-jbosseap, prepare-jbds"
+    depends="prepare-distribution-properties, prepare-jbosseap, prepare-devstudio"
     description="Copies the needed files into the distribution dir as needed by install.xml">
 
     <condition property="nightly_build_qualifier" value="" else="-${buildQualifier}">
@@ -321,24 +321,24 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
     <property name="installer.name" value="jboss-devstudio-${specification.version}-installer-standalone" />
     <property name="installer.eap.name" value="jboss-devstudio-${specification.version}-installer-eap" />
 
-    <property name="implementation.title" value="JBDS Installer [${update.site.version}]" />
+    <property name="implementation.title" value="Red Hat Developer Studio Installer [${update.site.version}]" />
     <property name="implementation.url" value="http://www.jboss.org/" />
     <property name="implementation.version" value="${update.site.version}.${buildQualifier}" />
 
-    <property name="artifacts.jbds.update" value="${project.build.directory}/jbdevstudio-product-installer-Update-${buildQualifier}.zip" />
+    <property name="artifacts.devstudio.update" value="${project.build.directory}/devstudio-product-installer-Update-${buildQualifier}.zip" />
   </target>
 
   <target name="create-temp-update-sites">
     <!-- this update site zip is only used to produce the installer -->
     <echo>Prepare update site zip </echo>
-    <zip destfile="${artifacts.jbds.update}" whenempty="fail">
-      <zipfileset dir="${project.build.directory}/repository" prefix="jbds"/>
+    <zip destfile="${artifacts.devstudio.update}" whenempty="fail">
+      <zipfileset dir="${project.build.directory}/repository" prefix="devstudio"/>
     </zip>
   </target>
 
   <target name="installer" depends="init, init-properties, create-temp-update-sites, buildcustompanels, prepare-distribution">
 
-    <echo message="Building JBDS Installers with nightly_build_qualifier=${nightly_build_qualifier}"/>
+    <echo message="Building Red Hat Developer Studio Installers with nightly_build_qualifier=${nightly_build_qualifier}"/>
     <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask" classpathref="izpack.classpath" />
 
     <mkdir dir="${build.dir}" />
@@ -349,7 +349,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
       <then>
         <var name="install.group" value="jbosseap" />
         <!-- Now call the izpack compiler -->
-        <echo message="Building JBDS Installer (EAP Bundle): ${installer.eap.name}.jar"/>
+        <echo message="Building Red Hat Developer Studio Installer (EAP Bundle): ${installer.eap.name}.jar"/>
         <izpack input="${src.dir}/config/install.xml"
                 output="${destination.dir}/${installer.eap.name}.jar"
                 installerType="standard"
@@ -371,9 +371,9 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
         <var name="install.group" unset="true" />
       </then>
     </if>
-    <var name="install.group" value="jbds" />
+    <var name="install.group" value="devstudio" />
     <!-- Now call the izpack compiler -->
-    <echo message="Building JBDS Installer (Standalone): ${installer.name}.jar"/>
+    <echo message="Building Red Hat Developer Studio Installer (Standalone): ${installer.name}.jar"/>
     <izpack input="${src.dir}/config/install.xml"
             output="${destination.dir}/${installer.name}.jar"
             installerType="standard"
@@ -392,15 +392,15 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
   			<isset property="skipTests" />
   		</not>
   		<then>
-			<loadfile srcfile="${basedir}/jbdevstudio-test-install.xml" property="jbdevstudio-test-install.xml.updated">
+			<loadfile srcfile="${basedir}/devstudio-test-install.xml" property="devstudio-test-install.xml.updated">
 				<filterchain>
 					<expandproperties/>
 				</filterchain>
 			</loadfile>
-			<echo file="${project.build.directory}/jbdevstudio-test-install.xml">${jbdevstudio-test-install.xml.updated}</echo>
+			<echo file="${project.build.directory}/devstudio-test-install.xml">${devstudio-test-install.xml.updated}</echo>
 
 			<java jar="${destination.dir}/${installer.name}.jar" fork="true" failonerror="true" maxmemory="512m" jvmargs="-DTRACE=true -Djava.security.manager -Djava.security.policy=${basedir}/java.policy">
-				<arg line="${project.build.directory}/jbdevstudio-test-install.xml"/>
+				<arg line="${project.build.directory}/devstudio-test-install.xml"/>
 			</java>
   		</then>
   	</if>
@@ -419,7 +419,7 @@ $Id: build.xml,v 1.1.2.14 2006/03/31 07:47:31 starksm Exp $
     <!-- clean up build-time artifacts so they won't be published -->
     <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="${project.build.directory}/update"/>
-      <fileset file="${artifacts.jbds.update}"/>
+      <fileset file="${artifacts.devstudio.update}"/>
     </delete>
   </target>
 

Diff for: installer/category.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 	<description>Red Hat Developer Studio Installer P2 Repository</description>
-	<category-def name="jbds" label="Red Hat Developer Studio">
+	<category-def name="devstudio" label="Red Hat Developer Studio">
 		<description>Red Hat Developer Studio Features</description>
 	</category-def>
 	<bundle id="com.jboss.devstudio.core.package">
-		<category name="jbds" />
+		<category name="devstudio" />
 	</bundle>
 	<feature id="org.testng.eclipse">
-		<category name="jbds" />
+		<category name="devstudio" />
 	</feature>
 </site>

Diff for: installer/jbdevstudio-test-install.xml renamed to installer/devstudio-test-install.xml

@@ -3,11 +3,11 @@
 <com.jboss.devstudio.core.installer.HTMLInfoPanelWithRootWarning id="introduction"/>
 <com.izforge.izpack.panels.HTMLLicencePanel id="licence"/>
 <com.jboss.devstudio.core.installer.PathInputPanel id="target">
-<installpath>${project.build.directory}/jbdevstudio-install-test</installpath>
+<installpath>${project.build.directory}/devstudio-install-test</installpath>
 </com.jboss.devstudio.core.installer.PathInputPanel>
 <com.jboss.devstudio.core.installer.JREPathPanel id="jre"/>
 <com.jboss.devstudio.core.installer.JBossAsSelectPanel id="as">
-<installgroup>jbds</installgroup>
+<installgroup>devstudio</installgroup>
 </com.jboss.devstudio.core.installer.JBossAsSelectPanel>
 <com.jboss.devstudio.core.installer.UpdatePacksPanel id="updatepacks"/>
 <com.jboss.devstudio.core.installer.DiskSpaceCheckPanel id="diskspacecheck"/>

Diff for: installer/rootfiles/compositeArtifacts.xml

@@ -6,6 +6,6 @@
 <property name='p2.timestamp' value='1424269905000'/>
 </properties>
 <children size='1'>
-<child location='jbds/'/>
+<child location='devstudio/'/>
 </children>
 </repository>

Diff for: installer/rootfiles/compositeContent.xml

@@ -6,6 +6,6 @@
 <property name='p2.timestamp' value='1424269905000'/>
 </properties>
 <children size='1'>
-<child location='jbds/'/>
+<child location='devstudio/'/>
 </children>
 </repository>

Diff for: installer/src/config/install-pack-installer.xml

@@ -3,7 +3,7 @@
 <!DOCTYPE installation PUBLIC "//IzPack/4.3.3" "resources/installation.dtd">
 <installation version="1.0">
   <packs>
-    <pack name="P2 Director Application" id="jbds-installer" installGroups="jbds,jbosseap" required="yes">
+    <pack name="P2 Director Application" id="devstudio-installer" installGroups="devstudio,jbosseap" required="yes">
       <description>
         P2 Director to install Red Hat Developer Studio @{specification.version.presentstring}
       </description>
@@ -14,26 +14,26 @@
       <fileset dir="studio" targetdir="$INSTALL_PATH/studio">
       </fileset>
 
-      <singlefile src="config/resources/jbdevstudio-unity" target="$INSTALL_PATH/jbdevstudio-unity" condition="izpack.linuxinstall" />
-      <executable targetfile="$INSTALL_PATH/jbdevstudio-unity" condition="izpack.linuxinstall" />
+      <singlefile src="config/resources/devstudio-unity" target="$INSTALL_PATH/devstudio-unity" condition="izpack.linuxinstall" />
+      <executable targetfile="$INSTALL_PATH/devstudio-unity" condition="izpack.linuxinstall" />
       <singlefile src="config/resources/icons/48-devstudio.icon.png" target="$INSTALL_PATH/studio/48-devstudio.icon.png" condition="izpack.linuxinstall" />
       <singlefile src="config/resources/icons/48-uninstall.icon.png" target="$INSTALL_PATH/studio/48-uninstall.icon.png" condition="izpack.linuxinstall" />
       <singlefile src="config/resources/icons/devstudio.ico" target="$INSTALL_PATH/studio/devstudio.ico" os="windows" />
       <singlefile src="config/resources/icons/uninstall.ico" target="$INSTALL_PATH/studio/uninstall.ico" os="windows" />
 
-      <singlefile src="config/resources/jbdevstudio.bat" target="$INSTALL_PATH/jbdevstudio.bat" os="windows" />
-      <parsable targetfile="$INSTALL_PATH/jbdevstudio.bat" os="windows" />
-      <executable targetfile="$INSTALL_PATH/jbdevstudio.bat" os="windows" />
+      <singlefile src="config/resources/devstudio.bat" target="$INSTALL_PATH/devstudio.bat" os="windows" />
+      <parsable targetfile="$INSTALL_PATH/devstudio.bat" os="windows" />
+      <executable targetfile="$INSTALL_PATH/devstudio.bat" os="windows" />
 
       <singlefile src="config/resources/runtimes-readme.txt" target="$INSTALL_PATH/runtimes/readme.txt" />
 
     </pack>
-    <pack name="Red Hat Developer Studio @{specification.version.presentstring}" id="jbds.update" installGroups="jbosseap,jbds" required="no">
+    <pack name="Red Hat Developer Studio @{specification.version.presentstring}" id="devstudio.update" installGroups="jbosseap,devstudio" required="no">
       <description>
         Red Hat Developer Studio @{specification.version.presentstring} Update
       </description>
     </pack>
-    <pack name="Red Hat Developer Studio @{specification.version.presentstring} Metadata Generation" id="jbds.generate" installGroups="jbosseap,jbds" required="no">
+    <pack name="Red Hat Developer Studio @{specification.version.presentstring} Metadata Generation" id="devstudio.generate" installGroups="jbosseap,devstudio" required="no">
       <description>
         Red Hat Developer Studio @{specification.version.presentstring} Metadata Generation
       </description>

Diff for: installer/src/config/install.xml

@@ -8,7 +8,7 @@
 		<appversion>
 			@{specification.version}, JBoss AS @{jboss.version}
 		</appversion>
-		<appsubpath>jbdevstudio</appsubpath>
+		<appsubpath>devstudio</appsubpath>
 		<authors>
 			<author name="JBoss by Red Hat" email="[email protected]" />
 		</authors>
@@ -145,7 +145,7 @@
 		<!-- Do the install -->
 		<panel classname="InstallPanel" id="install" />
 
-		<!-- This panel creates links folder in Eclipse home directory and creates jbds.link file -->
+		<!-- This panel creates links folder in Eclipse home directory and creates devstudio.link file -->
 		<panel classname="CreateLinkPanel" id="createlink"/>
 
 		<!-- This panel creates shortcuts -->
@@ -165,7 +165,7 @@
 		<!-- disabled to fix issue with windows	-->
 		<!-- installer on windows vista is not asking 
 				 for privilege lifting which leads to errors 
-				 during addin JBDS installation to the registry-->
+				 during addin devstudio installation to the registry-->
 		<!-- listener installer="RegistryInstallerListener"
 			uninstaller="RegistryUninstallerListener" >
 			<os name="Windows 7"/>
@@ -195,5 +195,5 @@
 	<jar src="../../tools/lib/ant.jar" />
 	<jar src="../../tools/lib/ant-launcher.jar" />
 	<jar src="../../tools/lib/gson-2.3.1.jar" />
-	<jar src="@{artifacts.jbds.update}" />
+	<jar src="@{artifacts.devstudio.update}" />
 </installation>

Diff for: installer/src/config/resources/DevstudioFeaturesSpec.json

@@ -1,14 +1,14 @@
 [
 	{
 		"id"         :"com.jboss.devstudio.core.package",
-		"path"       :"jbds",
+		"path"       :"devstudio",
 		"label"      :"Red Hat Developer Studio Product",
 		"description":"",
 		"selected"   :"true"
 	},
 	{
 		"id"         :"org.testng.eclipse.feature.group",
-		"path"       :"jbds",
+		"path"       :"devstudio",
 		"label"      :"TestNG",
 		"description":"",
 		"selected"   :"true"