airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1449355 - in /airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin: airavata-server.bat setenv.bat
Date Sat, 23 Feb 2013 16:21:36 GMT
Author: smarru
Date: Sat Feb 23 16:21:36 2013
New Revision: 1449355

URL: http://svn.apache.org/r1449355
Log:
Applying Danushka's patch after oral review. Could not validate this on my mac, needs testing
on windows

Modified:
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.bat
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/setenv.bat

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.bat
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.bat?rev=1449355&r1=1449354&r2=1449355&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.bat
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/airavata-server.bat
Sat Feb 23 16:21:36 2013
@@ -17,11 +17,39 @@ rem specific language governing permissi
 rem under the License.
 
 setlocal EnableDelayedExpansion
+
 call "%~dp0"setenv.bat
+
+:loop
+if ""%1""==""-xdebug"" goto xdebug
+if ""%1""==""-security"" goto security
+if ""%1""=="""" goto run
+goto help
+
+:xdebug
+set JAVA_OPTS= %JAVA_OPTS% -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000
+shift
+goto loop
+
+:security
+set JAVA_OPTS=%JAVA_OPTS% -Djava.security.manager -Djava.security.policy=%AIRAVATA_HOME%\conf\axis2.policy
-Daxis2.home=%AIRAVATA_HOME%
+shift
+goto loop
+
+:help
+echo  Usage: %0 [-options]
+echo.
+echo  where options include:
+echo   -xdebug    Start Airavata Server under JPDA debugger
+echo   -security  Enable Java 2 security
+echo   -h         Help
+goto end
+
+:run
 cd "%AIRAVATA_HOME%\bin"
 set LOGO_FILE="logo.txt"
 if exist "%LOGO_FILE%" type "%LOGO_FILE%"
-cd "%AIRAVATA_HOME%\standalone-server\bin"
-call axis2server.bat %*
-cd "%AIRAVATA_HOME%\bin"
 
+java %JAVA_OPTS% -classpath "%XBAYA_CLASSPATH%" -Djava.endorsed.dirs="%AIRAVATA_HOME%/lib/endorsed":"%JAVA_HOME%/jre/lib/endorsed":"%JAVA_HOME%/lib/endorsed"
org.apache.airavata.server.ServerMain -repo "%AIRAVATA_HOME%"/repository/services -conf "%AIRAVATA_HOME%"/conf/axis2.xml
%*
+
+:end

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/setenv.bat
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/setenv.bat?rev=1449355&r1=1449354&r2=1449355&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/setenv.bat
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/bin/setenv.bat
Sat Feb 23 16:21:36 2013
@@ -23,7 +23,7 @@ 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
@@ -37,20 +37,7 @@ rem ----- update classpath -------------
 :updateClasspath
 cd %AIRAVATA_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 ("%AIRAVATA_HOME%\lib\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC
+FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC
 
+:end
\ No newline at end of file



Mime
View raw message