Deleted old script files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/94a9fca6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/94a9fca6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/94a9fca6 Branch: refs/heads/master Commit: 94a9fca6ff7e9eed140d9c8e28df4da736dbf1dc Parents: 5757f12 Author: Shameera Rathnayaka <[email protected]> Authored: Tue Jun 28 16:36:50 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Jun 28 16:57:45 2016 -0400 ---------------------------------------------------------------------- .../src/main/resources/bin/airavata-server.sh | 116 ------------------- .../src/main/resources/bin/api-server.sh | 116 ------------------- .../src/main/resources/bin/gfac-server.sh | 116 ------------------- .../main/resources/bin/orchestrator-server.sh | 116 ------------------- .../src/main/resources/bin/workflow-server.sh | 116 ------------------- .../org/apache/airavata/server/ServerMain.java | 2 +- 6 files changed, 1 insertion(+), 581 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/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 deleted file mode 100755 index 25584e7..0000000 --- a/distribution/src/main/resources/bin/airavata-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. `dirname $0`/setenv.sh -cd $AIRAVATA_HOME/bin -LOGO_FILE="logo.txt" - -JAVA_OPTS="" -AIRAVATA_COMMAND="" -IS_DAEMON_MODE=false -LOGO=true -STOP=false -FORCE=false - -for var in "$@" -do - case $var in - -xdebug) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND" - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000" - shift - ;; - -security) - JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME" - shift - ;; - start) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND" - IS_DAEMON_MODE=true - shift - ;; - stop) - LOGO=false - STOP=true - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - ;; - --force) - FORCE=true - shift - ;; - -nologo) - LOGO=false - shift - ;; - -h) - echo "Usage: airavata-server.sh [command-options]" - echo "command options:" - echo " start Start server in daemon mode" - echo " stop [--force] Stop all airavata servers." - echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)" - echo " -nologo Do not show airavata logo" - echo " -xdebug Start Airavata Server under JPDA debugger" - echo " -security Enable Java 2 security" - echo " -h Display this help and exit" - shift - exit 0 - ;; - *) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - esac -done -if $LOGO ; then - if [ -e $LOGO_FILE ] - then - cat $LOGO_FILE - fi -fi -if $STOP && $FORCE ; -then - for f in `find . -name "server-start_*"`; do - f_split=(${f//_/ }); - echo "Found process file : $f" - echo -n " Sending kill signals to process ${f_split[1]}..." - out=`kill -9 ${f_split[1]} 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - echo -n " Removing process file..." - out=`rm $f 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - done -else - if $IS_DAEMON_MODE ; then - echo "Starting airavata server in daemon mode..." - nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & - else - 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/94a9fca6/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 deleted file mode 100755 index a2c1a52..0000000 --- a/distribution/src/main/resources/bin/api-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. `dirname $0`/setenv.sh -cd $AIRAVATA_HOME/bin -LOGO_FILE="logo.txt" - -JAVA_OPTS="" -AIRAVATA_COMMAND="" -IS_DAEMON_MODE=false -LOGO=true -STOP=false -FORCE=false -SERVERS="--servers=apiserver" -for var in "$@" -do - case $var in - -xdebug) - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000" - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - shift - ;; - -security) - JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME" - shift - ;; - start) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - IS_DAEMON_MODE=true - shift - ;; - stop) - LOGO=false - STOP=true - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - ;; - --force) - FORCE=true - shift - ;; - -nologo) - LOGO=false - shift - ;; - -h) - echo "Usage: airavata-server.sh [command-options]" - echo "command options:" - echo " start Start server in daemon mode" - echo " stop [--force] Stop all airavata servers." - echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)" - echo " -nologo Do not show airavata logo" - echo " -xdebug Start Airavata Server under JPDA debugger" - echo " -security Enable Java 2 security" - echo " -h Display this help and exit" - shift - exit 0 - ;; - *) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var" - shift - esac -done -if $LOGO ; then - if [ -e $LOGO_FILE ] - then - cat $LOGO_FILE - fi -fi -if $STOP && $FORCE ; -then - for f in `find . -name "server-start_*"`; do - f_split=(${f//_/ }); - echo "Found process file : $f" - echo -n " Sending kill signals to process ${f_split[1]}..." - out=`kill -9 ${f_split[1]} 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - echo -n " Removing process file..." - out=`rm $f 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - done -else - if $IS_DAEMON_MODE ; then - echo "Starting airavata server in daemon mode..." - nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & - else - 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/94a9fca6/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 deleted file mode 100755 index cfa6fe2..0000000 --- a/distribution/src/main/resources/bin/gfac-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. `dirname $0`/setenv.sh -cd $AIRAVATA_HOME/bin -LOGO_FILE="logo.txt" - -JAVA_OPTS="" -AIRAVATA_COMMAND="" -IS_DAEMON_MODE=false -LOGO=true -STOP=false -FORCE=false -SERVERS="--servers=gfac" -for var in "$@" -do - case $var in - -xdebug) - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000" - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - shift - ;; - -security) - JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME" - shift - ;; - start) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - IS_DAEMON_MODE=true - shift - ;; - stop) - LOGO=false - STOP=true - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - ;; - --force) - FORCE=true - shift - ;; - -nologo) - LOGO=false - shift - ;; - -h) - echo "Usage: airavata-server.sh [command-options]" - echo "command options:" - echo " start Start server in daemon mode" - echo " stop [--force] Stop all airavata servers." - echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)" - echo " -nologo Do not show airavata logo" - echo " -xdebug Start Airavata Server under JPDA debugger" - echo " -security Enable Java 2 security" - echo " -h Display this help and exit" - shift - exit 0 - ;; - *) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var" - shift - esac -done -if $LOGO ; then - if [ -e $LOGO_FILE ] - then - cat $LOGO_FILE - fi -fi -if $STOP && $FORCE ; -then - for f in `find . -name "server-start_*"`; do - f_split=(${f//_/ }); - echo "Found process file : $f" - echo -n " Sending kill signals to process ${f_split[1]}..." - out=`kill -9 ${f_split[1]} 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - echo -n " Removing process file..." - out=`rm $f 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - done -else - if $IS_DAEMON_MODE ; then - echo "Starting airavata server in daemon mode..." - nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & - else - 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/94a9fca6/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 deleted file mode 100755 index 5d782c5..0000000 --- a/distribution/src/main/resources/bin/orchestrator-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. `dirname $0`/setenv.sh -cd $AIRAVATA_HOME/bin -LOGO_FILE="logo.txt" - -JAVA_OPTS="" -AIRAVATA_COMMAND="" -IS_DAEMON_MODE=false -LOGO=true -STOP=false -FORCE=false -SERVERS="--servers=orchestrator" -for var in "$@" -do - case $var in - -xdebug) - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000" - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - shift - ;; - -security) - JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME" - shift - ;; - start) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - IS_DAEMON_MODE=true - shift - ;; - stop) - LOGO=false - STOP=true - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - ;; - --force) - FORCE=true - shift - ;; - -nologo) - LOGO=false - shift - ;; - -h) - echo "Usage: airavata-server.sh [command-options]" - echo "command options:" - echo " start Start server in daemon mode" - echo " stop [--force] Stop all airavata servers." - echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)" - echo " -nologo Do not show airavata logo" - echo " -xdebug Start Airavata Server under JPDA debugger" - echo " -security Enable Java 2 security" - echo " -h Display this help and exit" - shift - exit 0 - ;; - *) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var" - shift - esac -done -if $LOGO ; then - if [ -e $LOGO_FILE ] - then - cat $LOGO_FILE - fi -fi -if $STOP && $FORCE ; -then - for f in `find . -name "server-start_*"`; do - f_split=(${f//_/ }); - echo "Found process file : $f" - echo -n " Sending kill signals to process ${f_split[1]}..." - out=`kill -9 ${f_split[1]} 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - echo -n " Removing process file..." - out=`rm $f 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - done -else - if $IS_DAEMON_MODE ; then - echo "Starting airavata server in daemon mode..." - nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & - else - 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/94a9fca6/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 deleted file mode 100755 index 870ec53..0000000 --- a/distribution/src/main/resources/bin/workflow-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. `dirname $0`/setenv.sh -cd $AIRAVATA_HOME/bin -LOGO_FILE="logo.txt" - -JAVA_OPTS="" -AIRAVATA_COMMAND="" -IS_DAEMON_MODE=false -LOGO=true -STOP=false -FORCE=false -SERVERS="--servers=workflowserver" -for var in "$@" -do - case $var in - -xdebug) - JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000" - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - shift - ;; - -security) - JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME" - shift - ;; - start) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS" - IS_DAEMON_MODE=true - shift - ;; - stop) - LOGO=false - STOP=true - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var" - shift - ;; - --force) - FORCE=true - shift - ;; - -nologo) - LOGO=false - shift - ;; - -h) - echo "Usage: airavata-server.sh [command-options]" - echo "command options:" - echo " start Start server in daemon mode" - echo " stop [--force] Stop all airavata servers." - echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)" - echo " -nologo Do not show airavata logo" - echo " -xdebug Start Airavata Server under JPDA debugger" - echo " -security Enable Java 2 security" - echo " -h Display this help and exit" - shift - exit 0 - ;; - *) - AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var" - shift - esac -done -if $LOGO ; then - if [ -e $LOGO_FILE ] - then - cat $LOGO_FILE - fi -fi -if $STOP && $FORCE ; -then - for f in `find . -name "server-start_*"`; do - f_split=(${f//_/ }); - echo "Found process file : $f" - echo -n " Sending kill signals to process ${f_split[1]}..." - out=`kill -9 ${f_split[1]} 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - echo -n " Removing process file..." - out=`rm $f 2>&1` - if [ -z "$out" ]; then - echo "done" - else - echo "failed (REASON: $out)" - fi - done -else - if $IS_DAEMON_MODE ; then - echo "Starting airavata server in daemon mode..." - nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \ - org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 & - else - 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/94a9fca6/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java ---------------------------------------------------------------------- diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java index 888a33e..2e12a32 100644 --- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java +++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java @@ -56,7 +56,7 @@ public class ServerMain { private static final String API_SERVER = "apiserver"; private static final String CREDENTIAL_STORE = "credentialstore"; private static final String GFAC_SERVER = "gfac"; - private static final String ORCHESTRATOR = "orcestrator"; + private static final String ORCHESTRATOR = "orchestrator"; private static ServerCnxnFactory cnxnFactory; // private static boolean shutdownHookCalledBefore=false;
