Attachment 681700 Details for Bug 900592 – 0001-JBPAPP-9249-Fix-jconsole.bat-and-vault.bat-scripts-f.patch

0001-JBPAPP-9249-Fix-jconsole.bat-and-vault.bat-scripts-f.patch

0001-JBPAPP-9249-Fix-jconsole.bat-and-vault.bat-scripts-f.patch (text/x-patch), 5.28 KB, created by Paul Gier on 2012-10-02 23:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Gier

Created: 2012-10-02 23:38:39 UTC

Size: 5.28 KB

patch

obsolete

>From 750140f79d2e4c3d2eaaed8a354aa54fe96ce751 Mon Sep 17 00:00:00 2001
>From: Paul Gier <pgier@redhat.com>
>Date: Tue, 2 Oct 2012 17:49:09 -0500
>Subject: [PATCH] [JBPAPP-9249] Fix jconsole.bat and vault.bat scripts for
> windows directories with spaces
>
>---
> build/src/main/resources/bin/jconsole.bat |   45 +++++++++++++++++-----------
> build/src/main/resources/bin/vault.bat    |   25 +++++++++++-----
> 2 files changed, 44 insertions(+), 26 deletions(-)
> mode change 100644 => 100755 build/src/main/resources/bin/jconsole.bat
> mode change 100644 => 100755 build/src/main/resources/bin/vault.bat
>
>diff --git a/build/src/main/resources/bin/jconsole.bat b/build/src/main/resources/bin/jconsole.bat
>old mode 100644
>new mode 100755
>index 3468e0b..45b2aeb
>--- a/build/src/main/resources/bin/jconsole.bat
>+++ b/build/src/main/resources/bin/jconsole.bat
>@@ -65,21 +65,21 @@ rem Setup The Classpath
> set CLASSPATH=%JAVA_HOME%\lib\jconsole.jar
> set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
> 
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\remoting3\remoting-jmx\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\remoting3\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\logging\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\xnio\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\xnio\nio\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\sasl\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\marshalling\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\marshalling\river\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\as\cli\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\staxmapper\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\as\protocol\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\dmr\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\as\controller-client\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\threads\main
>-call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\as\controller\main
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\remoting3\remoting-jmx\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\remoting3\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\logging\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\xnio\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\xnio\nio\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\sasl\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\marshalling\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\marshalling\river\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\as\cli\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\staxmapper\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\as\protocol\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\dmr\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\as\controller-client\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\threads\main"
>+call :SearchForJars "%JBOSS_MODULEPATH%\org\jboss\as\controller\main"
> 
> rem echo %CLASSPATH%
> 
>@@ -89,12 +89,21 @@ rem echo %CLASSPATH%
> goto :EOF
> 
> :SearchForJars
>-pushd %1
>-for %%j in (*.jar) do call :ClasspathAdd %1\%%j
>+set NEXT_MODULE_DIR=%1
>+call :DeQuote NEXT_MODULE_DIR
>+pushd %NEXT_MODULE_DIR%
>+for %%j in (*.jar) do call :ClasspathAdd "%NEXT_MODULE_DIR%\%%j"
> popd
> goto :EOF
> 
> :ClasspathAdd
>-SET CLASSPATH=%CLASSPATH%;%1
>+set NEXT_JAR=%1
>+call :DeQuote NEXT_JAR
>+set CLASSPATH=%CLASSPATH%;%NEXT_JAR%
>+goto :EOF
>+
>+:DeQuote
>+for /f "delims=" %%A in ('echo %%%1%%') do set %1=%%~A
>+goto :EOF
> 
> :EOF
>diff --git a/build/src/main/resources/bin/vault.bat b/build/src/main/resources/bin/vault.bat
>old mode 100644
>new mode 100755
>index a6c3480..9f58364
>--- a/build/src/main/resources/bin/vault.bat
>+++ b/build/src/main/resources/bin/vault.bat
>@@ -4,7 +4,8 @@ SETLOCAL
> rem Author: Gregory Charles, JBoss Community Member
> rem Date: January 24, 2012
> 
>-set DIRNAME=%~dp0
>+set DIRNAME="%~dp0"
>+call :DeQuote DIRNAME
> set PROGNAME=%0
> 
> rem Setup JBOSS_HOME
>@@ -12,9 +13,8 @@ set JBOSS_HOME=%DIRNAME%\..
> 
> rem Setup the JVM
> IF NOT DEFINED JAVA (
>-    echo not defined java
>     IF DEFINED JAVA_HOME (
>-        set JAVA=%JAVA_HOME%\bin\java
>+        set JAVA="%JAVA_HOME%\bin\java"
>     ) ELSE (
>         JAVA=java
>     )
>@@ -22,7 +22,8 @@ IF NOT DEFINED JAVA (
> )
> 
> IF NOT DEFINED MODULEPATH (
>-    set MODULEPATH=%JBOSS_HOME%\modules
>+    set MODULEPATH="%JBOSS_HOME%\modules"
>+	call :DeQuote MODULEPATH
> )
> 
> rem 
>@@ -30,10 +31,10 @@ rem Setup the JBoss Vault Tool classpath
> rem
> 
> rem Shared libs
>-set JBOSS_VAULT_CLASSPATH=%MODULEPATH%\org\picketbox\main\*
>-set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;%MODULEPATH%\org\jboss\logging\main\*
>-set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;%MODULEPATH%\org\jboss\common-core\main\*
>-set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;%MODULEPATH%\org\jboss\as\security\main\*
>+set JBOSS_VAULT_CLASSPATH="%MODULEPATH%\org\picketbox\main\*"
>+set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;"%MODULEPATH%\org\jboss\logging\main\*"
>+set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;"%MODULEPATH%\org\jboss\common-core\main\*"
>+set JBOSS_VAULT_CLASSPATH=%JBOSS_VAULT_CLASSPATH%;"%MODULEPATH%\org\jboss\as\security\main\*"
> 
> 
> rem Display our environment
>@@ -53,3 +54,11 @@ echo.
> 
> ENDLOCAL
> 
>+:END
>+goto :EOF
>+
>+:DeQuote
>+for /f "delims=" %%A in ('echo %%%1%%') do set %1=%%~A
>+goto :EOF
>+
>+:EOF
>-- 
>1.7.7.6
>

Actions: View

Attachments on bug 900592: 681700