This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/master by this push:
new 0092f38 Updating build scripts
0092f38 is described below
commit 0092f38d604ce6050fd4d4eedda232e12e574e64
Author: DImuthuUpe <[email protected]>
AuthorDate: Sat Aug 5 04:14:47 2023 -0400
Updating build scripts
---
scripts/build.sh | 6 ++++--
scripts/log.sh | 23 ++++-------------------
scripts/start-mft.sh | 6 +-----
scripts/stop-mft.sh | 6 +-----
4 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index 2d495f6..a857f5b 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -21,7 +21,8 @@ cd ../
mvn clean install
rm -rf airavata-mft
mkdir -p airavata-mft
-cp agent/target/MFT-Agent-0.01-bin.zip airavata-mft/
+cp agent/service/target/MFT-Agent-0.01-bin.zip airavata-mft/
+cp standalone-service/target/Standalone-Service-0.01-bin.zip airavata-mft/
cp controller/target/MFT-Controller-0.01-bin.zip airavata-mft/
cp services/resource-service/server/target/Resource-Service-0.01-bin.zip
airavata-mft/
cp services/secret-service/server/target/Secret-Service-0.01-bin.zip
airavata-mft/
@@ -31,10 +32,11 @@ cp scripts/start-mft.sh airavata-mft/
cp scripts/stop-mft.sh airavata-mft/
cp scripts/start-consul.sh airavata-mft/
cp scripts/stop-consul.sh airavata-mft/
-cp
command-line/target/mft-command-line-0.01-SNAPSHOT-jar-with-dependencies.jar
airavata-mft/mft-client.jar
unzip -o airavata-mft/MFT-Agent-0.01-bin.zip -d airavata-mft/
rm airavata-mft/MFT-Agent-0.01-bin.zip
+unzip -o airavata-mft/Standalone-Service-0.01-bin.zip -d airavata-mft/
+rm airavata-mft/Standalone-Service-0.01-bin.zip
unzip -o airavata-mft/MFT-Controller-0.01-bin.zip -d airavata-mft/
rm airavata-mft/MFT-Controller-0.01-bin.zip
unzip -o airavata-mft/Resource-Service-0.01-bin.zip -d airavata-mft/
diff --git a/scripts/log.sh b/scripts/log.sh
index 50e5a95..35d7dba 100755
--- a/scripts/log.sh
+++ b/scripts/log.sh
@@ -18,20 +18,8 @@
# under the License.
case $1 in
- agent)
- tail -100f ../airavata-mft/MFT-Agent-0.01/logs/airavata.log
- ;;
- resource)
- tail -100f ../airavata-mft/Resource-Service-0.01/logs/airavata.log
- ;;
- secret)
- tail -100f ../airavata-mft/Secret-Service-0.01/logs/airavata.log
- ;;
- api)
- tail -100f ../airavata-mft/API-Service-0.01/logs/airavata.log
- ;;
- controller)
- tail -100f ../airavata-mft/MFT-Controller-0.01/logs/airavata.log
+ mft)
+ tail -100f ../airavata-mft/Standalone-Service-0.01/logs/airavata.log
;;
consul)
tail -100f ../airavata-mft/consul/consul.log
@@ -40,11 +28,8 @@ case $1 in
echo "Usage: log.sh"
echo "command options:"
- echo " agent View logs of MFT Agent"
- echo " resource View logs of MFT Resource Service"
- echo " secret View logs of MFT Secret Service"
- echo " api View logs of MFT API Service"
- echo " controller View logs of MFT Controller"
+ echo " mft View logs of MFT"
+ echo " consul View logs of Consul"
echo " -h Display this help and exit"
shift
exit 0
diff --git a/scripts/start-mft.sh b/scripts/start-mft.sh
index 64215dd..8966a69 100755
--- a/scripts/start-mft.sh
+++ b/scripts/start-mft.sh
@@ -17,8 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh start
-./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh start
-./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh start
-./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh start
-./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh start
\ No newline at end of file
+./../airavata-mft/Standalone-Service-0.01/bin/standalone-service-daemon.sh
start
\ No newline at end of file
diff --git a/scripts/stop-mft.sh b/scripts/stop-mft.sh
index f9110ec..02ee1f4 100755
--- a/scripts/stop-mft.sh
+++ b/scripts/stop-mft.sh
@@ -17,8 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh stop
-./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh stop
-./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh stop
-./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh stop
-./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh stop
\ No newline at end of file
+./../airavata-mft/Standalone-Service-0.01/bin/standalone-service-daemon.sh stop
\ No newline at end of file
