Index: eap-config/core-packs.xml
===================================================================
--- eap-config/core-packs.xml	(revision 1832)
+++ eap-config/core-packs.xml	(working copy)
@@ -251,7 +251,6 @@
      			 targetdir="$INSTALL_PATH/@{jboss.dist.dir}/jboss-as/bin">
 			<include name="*.bat"/>
      	</fileset>
-     	<singlefile src="@{install.config.dir}/scripts/run.exe" target="$INSTALL_PATH/@{jboss.dist.dir}/jboss-as/bin/run.exe" os="windows"/>
      </pack>
      
      <!-- Picketlink IDM --><!--
Index: eap-config/scripts/run.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: eap-config/local-izpack/default_shortcut/zh_CN.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/zh_CN.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/zh_CN.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="启动应用服务器（ 使用 production 配置 ）" 
    			 description="启动应用服务器" 
    			 xml:lang="zh_CN">
@@ -23,7 +23,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="yes" 
-   			 commandLine="-c all" 
+   			 commandLine="run.bat -c all" 
    			 name="启动应用服务器（ 使用 all 配置 ）" 
    			 description="启动应用服务器" 
    			 xml:lang="zh_CN">
@@ -36,7 +36,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c default" 
+   			 commandLine="run.bat -c default" 
    			 name="启动应用服务器（ 使用 default 配置 ）" 
    			 description="启动应用服务器" 
    			 xml:lang="zh_CN">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c minimal" 
+   			 commandLine="run.bat -c minimal" 
    			 name="启动应用服务器（ 使用 minimal 配置 ）" 
    			 description="启动应用服务器" 
    			 xml:lang="zh_CN">
@@ -62,7 +62,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c standard" 
+   			 commandLine="run.bat -c standard" 
    			 name="启动应用服务器（ 使用 standard 配置 ）" 
    			 description="启动应用服务器" 
    			 xml:lang="zh_CN">
@@ -75,7 +75,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico"
 			 desktop="no" 
-			 commandLine="-c web"
+			 commandLine="run.bat -c web"
 			 name="启动应用服务器（ 使用 web 配置 ）" 
 			 description="启动应用服务器" 
 			 xml:lang="zh_CN">
@@ -169,26 +169,26 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    			 name="部署 DVD Store Seam 演示程序" 
    			 description="部署 Seam 演示程序" 
    			 xml:lang="zh_CN">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="部署 Hotel Booking Seam 演示程序" 
    			 description="部署 Seam 演示程序" 
    			 xml:lang="zh_CN">
Index: eap-config/local-izpack/default_shortcut/pt_BR.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/pt_BR.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/pt_BR.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="Servidor de Aplicativo de Inicializa��o ( production )" 
    			 description="Servidor do Aplicativo de Inicializa��o" 
    			 xml:lang="pt_BR">
@@ -23,7 +23,7 @@
 			 initialState="normal" 
 			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
 			 desktop="yes" 
-			 commandLine="-c all" 
+			 commandLine="run.bat -c all" 
 			 name="Servidor de Aplicativo de Inicializa��o ( all )" 
 			 description="Servidor do Aplicativo de Inicializa��o"
 			 xml:lang="pt_BR">
@@ -36,7 +36,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c default" 
+   			 commandLine="run.bat -c default" 
    			 name="Servidor de Aplicativo de Inicializa��o ( default )" 
    			 description="Servidor do Aplicativo de Inicializa��o"
    			 xml:lang="pt_BR">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c minimal"
+   			 commandLine="run.bat -c minimal"
    			 name="Servidor de Aplicativo de Inicializa��o ( minimal )" 
    			 description="Servidor do Aplicativo de Inicializa��o" 
    			 xml:lang="pt_BR">
@@ -62,7 +62,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-			 commandLine="-c standard" 
+			 commandLine="run.bat -c standard" 
 			 name="Servidor de Aplicativo de Inicializa��o ( standard )" 
 			 description="Servidor do Aplicativo de Inicializa��o" 
 			 xml:lang="pt_BR">
