Author: smarru
Date: Sun Feb 24 03:07:31 2013
New Revision: 1449433
URL: http://svn.apache.org/r1449433
Log:
committing danushkas patch on fixing windows xbaya start up - AIRAVATA-773
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/setenv.bat
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/xbaya-gui.bat
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/setenv.bat
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/setenv.bat?rev=1449433&r1=1449432&r2=1449433&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/setenv.bat
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/setenv.bat
Sun Feb 24 03:07:31 2013
@@ -23,34 +23,20 @@ if not exist "%JAVA_HOME%\bin\java.exe"
goto initialize
:noJavaHome
-echo "You must set the JAVA_HOME variable before running Airavata."
+echo You must set the JAVA_HOME environment variable before running Airavata.
goto end
:initialize
-if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..
+if "%XBAYA_HOME%"=="" set XBAYA_HOME=%~sdp0..
SET curDrive=%cd:~0,1%
-SET airavataDrive=%AIRAVATA_HOME:~0,1%
-if not "%curDrive%" == "%airavataDrive%" %airavataDrive%:
+SET xBayaDrive=%XBAYA_HOME:~0,1%
+if not "%curDrive%" == "%xBayaDrive%" %xBayaDrive%:
goto updateClasspath
rem ----- update classpath
-----------------------------------------------------
:updateClasspath
-cd %AIRAVATA_HOME%
+cd %XBAYA_HOME%
set XBAYA_CLASSPATH=
-FOR %%C in ("%AIRAVATA_HOME%\standalone-server\lib\*.jar") DO set
XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;".\standalone-server\lib\%%~nC%%~xC"
-
-set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;
-FOR %%C in ("%AIRAVATA_HOME%\standalone-server\repository\services\*.jar") DO
set
XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;".\standalone-server\repository\services\%%~nC%%~xC"
-
-
-
-
-
-
-
-
-
-
-
-
+FOR %%C in ("%XBAYA_HOME%\lib\*.jar") DO set
XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC
+:end
\ No newline at end of file
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/xbaya-gui.bat
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/xbaya-gui.bat?rev=1449433&r1=1449432&r2=1449433&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/xbaya-gui.bat
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/xbaya-gui.bat
Sun Feb 24 03:07:31 2013
@@ -19,4 +19,5 @@ rem under the License.
setlocal EnableDelayedExpansion
call "%~dp0"setenv.bat
+cd "%XBAYA_HOME%\bin"
"%JAVA_HOME%\bin\java.exe" %JAVA_OPTS% -classpath "%XBAYA_CLASSPATH%"
org.apache.airavata.xbaya.XBaya %*
