You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/14 14:34:51 UTC
[1/2] airavata git commit: merging develop
Repository: airavata
Updated Branches:
refs/heads/develop 82d489925 -> 6ebc2b39b
merging develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fcace748
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fcace748
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fcace748
Branch: refs/heads/develop
Commit: fcace748763397649c46b7adbd423afa16989e54
Parents: 4968ee8
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Mar 14 09:23:00 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Mar 14 09:23:00 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/bin/airavata-server.bat | 2 +-
.../src/main/resources/bin/airavata-server.sh | 8 ++---
.../src/main/resources/bin/api-server.sh | 6 ++--
.../src/main/resources/bin/gfac-server.sh | 6 ++--
.../main/resources/bin/orchestrator-server.sh | 6 ++--
distribution/src/main/resources/bin/setenv.bat | 14 ++------
distribution/src/main/resources/bin/setenv.sh | 37 ++------------------
.../src/main/resources/bin/workflow-server.sh | 6 ++--
.../main/resources/samples/registerSample.sh | 3 +-
.../main/resources/airavata-server.properties | 2 +-
.../src/main/resources/db-migrate.sh | 3 +-
11 files changed, 20 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/airavata-server.bat
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server.bat b/distribution/src/main/resources/bin/airavata-server.bat
index 09752c4..be2c584 100644
--- a/distribution/src/main/resources/bin/airavata-server.bat
+++ b/distribution/src/main/resources/bin/airavata-server.bat
@@ -50,6 +50,6 @@ cd "%AIRAVATA_HOME%\bin"
set LOGO_FILE="logo.txt"
if exist "%LOGO_FILE%" type "%LOGO_FILE%"
-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 %*
+java %JAVA_OPTS% -classpath "%AIRAVATA_CLASSPATH%" org.apache.airavata.server.ServerMain %*
:end
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server.sh b/distribution/src/main/resources/bin/airavata-server.sh
index aa37207..25584e7 100755
--- a/distribution/src/main/resources/bin/airavata-server.sh
+++ b/distribution/src/main/resources/bin/airavata-server.sh
@@ -27,7 +27,7 @@ IS_DAEMON_MODE=false
LOGO=true
STOP=false
FORCE=false
-#SERVERS="--servers=apiserver,orchestrator,gfac,credentialstore"
+
for var in "$@"
do
case $var in
@@ -106,12 +106,10 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
else
- java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
fi
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/api-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/api-server.sh b/distribution/src/main/resources/bin/api-server.sh
index 403a76f..a2c1a52 100755
--- a/distribution/src/main/resources/bin/api-server.sh
+++ b/distribution/src/main/resources/bin/api-server.sh
@@ -106,12 +106,10 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
else
- java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
fi
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/gfac-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/gfac-server.sh b/distribution/src/main/resources/bin/gfac-server.sh
index 47382f8..cfa6fe2 100755
--- a/distribution/src/main/resources/bin/gfac-server.sh
+++ b/distribution/src/main/resources/bin/gfac-server.sh
@@ -106,12 +106,10 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
else
- java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
fi
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/orchestrator-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/orchestrator-server.sh b/distribution/src/main/resources/bin/orchestrator-server.sh
index bed5f18..5d782c5 100755
--- a/distribution/src/main/resources/bin/orchestrator-server.sh
+++ b/distribution/src/main/resources/bin/orchestrator-server.sh
@@ -106,12 +106,10 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
else
- java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
fi
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/setenv.bat
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/setenv.bat b/distribution/src/main/resources/bin/setenv.bat
index 223f8cd..5f1fda1 100644
--- a/distribution/src/main/resources/bin/setenv.bat
+++ b/distribution/src/main/resources/bin/setenv.bat
@@ -17,15 +17,6 @@ rem under the License.
@echo off
-:checkJava
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto initialize
-
-:noJavaHome
-echo You must set the JAVA_HOME environment variable before running Airavata.
-goto end
-
:initialize
if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..
SET curDrive=%cd:~0,1%
@@ -36,8 +27,7 @@ goto updateClasspath
rem ----- update classpath -----------------------------------------------------
:updateClasspath
cd %AIRAVATA_HOME%
-set XBAYA_CLASSPATH=
-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
+set AIRAVATA_CLASSPATH=
+FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set AIRAVATA_CLASSPATH=!AIRAVATA_CLASSPATH!;..\lib\%%~nC%%~xC
:end
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/setenv.sh b/distribution/src/main/resources/bin/setenv.sh
index 84673db..9e894e1 100755
--- a/distribution/src/main/resources/bin/setenv.sh
+++ b/distribution/src/main/resources/bin/setenv.sh
@@ -17,22 +17,6 @@
# specific language governing permissions and limitations
# under the License.
-
-# Get standard environment variables
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
- echo "You must set the JAVA_HOME variable before running Airavata Scripts."
- exit 1
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-esac
-
# resolve links - $0 may be a softlink
PRG="$0"
@@ -46,32 +30,17 @@ while [ -h "$PRG" ]; do
fi
done
-
PRGDIR=`dirname "$PRG"`
# Only set AIRAVATA_HOME if not already set
[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-XBAYA_CLASSPATH=""
-
-
+AIRAVATA_CLASSPATH=""
for f in "$AIRAVATA_HOME"/lib/*.jar
do
- XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
+ AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
done
-for f in "$AIRAVATA_HOME"/repository/services/*.jar
-do
- XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
-done
-
-XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH"
-
-
-
-
export AIRAVATA_HOME
-export XBAYA_CLASSPATH
-
-
+export AIRAVATA_CLASSPATH
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/bin/workflow-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/workflow-server.sh b/distribution/src/main/resources/bin/workflow-server.sh
index 5cf7ad1..870ec53 100755
--- a/distribution/src/main/resources/bin/workflow-server.sh
+++ b/distribution/src/main/resources/bin/workflow-server.sh
@@ -106,12 +106,10 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
else
- java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
fi
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/distribution/src/main/resources/samples/registerSample.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/samples/registerSample.sh b/distribution/src/main/resources/samples/registerSample.sh
index 6450f6f..384ec0e 100644
--- a/distribution/src/main/resources/samples/registerSample.sh
+++ b/distribution/src/main/resources/samples/registerSample.sh
@@ -20,6 +20,5 @@
. `dirname $0`/../bin/setenv.sh
JAVA_OPTS=""
-java -classpath "$XBAYA_CLASSPATH" \
- -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+java -classpath "$AIRAVATA_CLASSPATH" \
org.apache.airavata.client.samples.RegisterSampleData $*
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 000e183..e915c64 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -250,7 +250,7 @@ zookeeper.timeout=30000
########################################################################
## API Security Configuration
########################################################################
-api.secured=true
+api.secured=false
security.manager.class=org.apache.airavata.api.server.security.DefaultAiravataSecurityManager
### TLS related configuration ####
TLS.enabled=true
http://git-wip-us.apache.org/repos/asf/airavata/blob/fcace748/modules/registry/registry-tools/registry-tool/src/main/resources/db-migrate.sh
----------------------------------------------------------------------
diff --git a/modules/registry/registry-tools/registry-tool/src/main/resources/db-migrate.sh b/modules/registry/registry-tools/registry-tool/src/main/resources/db-migrate.sh
index c390837..b40ed91 100755
--- a/modules/registry/registry-tools/registry-tool/src/main/resources/db-migrate.sh
+++ b/modules/registry/registry-tools/registry-tool/src/main/resources/db-migrate.sh
@@ -27,10 +27,9 @@ do
REG_MIGRATE_CLASSPATH=$REG_MIGRATE_CLASSPATH:$f
done
-$JAVA_HOME/bin/java -server -Xms128M -Xmx128M \
+java -server -Xms128M -Xmx128M \
$XDEBUG \
$TEMP_PROPS \
- -Djava.endorsed.dirs=$AIRAVATA_HOME/lib/endorsed \
-classpath $REG_MIGRATE_CLASSPATH \
-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5000,suspend=n \
org.apache.airavata.registry.tool.DBMigrator $*
[2/2] airavata git commit: Merge branch 'master' into develop
Posted by sm...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6ebc2b39
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6ebc2b39
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6ebc2b39
Branch: refs/heads/develop
Commit: 6ebc2b39ba1702310828c41ee7104e6b9a2ab281
Parents: 82d4899 fcace74
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Mar 14 09:31:34 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Mar 14 09:31:34 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------