@@ -75,7 +75,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c web" 
+   			 commandLine="run.bat -c web" 
    			 name="Servidor de Aplicativo de Inicializa��o ( web )" 
    			 description="Servidor do Aplicativo de Inicializa��o" 
    			 xml:lang="pt_BR">
@@ -170,25 +170,25 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    			 name="Implementa o Seam Demo de Armazenamento de DVD" 
    			 description="Implementa os aplicativos demo Seam" 
    			 xml:lang="pt_BR">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
-   			 desktop="no" commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 desktop="no" commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="Implementa o Seam Demo de Reserva de Hotel" 
    			 description="Implementa os aplicativos demo Seam" 
    			 xml:lang="pt_BR">
Index: eap-config/local-izpack/default_shortcut/es.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/es.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/es.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="Iniciar el servidor de aplicaciones ( production )" 
    			 description="Iniciar el servidor de aplicaciones" 
    			 xml:lang="es">
@@ -23,7 +23,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="yes" 
-   			 commandLine="-c all" 
+   			 commandLine="run.bat -c all" 
    			 name="Iniciar el servidor de aplicaciones ( all )" 
    			 description="Iniciar el servidor de aplicaciones"
 			 xml:lang="es">
@@ -36,7 +36,7 @@
    		   	 initialState="normal" 
    		   	 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    		   	 desktop="no" 
-   		   	 commandLine="-c default" 
+   		   	 commandLine="run.bat -c default" 
    		   	 name="Iniciar el servidor de aplicaciones ( default )" 
    		   	 description="Iniciar el servidor de aplicaciones" 
    		   	 xml:lang="es">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c minimal" 
+   			 commandLine="run.bat -c minimal" 
    			 name="Iniciar el servidor de aplicaciones ( minimal )" 
 			 description="Iniciar el servidor de aplicaciones" 
 			 xml:lang="es">
@@ -62,7 +62,7 @@
  			 initialState="normal" 
  			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
  			 desktop="no" 
- 			 commandLine="-c standard" 
+ 			 commandLine="run.bat -c standard" 
  			 name="Iniciar el servidor de aplicaciones ( standard )" 
  			 description="Iniciar el servidor de aplicaciones"
  			 xml:lang="es">
@@ -75,7 +75,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c web" 
+   			 commandLine="run.bat -c web" 
    			 name="Iniciar el servidor de aplicaciones ( web )" 
    			 description="Iniciar el servidor de aplicaciones" 
    			 xml:lang="es">
@@ -170,26 +170,26 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal"
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico"
    			 desktop="no"
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    			 name="Implementaci�n de la demostraci�n Seam del almac�n de DVDs" 
    			 description="Implementaci�n de las aplicaciones Seam de demostraci�n"
    			 xml:lang="es">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico"
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="Implementaci�n de la demostraci�n Seam de la reserva de hotel" 
    			 description="Implementaci�n de las aplicaciones Seam de demostraci�n" 
    			 xml:lang="es">
Index: eap-config/local-izpack/default_shortcut/fr.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/fr.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/fr.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="D�marrage du serveur d&apos;applications ( production )" 
    			 description="D�marrage du serveur d&apos;applications" 
    			 xml:lang="fr">
@@ -23,7 +23,7 @@
    			 initialState="normal"
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="yes" 
-   			 commandLine="-c all" 
+   			 commandLine="run.bat -c all" 
    			 name="D�marrage du serveur d&apos;applications ( all )" 
    			 description="D�marrage du serveur d&apos;applications" 
    			 xml:lang="fr">
@@ -36,7 +36,7 @@
    		 	 initialState="normal" 
    		 	 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    		 	 desktop="no"
-   		 	 commandLine="-c default" 
+   		 	 commandLine="run.bat -c default" 
    		 	 name="D�marrage du serveur d&apos;applications ( default )" 
    		 	 description="D�marrage du serveur d&apos;applications" 
    		 	 xml:lang="fr">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no"
-   			 commandLine="-c minimal" 
+   			 commandLine="run.bat -c minimal" 
    			 name="D�marrage du serveur d&apos;applications ( minimal )" 
    			 description="D�marrage du serveur d&apos;applications" 
    			 xml:lang="fr">
@@ -62,7 +62,7 @@
    			 initialState="normal" 
 			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
 			 desktop="no" 
-			 commandLine="-c standard"
+			 commandLine="run.bat -c standard"
 			 name="D�marrage du serveur d&apos;applications ( standard )" 
 			 description="D�marrage du serveur d&apos;applications" 
 			 xml:lang="fr">
@@ -75,7 +75,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c web"
+   			 commandLine="run.bat -c web"
    			 name="D�marrage du serveur d&apos;applications ( web )" 
    			 description="D�marrage du serveur d&apos;applications" 
    			 xml:lang="fr">
@@ -170,26 +170,26 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal"
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    			 name="D�ploiement DVD Store Seam Demo" 
    			 description="D�ploiement Applications Seam Demo" 
    			 xml:lang="fr">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="D�ploiement Hotel Booking Seam Demo" 
    			 description="D�ploiement Applications Seam Demo"
    			 xml:lang="fr">
Index: eap-config/local-izpack/default_shortcut/de.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/de.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/de.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="Applikationsserver ( production ) starten" 
    			 description="Applikationsserver starten"
 			 xml:lang="de">
@@ -23,7 +23,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="yes" 
-   			 commandLine="-c all" 
+   			 commandLine="run.bat -c all" 
    			 name="Applikationsserver ( all ) starten" 
    			 description="Applikationsserver starten" 
    			 xml:lang="de">
@@ -36,7 +36,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c default" 
+   			 commandLine="run.bat -c default" 
    			 name="Applikationsserver ( default ) starten" 
    			 description="Applikationsserver starten" 
    			 xml:lang="de">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c minimal" 
+   			 commandLine="run.bat -c minimal" 
    			 name="Applikationsserver ( minimal ) starten" 
    			 description="Applikationsserver starten" 
    			 xml:lang="de">
@@ -61,7 +61,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c standard" 
+   			 commandLine="run.bat -c standard" 
    			 name="Applikationsserver ( standard ) starten" 
    			 description="Applikationsserver starten" 
    			 xml:lang="de">
@@ -74,7 +74,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c web"
+   			 commandLine="run.bat -c web"
    			 name="Applikationsserver ( web ) starten" 
    			 description="Applikationsserver starten" 
    			 xml:lang="de">
@@ -168,26 +168,26 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
    			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
-   			 name="Seam-Demo &quot;DVD Store&quot; einsetzen"
+   			 name="launch-deply.bat Seam-Demo &quot;DVD Store&quot; einsetzen"
    			 description="Demo-Seam-Applikationen einsetzen" 
    			 xml:lang="de">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="Seam-Demo &quot;Hotel Booking&quot; einsetzen" 
    			 description="Demo-Seam-Applikationen einsetzen" 
    			 xml:lang="de">
Index: eap-config/local-izpack/default_shortcut/ja.xml
===================================================================
--- eap-config/local-izpack/default_shortcut/ja.xml	(revision 1832)
+++ eap-config/local-izpack/default_shortcut/ja.xml	(working copy)
@@ -10,7 +10,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c production" 
+   			 commandLine="run.bat -c production" 
    			 name="アプリケーションサーバー ( production ) の起動 " 
    			 description="アプリケーションサーバーの起動" 
    			 xml:lang="ja">
@@ -23,7 +23,7 @@
    			 initialState="normal"
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="yes" 
-   			 commandLine="-c all" 
+   			 commandLine="run.bat -c all" 
    			 name="アプリケーションサーバー ( all ) の起動 " 
    			 description="アプリケーションサーバーの起動" 
    			 xml:lang="ja">
@@ -36,7 +36,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c default" 
+   			 commandLine="run.bat -c default" 
    			 name="アプリケーションサーバー ( default ) の起動" 
    			 description="アプリケーションサーバーの起動" 
    			 xml:lang="ja">
@@ -49,7 +49,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no" 
-   			 commandLine="-c minimal" 
+   			 commandLine="run.bat -c minimal" 
    			 name="アプリケーションサーバー ( minimal ) の起動 " 
    			 description="アプリケーションサーバーの起動" 
    			 xml:lang="ja">
@@ -62,7 +62,7 @@
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
    			 desktop="no"
-			 commandLine="-c standard" 
+			 commandLine="run.bat -c standard" 
 			 name="アプリケーションサーバー ( standard ) の起動 " 
 			 description="アプリケーションサーバーの起動" 
 			 xml:lang="ja">
@@ -75,7 +75,7 @@
 			 initialState="normal"
 			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
 			 desktop="no" 
-			 commandLine="-c web" 
+			 commandLine="run.bat -c web" 
 			 name="アプリケーションサーバー ( web ) の起動 " 
 			 description="アプリケーションサーバーの起動"
 			 xml:lang="ja">
@@ -170,26 +170,26 @@
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no" 
    		     programGroup="yes" 
    		     initialState="normal" 
    		     iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico"
    		     desktop="no"
-   		     commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   		     commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    		     name="DVD ストア Seam デモのデプロイ" 
    		     description="デモ Seam アプリケーションのデプロイ" 
    		     xml:lang="ja">
    </shortcut>
    
    <shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
    			 startMenu="no"
    			 programGroup="yes" 
    			 initialState="normal" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
    			 desktop="no" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    			 name="ホテル予約 Seam デモのデプロイ" 
    			 description="デモ Seam アプリケーションのデプロイ" 
    			 xml:lang="ja">
Index: eap-config/default_shortcut_specification.xml
===================================================================
--- eap-config/default_shortcut_specification.xml	(revision 1832)
+++ eap-config/default_shortcut_specification.xml	(working copy)
@@ -4,8 +4,8 @@
    
    <shortcut name="Start Application Server ( production )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe" 
-   			 commandLine="-c production" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="run.bat -c production" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server" 
    			 initialState="normal" 
@@ -15,8 +15,8 @@
    
    <shortcut name="Start Application Server ( all )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe"
-   			 commandLine="-c all" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
+   			 commandLine="run.bat -c all" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server"
    			 initialState="normal"
@@ -26,8 +26,8 @@
    			 
    <shortcut name="Start Application Server ( default )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe" 
-   			 commandLine="-c default" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="run.bat -c default" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server" 
    			 initialState="normal" 
@@ -37,19 +37,19 @@
    			 
    <shortcut name="Start Application Server ( minimal )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe" 
-   			 commandLine="-c minimal"
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="run.bat -c minimal"
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server" 
 			 initialState="normal" 
-			 programGroup="yes" 
-			 desktop="no" 
+			 programGroup="yes"
+			 desktop="no"
 			 startMenu="no"/>
 			 
    <shortcut name="Start Application Server ( standard )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe" 
-   			 commandLine="-c standard" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="run.bat -c standard" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server" 
    			 initialState="normal" 
@@ -59,8 +59,8 @@
    			 
    <shortcut name="Start Application Server ( web )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin\run.exe" 
-   			 commandLine="-c web" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="run.bat -c web" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\bin" 
    			 description="Start Application Server" 
    			 initialState="normal" 
@@ -144,8 +144,8 @@
 			 
    <shortcut name="Deploy DVD Store Seam Demo" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico"
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat" 
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe" 
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; DVD-Store" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts" 
    			 description="Deploy demo Seam applications" 
    			 initialState="normal"
@@ -155,8 +155,8 @@
    			 
    <shortcut name="Deploy Hotel Booking Seam Demo" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\icons\startmenuicon.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\launch-deploy.bat"
-   			 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking"
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
+   			 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking"
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts"
    			 description="Deploy demo Seam applications" 
    			 initialState="normal" 
Index: ewp-config/core-packs.xml
===================================================================
--- ewp-config/core-packs.xml	(revision 1832)
+++ ewp-config/core-packs.xml	(working copy)
@@ -199,7 +199,6 @@
      			 targetdir="$INSTALL_PATH/@{jboss.dist.dir}/jboss-as-web/bin">
 			<include name="*.bat"/>
      	</fileset>
-     	<singlefile src="@{install.config.dir}/scripts/run.exe" target="$INSTALL_PATH/@{jboss.dist.dir}/jboss-as-web/bin/run.exe" os="windows"/>
      </pack>
      
      <!--
Index: ewp-config/scripts/run.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ewp-config/local-izpack/default_shortcut/zh_CN.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/zh_CN.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/zh_CN.xml	(working copy)
@@ -5,17 +5,17 @@
 		xml:lang="zh_CN"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="no" commandLine="-c production" name="启动应用服务器（ 使用 production 配置 ）"
+		desktop="no" commandLine="run.bat -c production" name="启动应用服务器（ 使用 production 配置 ）"
 		description="启动应用服务器" xml:lang="zh_CN">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default" name="启动应用服务器（ 使用 default 配置 ）"
+		desktop="yes" commandLine="run.bat -c default" name="启动应用服务器（ 使用 default 配置 ）"
 		description="启动应用服务器" xml:lang="zh_CN">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
@@ -79,10 +79,10 @@
 
 -->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
+		desktop="no" commandLine="launch-deploy.bat &quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
 		name="部署 Hotel Booking Seam 演示程序" description="部署 Seam 演示程序" xml:lang="zh_CN">
 	</shortcut>
 	<shortcut
Index: ewp-config/local-izpack/default_shortcut/pt_BR.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/pt_BR.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/pt_BR.xml	(working copy)
@@ -5,18 +5,18 @@
 		xml:lang="pt_BR"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="no" commandLine="-c production"
+		desktop="no" commandLine="run.bat -c production"
 		name="Servidor de Aplicativo de Inicialização ( production )"
 		description="Servidor do Aplicativo de Inicialização" xml:lang="pt_BR">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default"
+		desktop="yes" commandLine="run.bat -c default"
 		name="Servidor de Aplicativo de Inicialização ( default )"
 		description="Servidor do Aplicativo de Inicialização" xml:lang="pt_BR">
 	</shortcut>
@@ -86,10 +86,10 @@
 		</shortcut>
 	-->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
+		desktop="no" commandLine="launch-deploy.bat &quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
 		name="Implementa o Seam Demo de Reserva de Hotel" description="Implementa os aplicativos demo Seam"
 		xml:lang="pt_BR">
 	</shortcut>
Index: ewp-config/local-izpack/default_shortcut/es.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/es.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/es.xml	(working copy)
@@ -4,18 +4,18 @@
 		xml:lang="es"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="no" commandLine="-c production" 
+		desktop="no" commandLine="run.bat -c production" 
 		name="Iniciar el servidor de aplicaciones ( production )" description="Iniciar el servidor de aplicaciones"
 		xml:lang="es">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default" 
+		desktop="yes" commandLine="run.bat -c default" 
 		name="Iniciar el servidor de aplicaciones ( default )" description="Iniciar el servidor de aplicaciones"
 		xml:lang="es">
 	</shortcut>
@@ -86,10 +86,10 @@
 		demostració n" xml:lang="es"> </shortcut>
 	-->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
+		desktop="no" commandLine="launch-deploy.bat &quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
 		name="Implementación de la demostración Seam de la reserva de hotel"
 		description="Implementación de las aplicaciones Seam de demostración"
 		xml:lang="es">
Index: ewp-config/local-izpack/default_shortcut/fr.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/fr.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/fr.xml	(working copy)
@@ -5,18 +5,18 @@
 		xml:lang="fr"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="no" commandLine="-c production"
+		desktop="no" commandLine="run.bat -c production"
 		name="Démarrage du serveur d&apos;applications ( production )"
 		description="Démarrage du serveur d&apos;applications" xml:lang="fr">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default"
+		desktop="yes" commandLine="run.bat -c default"
 		name="Démarrage du serveur d&apos;applications ( default )"
 		description="Démarrage du serveur d&apos;applications" xml:lang="fr">
 	</shortcut>
@@ -85,10 +85,10 @@
 		</shortcut>
 	-->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
+		desktop="no" commandLine="launch-deploy.bat &quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
 		name="Déploiement Hotel Booking Seam Demo" description="Déploiement Applications Seam Demo"
 		xml:lang="fr">
 	</shortcut>
Index: ewp-config/local-izpack/default_shortcut/de.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/de.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/de.xml	(working copy)
@@ -5,17 +5,17 @@
 		xml:lang="de"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="no" commandLine="-c production" name="Applikationsserver ( production ) starten"
+		desktop="no" commandLine="run.bat -c production" name="Applikationsserver ( production ) starten"
 		description="Applikationsserver starten" xml:lang="de">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default" name="Applikationsserver ( default ) starten"
+		desktop="yes" commandLine="run.bat -c default" name="Applikationsserver ( default ) starten"
 		description="Applikationsserver starten" xml:lang="de">
 	</shortcut>
 
@@ -85,10 +85,10 @@
 		</shortcut>
 	-->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking"
+		desktop="no" commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking"
 		name="Seam-Demo &quot;Hotel Booking&quot; einsetzen" description="Demo-Seam-Applikationen einsetzen"
 		xml:lang="de">
 	</shortcut>
Index: ewp-config/local-izpack/default_shortcut/ja.xml
===================================================================
--- ewp-config/local-izpack/default_shortcut/ja.xml	(revision 1832)
+++ ewp-config/local-izpack/default_shortcut/ja.xml	(working copy)
@@ -5,17 +5,17 @@
 		xml:lang="ja"></programGroup>
 
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico" 
-		desktop="no" commandLine="-c production" name="アプリケーションサーバー ( production ) の起動 "
+		desktop="no" commandLine="run.bat -c production" name="アプリケーションサーバー ( production ) の起動 "
 		description="アプリケーションサーバーの起動" xml:lang="ja">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico"
-		desktop="yes" commandLine="-c default" name="アプリケーションサーバー ( default ) の起動"
+		desktop="yes" commandLine="run.bat -c default" name="アプリケーションサーバー ( default ) の起動"
 		description="アプリケーションサーバーの起動" xml:lang="ja">
 	</shortcut>
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin"
@@ -79,10 +79,10 @@
 		アプリケーションのデプロイ" xml:lang="ja"> </shortcut>
 	-->
 	<shortcut workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts"
-		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat"
+		target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as\scripts\run.exe"
 		startMenu="no" programGroup="yes" initialState="normal" encoding="UTF-8"
 		iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico"
-		desktop="no" commandLine="&quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
+		desktop="no" commandLine="launch-deploy.bat &quot;$INSTALL_PATH\${jboss.dist.dir}&quot; Booking"
 		name="ホテル予約 Seam デモのデプロイ" description="デモ Seam アプリケーションのデプロイ"
 		xml:lang="ja">
 	</shortcut>
Index: ewp-config/default_shortcut_specification.xml
===================================================================
--- ewp-config/default_shortcut_specification.xml	(revision 1832)
+++ ewp-config/default_shortcut_specification.xml	(working copy)
@@ -4,8 +4,8 @@
    
    <shortcut name="Start Application Server ( production )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe" 
-   			 commandLine="-c production" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe" 
+   			 commandLine="run.bat -c production" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin" 
    			 description="Start Application Server" 
    			 initialState="normal" 
@@ -15,8 +15,8 @@
    
    <shortcut name="Start Application Server ( default )" 
    			 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\start.ico" 
-   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin\run.exe" 
-   			 commandLine="-c default" 
+   			 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe" 
+   			 commandLine="run.bat -c default" 
    			 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\bin" 
    			 description="Start Application Server" 
    			 initialState="normal"
@@ -97,8 +97,8 @@
     			 
    <shortcut name="Deploy Hotel Booking Seam Demo" 
    		  	 iconFile="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\icons\startmenuicon.ico" 
-   		  	 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\launch-deploy.bat" 
-   		  	 commandLine="&#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
+   		  	 target="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts\run.exe"
+   		  	 commandLine="launch-deploy.bat &#34;$INSTALL_PATH\${jboss.dist.dir}&#34; Booking" 
    		  	 workingDirectory="$INSTALL_PATH\${jboss.dist.dir}\jboss-as-web\scripts" 
    		  	 description="Deploy demo Seam applications" 
    		  	 initialState="normal" 
