little-cui closed pull request #300: SCB-317 Merge frontend conf to app.conf and fix shebang line issue in sh files URL: https://github.com/apache/incubator-servicecomb-service-center/pull/300
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index 57d0464a..596b2bc7 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ Apache ServiceComb (incubating) service-center allows services to register their - **Metrics**: Able to expose Prometheus metric API automatically - **Tracing**: Able to report tracing data to Zipkin server +## Documentation + +Project documentation is available on the [ServiceComb website][servicecomb-website]. You can also find some development guide [here](/docs). + +[servicecomb-website]: http://servicecomb.incubator.apache.org/ + ## Quick Start ### Getting Service Center @@ -68,7 +74,6 @@ httpaddr = 127.0.0.1 httpport = 30100 ``` - ### Building & Running Service-Center from source Download the Code @@ -108,11 +113,30 @@ This will bring up Service Center listening on ip/port 127.0.0.1:30100 for servi [github-release]: https://github.com/servicecomb/service-center/releases/ -## Documentation +### Running Frontend using the Release + +You can download our latest release from ServiceComb Website and then untar it and run start-frontend.sh/start-frontend.bat. +This will bring up the Service-Center UI on [http://127.0.0.1:30103](http://127.0.0.1:30103). + +Windows(apache-incubator-servicecomb-service-center-XXX-windows-amd64.zip): +``` +start-frontend.bat +``` + +Linux(apache-incubator-servicecomb-service-center-XXXX-linux-amd64.tar.gz): +```sh +./start-frontend.sh +``` + +Note: By default frontend runs on 127.0.0.1, if you want to change this then you can change it in `conf/app.conf`. +``` +frontend_host_ip=127.0.0.1 +frontend_host_port=30103 +``` +You can also change the the IP of Service-Center to which Frontend is connected over here `app/apiList/apiList.js` -Project documentation is available on the [ServiceComb website][servicecomb-website]. You can also find some development guide [here](/docs) -[servicecomb-website]: http://servicecomb.io/ +You can follow the guide over [here](frontend/Readme.md#running-ui-from-source-code) to run the Frontend from source. ## Contact diff --git a/docs/release/rat-report/Rat-Report-2018-03-08.md b/docs/release/rat-report/Rat-Report-2018-03-08.md new file mode 100644 index 00000000..d26e69f9 --- /dev/null +++ b/docs/release/rat-report/Rat-Report-2018-03-08.md @@ -0,0 +1,280 @@ +``` +root@SZX1000272432:~/apache# java -jar apache-rat-0.12.jar -a -d incubator-servicecomb-service-center/ -e *.md *.MD .gitignore .gitmodules .travis.yml *.json *.yaml *.tmpl *.conf *.html *.pb.go services.proto broker.proto manifest **vendor** **licenses** + +***************************************************** +Summary +------- +Generated at: 2018-03-08T16:38:30+08:00 + +Notes: 5 +Binaries: 9 +Archives: 0 +Standards: 237 + +Apache Licensed: 237 +Generated Documents: 0 + +JavaDocs are generated, thus a license header is optional. +Generated files do not require license headers. + +0 Unknown Licenses + +***************************************************** + Files with Apache License headers will be marked AL + Binary files (which do not require any license headers) will be marked B + Compressed archives will be marked A + Notices, licenses etc. will be marked N + N incubator-servicecomb-service-center/DISCLAIMER + N incubator-servicecomb-service-center/LICENSE + N incubator-servicecomb-service-center/NOTICE + AL incubator-servicecomb-service-center/main.go + B incubator-servicecomb-service-center/docs/Service-Center-UI-Preview.gif + B incubator-servicecomb-service-center/docs/communication.PNG + B incubator-servicecomb-service-center/docs/onStartup.PNG + B incubator-servicecomb-service-center/docs/tracing-file.PNG + B incubator-servicecomb-service-center/docs/tracing-server.PNG + AL incubator-servicecomb-service-center/examples/service_center/request/add_dependecy.sh + AL incubator-servicecomb-service-center/examples/service_center/request/create_service.sh + AL incubator-servicecomb-service-center/examples/service_center/request/delete_instance.sh + AL incubator-servicecomb-service-center/examples/service_center/request/delete_service.sh + AL incubator-servicecomb-service-center/examples/service_center/request/get_consumers.sh + AL incubator-servicecomb-service-center/examples/service_center/request/get_providers.sh + AL incubator-servicecomb-service-center/examples/service_center/request/get_service.sh + AL incubator-servicecomb-service-center/examples/service_center/request/heartbeat.sh + AL incubator-servicecomb-service-center/examples/service_center/request/register_intance_json.sh + AL incubator-servicecomb-service-center/examples/service_center/request/update_properties.sh + AL incubator-servicecomb-service-center/examples/service_center/request/update_status.sh + AL incubator-servicecomb-service-center/frontend/main.go + B incubator-servicecomb-service-center/frontend/app/favicon.ico + AL incubator-servicecomb-service-center/frontend/app/apiList/apiList.js + B incubator-servicecomb-service-center/frontend/app/images/loader.gif + B incubator-servicecomb-service-center/frontend/app/images/sc.png + B incubator-servicecomb-service-center/frontend/app/images/yeoman.png + AL incubator-servicecomb-service-center/frontend/app/scripts/app.js + AL incubator-servicecomb-service-center/frontend/app/scripts/scRouterConfig.js + AL incubator-servicecomb-service-center/frontend/app/scripts/controllers/serviceCenterCtrl.js + AL incubator-servicecomb-service-center/frontend/app/scripts/directives/nodataFoundDirective.js + AL incubator-servicecomb-service-center/frontend/app/scripts/directives/tableDirective.js + AL incubator-servicecomb-service-center/frontend/app/scripts/languages/locale-cz.js + AL incubator-servicecomb-service-center/frontend/app/scripts/languages/locale-en.js + AL incubator-servicecomb-service-center/frontend/app/scripts/modules/dashboard/controllers/dashboardCtrl.js + AL incubator-servicecomb-service-center/frontend/app/scripts/modules/serviceCenter/controllers/schemaCtrl.js + AL incubator-servicecomb-service-center/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js + AL incubator-servicecomb-service-center/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js + AL incubator-servicecomb-service-center/frontend/app/scripts/modules/serviceCenter/filters/formatSchema.js + AL incubator-servicecomb-service-center/frontend/app/scripts/services/commonService.js + AL incubator-servicecomb-service-center/frontend/app/scripts/services/httpService.js + AL incubator-servicecomb-service-center/frontend/app/styles/main.css + AL incubator-servicecomb-service-center/frontend/schema/schemahandler.go + AL incubator-servicecomb-service-center/integration/apis.go + AL incubator-servicecomb-service-center/integration/governance_test.go + AL incubator-servicecomb-service-center/integration/health_test.go + AL incubator-servicecomb-service-center/integration/instances_test.go + AL incubator-servicecomb-service-center/integration/integrationtest_suite_test.go + AL incubator-servicecomb-service-center/integration/microservices_test.go + AL incubator-servicecomb-service-center/integration/rules_test.go + AL incubator-servicecomb-service-center/integration/schema_test.go + AL incubator-servicecomb-service-center/integration/tags_test.go + AL incubator-servicecomb-service-center/pkg/async/async_task.go + AL incubator-servicecomb-service-center/pkg/async/async_task_test.go + AL incubator-servicecomb-service-center/pkg/chain/callback.go + AL incubator-servicecomb-service-center/pkg/chain/chain.go + AL incubator-servicecomb-service-center/pkg/chain/chain_test.go + AL incubator-servicecomb-service-center/pkg/chain/handler.go + AL incubator-servicecomb-service-center/pkg/chain/invocation.go + AL incubator-servicecomb-service-center/pkg/errors/error.go + AL incubator-servicecomb-service-center/pkg/etcdsync/etcdsync_suite_test.go + AL incubator-servicecomb-service-center/pkg/etcdsync/mutex.go + AL incubator-servicecomb-service-center/pkg/etcdsync/mutex_test.go + AL incubator-servicecomb-service-center/pkg/grace/grace.go + AL incubator-servicecomb-service-center/pkg/plugin/loader.go + AL incubator-servicecomb-service-center/pkg/plugin/loader_test.go + AL incubator-servicecomb-service-center/pkg/rest/client.go + AL incubator-servicecomb-service-center/pkg/rest/common.go + AL incubator-servicecomb-service-center/pkg/rest/conn.go + AL incubator-servicecomb-service-center/pkg/rest/listener.go + AL incubator-servicecomb-service-center/pkg/rest/roa.go + AL incubator-servicecomb-service-center/pkg/rest/route.go + AL incubator-servicecomb-service-center/pkg/rest/server.go + AL incubator-servicecomb-service-center/pkg/rpc/grpc.go + AL incubator-servicecomb-service-center/pkg/tlsutil/tlsutil.go + AL incubator-servicecomb-service-center/pkg/util/concurrent_map.go + AL incubator-servicecomb-service-center/pkg/util/concurrent_map_test.go + AL incubator-servicecomb-service-center/pkg/util/context.go + AL incubator-servicecomb-service-center/pkg/util/goroutines.go + AL incubator-servicecomb-service-center/pkg/util/goroutines_test.go + AL incubator-servicecomb-service-center/pkg/util/log.go + AL incubator-servicecomb-service-center/pkg/util/log_test.go + AL incubator-servicecomb-service-center/pkg/util/logrotate.go + AL incubator-servicecomb-service-center/pkg/util/metric.go + AL incubator-servicecomb-service-center/pkg/util/net.go + AL incubator-servicecomb-service-center/pkg/util/net_test.go + AL incubator-servicecomb-service-center/pkg/util/reflect.go + AL incubator-servicecomb-service-center/pkg/util/reflect_test.go + AL incubator-servicecomb-service-center/pkg/util/sys.go + AL incubator-servicecomb-service-center/pkg/util/tree.go + AL incubator-servicecomb-service-center/pkg/util/tree_test.go + AL incubator-servicecomb-service-center/pkg/util/uniqueue.go + AL incubator-servicecomb-service-center/pkg/util/uniqueue_test.go + AL incubator-servicecomb-service-center/pkg/util/util.go + AL incubator-servicecomb-service-center/pkg/util/util_test.go + AL incubator-servicecomb-service-center/pkg/util/uuid.go + AL incubator-servicecomb-service-center/pkg/validate/url.go + AL incubator-servicecomb-service-center/pkg/validate/validate.go + AL incubator-servicecomb-service-center/scripts/create_gvt_manifest(exp).sh + AL incubator-servicecomb-service-center/scripts/integration_test.sh + AL incubator-servicecomb-service-center/scripts/prepare_env_ut.sh + AL incubator-servicecomb-service-center/scripts/ut.sh + AL incubator-servicecomb-service-center/scripts/ut_test_in_docker.sh + AL incubator-servicecomb-service-center/scripts/docker/build-frontend-image/build.sh + AL incubator-servicecomb-service-center/scripts/docker/build-image/build.sh + AL incubator-servicecomb-service-center/scripts/docker/build-image/start.sh + N incubator-servicecomb-service-center/scripts/release/LICENSE + N incubator-servicecomb-service-center/scripts/release/NOTICE + AL incubator-servicecomb-service-center/scripts/release/make_release.sh + AL incubator-servicecomb-service-center/scripts/release/start_scripts/linux/start-frontend.sh + AL incubator-servicecomb-service-center/scripts/release/start_scripts/linux/start-service-center.sh + AL incubator-servicecomb-service-center/scripts/release/start_scripts/linux/stop-frontend.sh + AL incubator-servicecomb-service-center/scripts/release/start_scripts/linux/stop-service-center.sh + AL incubator-servicecomb-service-center/scripts/release/start_scripts/windows/start-frontend.bat + AL incubator-servicecomb-service-center/scripts/release/start_scripts/windows/start-service-center.bat + AL incubator-servicecomb-service-center/server/api.go + AL incubator-servicecomb-service-center/server/server.go + AL incubator-servicecomb-service-center/server/bootstrap/bootstrap.go + AL incubator-servicecomb-service-center/server/broker/broker.go + AL incubator-servicecomb-service-center/server/broker/broker_key_generator.go + AL incubator-servicecomb-service-center/server/broker/controller.go + AL incubator-servicecomb-service-center/server/broker/service.go + AL incubator-servicecomb-service-center/server/broker/service_test.go + AL incubator-servicecomb-service-center/server/broker/store.go + AL incubator-servicecomb-service-center/server/broker/util.go + AL incubator-servicecomb-service-center/server/core/0_init.go + AL incubator-servicecomb-service-center/server/core/common.go + AL incubator-servicecomb-service-center/server/core/info.go + AL incubator-servicecomb-service-center/server/core/key_generator.go + AL incubator-servicecomb-service-center/server/core/microservice.go + AL incubator-servicecomb-service-center/server/core/backend/backend.go + AL incubator-servicecomb-service-center/server/core/backend/store/async.go + AL incubator-servicecomb-service-center/server/core/backend/store/cacher.go + AL incubator-servicecomb-service-center/server/core/backend/store/defer.go + AL incubator-servicecomb-service-center/server/core/backend/store/defer_test.go + AL incubator-servicecomb-service-center/server/core/backend/store/event.go + AL incubator-servicecomb-service-center/server/core/backend/store/indexer.go + AL incubator-servicecomb-service-center/server/core/backend/store/lease.go + AL incubator-servicecomb-service-center/server/core/backend/store/listwatch.go + AL incubator-servicecomb-service-center/server/core/backend/store/opt.go + AL incubator-servicecomb-service-center/server/core/backend/store/store.go + AL incubator-servicecomb-service-center/server/core/proto/services.go + AL incubator-servicecomb-service-center/server/error/error.go + AL incubator-servicecomb-service-center/server/govern/controller_v3.go + AL incubator-servicecomb-service-center/server/govern/controller_v4.go + AL incubator-servicecomb-service-center/server/govern/govern.go + AL incubator-servicecomb-service-center/server/govern/govern_suite_test.go + AL incubator-servicecomb-service-center/server/govern/service.go + AL incubator-servicecomb-service-center/server/govern/service_test.go + AL incubator-servicecomb-service-center/server/handler/auth/auth.go + AL incubator-servicecomb-service-center/server/handler/cache/cache.go + AL incubator-servicecomb-service-center/server/handler/context/context.go + AL incubator-servicecomb-service-center/server/handler/context/v3.go + AL incubator-servicecomb-service-center/server/handler/context/v4.go + AL incubator-servicecomb-service-center/server/handler/metric/metric.go + AL incubator-servicecomb-service-center/server/handler/tracing/tracing.go + AL incubator-servicecomb-service-center/server/infra/auditlog/auditlog.go + AL incubator-servicecomb-service-center/server/infra/auth/auth.go + AL incubator-servicecomb-service-center/server/infra/quota/quota.go + AL incubator-servicecomb-service-center/server/infra/registry/registry.go + AL incubator-servicecomb-service-center/server/infra/security/cipher.go + AL incubator-servicecomb-service-center/server/infra/tracing/tracing.go + AL incubator-servicecomb-service-center/server/infra/uuid/uuid.go + AL incubator-servicecomb-service-center/server/interceptor/interceptors.go + AL incubator-servicecomb-service-center/server/interceptor/access/access.go + AL incubator-servicecomb-service-center/server/interceptor/cors/cors.go + AL incubator-servicecomb-service-center/server/mux/mux.go + AL incubator-servicecomb-service-center/server/plugin/plugin.go + AL incubator-servicecomb-service-center/server/plugin/infra/auth/buildin/buildin.go + AL incubator-servicecomb-service-center/server/plugin/infra/quota/buildin/buildin.go + AL incubator-servicecomb-service-center/server/plugin/infra/quota/unlimit/unlimit.go + AL incubator-servicecomb-service-center/server/plugin/infra/registry/buildin/buildin.go + AL incubator-servicecomb-service-center/server/plugin/infra/registry/embededetcd/embededetcd.go + AL incubator-servicecomb-service-center/server/plugin/infra/registry/etcd/etcd.go + AL incubator-servicecomb-service-center/server/plugin/infra/registry/etcd/tracing.go + AL incubator-servicecomb-service-center/server/plugin/infra/security/buildin/buildin.go + AL incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin/buildin.go + AL incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin/common.go + AL incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin/file_collector.go + AL incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin/span.go + AL incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin/span_test.go + AL incubator-servicecomb-service-center/server/plugin/infra/uuid/buildin/buildin.go + AL incubator-servicecomb-service-center/server/rest/handler.go + AL incubator-servicecomb-service-center/server/rest/metric.go + AL incubator-servicecomb-service-center/server/rest/server.go + AL incubator-servicecomb-service-center/server/rest/controller/rest_util.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/dependency_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/instance_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/instance_watcher.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/main_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/microservice_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/query_rule_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/schema_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/tag_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v3/v3.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/dependency_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/instance_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/instance_watcher.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/main_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/microservice_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/query_rule_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/schema_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/tag_controller.go + AL incubator-servicecomb-service-center/server/rest/controller/v4/v4.go + AL incubator-servicecomb-service-center/server/rpc/server.go + AL incubator-servicecomb-service-center/server/service/concurrent_test.go + AL incubator-servicecomb-service-center/server/service/instances.go + AL incubator-servicecomb-service-center/server/service/instances_test.go + AL incubator-servicecomb-service-center/server/service/microservices.go + AL incubator-servicecomb-service-center/server/service/microservices_test.go + AL incubator-servicecomb-service-center/server/service/resource_assembler.go + AL incubator-servicecomb-service-center/server/service/rule.go + AL incubator-servicecomb-service-center/server/service/rule_test.go + AL incubator-servicecomb-service-center/server/service/schema.go + AL incubator-servicecomb-service-center/server/service/schema_test.go + AL incubator-servicecomb-service-center/server/service/service_dependency.go + AL incubator-servicecomb-service-center/server/service/service_dependency_test.go + AL incubator-servicecomb-service-center/server/service/service_suite_test.go + AL incubator-servicecomb-service-center/server/service/tag.go + AL incubator-servicecomb-service-center/server/service/tag_test.go + AL incubator-servicecomb-service-center/server/service/event/dependency_event_handler.go + AL incubator-servicecomb-service-center/server/service/event/event.go + AL incubator-servicecomb-service-center/server/service/event/instance_event_handler.go + AL incubator-servicecomb-service-center/server/service/event/rule_event_handler.go + AL incubator-servicecomb-service-center/server/service/event/service_event_handler.go + AL incubator-servicecomb-service-center/server/service/event/tag_event_handler.go + AL incubator-servicecomb-service-center/server/service/notification/listwatcher.go + AL incubator-servicecomb-service-center/server/service/notification/notification_healthchecker.go + AL incubator-servicecomb-service-center/server/service/notification/notification_service.go + AL incubator-servicecomb-service-center/server/service/notification/struct.go + AL incubator-servicecomb-service-center/server/service/notification/watch_util.go + AL incubator-servicecomb-service-center/server/service/util/dependency.go + AL incubator-servicecomb-service-center/server/service/util/dependency_test.go + AL incubator-servicecomb-service-center/server/service/util/domain_util.go + AL incubator-servicecomb-service-center/server/service/util/domain_util_test.go + AL incubator-servicecomb-service-center/server/service/util/heartbeat_util.go + AL incubator-servicecomb-service-center/server/service/util/heartbeat_util_test.go + AL incubator-servicecomb-service-center/server/service/util/instance_util.go + AL incubator-servicecomb-service-center/server/service/util/instance_util_test.go + AL incubator-servicecomb-service-center/server/service/util/microservice_util.go + AL incubator-servicecomb-service-center/server/service/util/rule_util.go + AL incubator-servicecomb-service-center/server/service/util/rule_util_test.go + AL incubator-servicecomb-service-center/server/service/util/schema_util.go + AL incubator-servicecomb-service-center/server/service/util/schema_util_test.go + AL incubator-servicecomb-service-center/server/service/util/tag_util.go + AL incubator-servicecomb-service-center/server/service/util/tag_util_test.go + AL incubator-servicecomb-service-center/server/service/util/util.go + AL incubator-servicecomb-service-center/server/service/util/util_suite_test.go + AL incubator-servicecomb-service-center/server/service/util/versionrule.go + AL incubator-servicecomb-service-center/server/service/util/versionrule_test.go + AL incubator-servicecomb-service-center/server/tls/tls.go + AL incubator-servicecomb-service-center/version/version.go + +***************************************************** +``` \ No newline at end of file diff --git a/etc/conf/app.conf b/etc/conf/app.conf index a4fb8dc8..a4fa9bfd 100644 --- a/etc/conf/app.conf +++ b/etc/conf/app.conf @@ -106,3 +106,9 @@ logfile = ./service-center.log [dev] loglevel = DEBUG logfile = "" + +################################################################### +# Frontend Configurations +################################################################### +frontend_host_ip=127.0.0.1 +frontend_host_port=30103 \ No newline at end of file diff --git a/examples/service_center/request/add_dependecy.sh b/examples/service_center/request/add_dependecy.sh index d50307f0..7d9b0690 100644 --- a/examples/service_center/request/add_dependecy.sh +++ b/examples/service_center/request/add_dependecy.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + PUT /v4/default/registry/dependencies HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/create_service.sh b/examples/service_center/request/create_service.sh index bc7895cd..81122cb3 100644 --- a/examples/service_center/request/create_service.sh +++ b/examples/service_center/request/create_service.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + POST /v4/default/registry/microservices HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/delete_instance.sh b/examples/service_center/request/delete_instance.sh index 302fca52..1cca4b39 100644 --- a/examples/service_center/request/delete_instance.sh +++ b/examples/service_center/request/delete_instance.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + DELETE /v4/default/registry/microservices/serviceID/instances/instanceID HTTP/1.1 Host: localhost:30100 x-domain-name: default diff --git a/examples/service_center/request/delete_service.sh b/examples/service_center/request/delete_service.sh index cba13214..04c4ebd3 100644 --- a/examples/service_center/request/delete_service.sh +++ b/examples/service_center/request/delete_service.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + DELETE /v4/default/registry/microservices/63cc69716a8f11e79855286ed488ca3e?force=1 HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/get_consumers.sh b/examples/service_center/request/get_consumers.sh index b6138929..62b44e1a 100644 --- a/examples/service_center/request/get_consumers.sh +++ b/examples/service_center/request/get_consumers.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + GET /v4/default/registry/microservices/3/consumers HTTP/1.1 Host: localhost:30100 x-domain-name: default diff --git a/examples/service_center/request/get_providers.sh b/examples/service_center/request/get_providers.sh index 2b4cda4f..07e3149a 100644 --- a/examples/service_center/request/get_providers.sh +++ b/examples/service_center/request/get_providers.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + GET /v4/default/registry/microservices/2/providers HTTP/1.1 Host: localhost:30100 X-Tenant-Name: default diff --git a/examples/service_center/request/get_service.sh b/examples/service_center/request/get_service.sh index 6989726c..4fed2d2c 100644 --- a/examples/service_center/request/get_service.sh +++ b/examples/service_center/request/get_service.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + GET /v4/default/registry/microservices HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/heartbeat.sh b/examples/service_center/request/heartbeat.sh index 98f3618c..1ebfb313 100644 --- a/examples/service_center/request/heartbeat.sh +++ b/examples/service_center/request/heartbeat.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + PUT /v4/default/registry/microservices/2/instances/36/heartbeat HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/register_intance_json.sh b/examples/service_center/request/register_intance_json.sh index b7819c70..da799f61 100644 --- a/examples/service_center/request/register_intance_json.sh +++ b/examples/service_center/request/register_intance_json.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + POST /v4/default/registry/microservices/2/instances HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/update_properties.sh b/examples/service_center/request/update_properties.sh index e84cf314..2af0b04f 100644 --- a/examples/service_center/request/update_properties.sh +++ b/examples/service_center/request/update_properties.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + PUT /v4/default/registry/microservices/2/properties HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/examples/service_center/request/update_status.sh b/examples/service_center/request/update_status.sh index 96394d6d..fcd7e568 100644 --- a/examples/service_center/request/update_status.sh +++ b/examples/service_center/request/update_status.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + PUT /v4/default/registry/microservices/serviceID/instances/instanceID/status?value=UP HTTP/1.1 Host: localhost:30100 Content-Type: application/json diff --git a/frontend/Readme.md b/frontend/Readme.md index da89ec1f..d3e0120f 100644 --- a/frontend/Readme.md +++ b/frontend/Readme.md @@ -18,7 +18,12 @@ Linux(apache-incubator-servicecomb-service-center-XXXX-linux-amd64.tar.gz): ./start-frontend.sh ``` -Note: By default frontend runs on 127.0.0.1, if you want to change this then you can change it in `conf/frontend.conf`. You can also change the the IP of Service-Center to which Frontend is connected over here `app/apiList/apiList.js` +Note: By default frontend runs on 127.0.0.1, if you want to change this then you can change it in `conf/app.conf`. +``` +frontend_host_ip=127.0.0.1 +frontend_host_port=30103 +``` +You can also change the the IP of Service-Center to which Frontend is connected over here `app/apiList/apiList.js` ##### Running UI from source code However if you want to try our latest code then you can follow the below steps @@ -27,7 +32,10 @@ However if you want to try our latest code then you can follow the below steps git clone https://github.com/apache/incubator-servicecomb-service-center.git $GOPATH/src/github.com/apache/incubator-servicecomb-service-center cd $GOPATH/src/github.com/apache/incubator-servicecomb-service-center +cp -r etc/conf frontend/ + cd frontend + go run main.go ``` This will bring up the Service-Center UI on [http://127.0.0.1:30103](http://127.0.0.1:30103). diff --git a/frontend/conf/app.conf b/frontend/conf/app.conf deleted file mode 100644 index 2be8381c..00000000 --- a/frontend/conf/app.conf +++ /dev/null @@ -1,2 +0,0 @@ -FRONTEND_HOST_IP=127.0.0.1 -FRONTEND_HOST_PORT=30103 diff --git a/frontend/main.go b/frontend/main.go index fca9e1cd..8952070d 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -27,8 +27,8 @@ import ( ) func main() { - frontendIp := beego.AppConfig.String("FRONTEND_HOST_IP") - frontendPort := beego.AppConfig.DefaultInt("FRONTEND_HOST_PORT", 30103) + frontendIp := beego.AppConfig.String("frontend_host_ip") + frontendPort := beego.AppConfig.DefaultInt("frontend_host_port", 30103) // command line flags port := flag.Int("port", frontendPort, "port to serve on") diff --git a/scripts/create_gvt_manifest(exp).sh b/scripts/create_gvt_manifest(exp).sh index 44bf4350..b338331a 100755 --- a/scripts/create_gvt_manifest(exp).sh +++ b/scripts/create_gvt_manifest(exp).sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. diff --git a/scripts/docker/build-frontend-image/README.md b/scripts/docker/build-frontend-image/README.md index 01abe88a..e75f5fd7 100644 --- a/scripts/docker/build-frontend-image/README.md +++ b/scripts/docker/build-frontend-image/README.md @@ -10,11 +10,8 @@ Update "PROJECT_ROOT/frontend/conf/app.conf" with service-center applications IP Example app.conf file, - SC_HOST_IP=123.123.123.123 - SC_HOST_PORT=30100 - SC_HOST_MODE=http - FRONTEND_HOST_IP=0.0.0.0 - FRONTEND_HOST_PORT=30103 + frontend_host_ip=0.0.0.0 + frontend_host_port=30103 Note: Configuring SC_HOST_IP will enable you to setup the EIP of the Service-center. diff --git a/scripts/docker/build-frontend-image/build.sh b/scripts/docker/build-frontend-image/build.sh index d5c816f9..36ce3f80 100644 --- a/scripts/docker/build-frontend-image/build.sh +++ b/scripts/docker/build-frontend-image/build.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,6 @@ # 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. -#!/bin/bash set -e @@ -41,7 +42,7 @@ cp -r app conf $BASE_DIR/scripts/frontend/start_linux.sh $SCRIPT_DIR/frontend chmod 755 $SCRIPT_DIR/frontend/start_linux.sh $SCRIPT_DIR/frontend/scfrontend -sed -i "s|FRONTEND_HOST_IP=127.0.0.1|FRONTEND_HOST_IP=0.0.0.0|g" $SCRIPT_DIR/frontend/conf/app.conf +sed -i "s|frontend_host_ip=127.0.0.1|frontend_host_ip=0.0.0.0|g" $SCRIPT_DIR/frontend/conf/app.conf #go to the script directory cd $SCRIPT_DIR diff --git a/scripts/docker/build-image/build.sh b/scripts/docker/build-image/build.sh index 0f928405..0e023aa6 100644 --- a/scripts/docker/build-image/build.sh +++ b/scripts/docker/build-image/build.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,6 @@ # 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. -#!/bin/bash set -e diff --git a/scripts/docker/build-image/start.sh b/scripts/docker/build-image/start.sh index 681eb254..7632960a 100644 --- a/scripts/docker/build-image/start.sh +++ b/scripts/docker/build-image/start.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,6 @@ # 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. -#!/usr/bin/env sh set -e umask 027 diff --git a/scripts/frontend/start_windows.bat b/scripts/frontend/start_windows.bat deleted file mode 100644 index 41f01a40..00000000 --- a/scripts/frontend/start_windows.bat +++ /dev/null @@ -1,60 +0,0 @@ -# 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. -@echo off -3<conf/app.conf ( -SET /p line1= <&3 -SET /p line2= <&3 -SET /p line3= <&3 -) - -FOR /f "tokens=1,2 delims==" %%a in ("%line1%") do SET ip=%%b -FOR /f "tokens=1,2 delims==" %%a in ("%line2%") do SET port=%%b -FOR /f "tokens=1,2 delims==" %%a in ("%line3%") do SET mode=%%b - -CD ./app/apiList -SET "file=apiList.js" -SET "temp=temp.js" - -SET /a Line#ToSearchUrl=18 -SET "REPLACEURL=ip: '%mode%://%ip%'," -SET "URL=%REPLACEURL: =%" -(FOR /f "tokens=1*delims=:" %%a IN ('findstr /n "^" "%file%"') DO ( - SET "IPLine=%%b" - IF %%a equ %Line#ToSearchUrl% SET "IPLine=%URL%" - SETLOCAL ENABLEDELAYEDEXPANSION - ECHO(!IPLine! - ENDLOCAL -))>"%temp%" -TYPE "%temp%" -DEL %file% -) -cls - -SET /a Line#ToSearchPort=19 -SET "REPLACEPORT=port: '%port%'" -SET "PORT=%REPLACEPORT: =%" -(FOR /f "tokens=1*delims=:" %%a IN ('findstr /n "^" "%temp%"') DO ( - SET "PORTLine=%%b" - IF %%a equ %Line#ToSearchPort% SET "PORTLine=%PORT%" - SETLOCAL ENABLEDELAYEDEXPANSION - ECHO(!PORTLine! - ENDLOCAL -))>"%file%" -TYPE "%file%" -DEL %temp% -) -cls -cd ../../ -scfrontend.exe \ No newline at end of file diff --git a/scripts/integration_test.sh b/scripts/integration_test.sh index 2877fe2a..2f6b461c 100755 --- a/scripts/integration_test.sh +++ b/scripts/integration_test.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/usr/bin/env bash + echo "${green}Building Service-center${reset}" go build -o service-center github.com/apache/incubator-servicecomb-service-center diff --git a/scripts/prepare_env_ut.sh b/scripts/prepare_env_ut.sh index cfce8d6f..a92980f9 100755 --- a/scripts/prepare_env_ut.sh +++ b/scripts/prepare_env_ut.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. diff --git a/scripts/release/make_release.sh b/scripts/release/make_release.sh index df01cbba..7cfcf1ed 100755 --- a/scripts/release/make_release.sh +++ b/scripts/release/make_release.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -13,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -#!/usr/bin/env bash - ## Get the Release Number if [ $2 == "" ]; then echo "Invalid version number....exiting...." @@ -109,10 +109,6 @@ build_linux(){ ## Copy the Service-Center Releases cp -r tmp/conf $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ - echo "./apache-incubator-servicecomb-service-center > start-sc.log 2>&1 &" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-service-center.sh - echo "kill -9 \$(ps aux | grep 'apache-incubator-servicecomb-service-center' | awk '{print \$2}')" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-service-center.sh - chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-service-center.sh - chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-service-center.sh cp -r scripts/release/LICENSE $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ cp -r scripts/release/licenses $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ cp -r scripts/release/NOTICE $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ @@ -120,13 +116,11 @@ build_linux(){ cp -r README.md $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ ## Copy the frontend releases - cp -r front-tmp/conf/app.conf $PACKAGE_PREFIX-$PACKAGE-linux-amd64/conf/frontend.conf cp -r frontend/app $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ - echo "./apache-incubator-serviceomb-frontend > start-sc-frontend.log 2>&1 &" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-frontend.sh - echo "kill -9 \$(ps aux | grep 'apache-incubator-serviceomb-frontend' | awk '{print \$2}')" >> $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-frontend.sh - chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/start-frontend.sh - chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/stop-frontend.sh - cp -r frontend/Readme.md $PACKAGE_PREFIX-$PACKAGE-linux-amd64/frontend-Readme.md + + ## Copy Start Scripts + cp -r scripts/release/start_scripts/linux/* $PACKAGE_PREFIX-$PACKAGE-linux-amd64/ + chmod +x $PACKAGE_PREFIX-$PACKAGE-linux-amd64/*.sh ## Archive the release tar -czvf $PACKAGE_PREFIX-$PACKAGE-linux-amd64.tar.gz $PACKAGE_PREFIX-$PACKAGE-linux-amd64 @@ -168,7 +162,6 @@ build_windows(){ ## Copy the service-center releases cp -r tmp/conf $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ - echo "apache-incubator-servicecomb-service-center.exe" >> $PACKAGE_PREFIX-$PACKAGE-windows-amd64/start-service-center.bat cp -r scripts/release/LICENSE $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ cp -r scripts/release/licenses $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ cp -r scripts/release/NOTICE $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ @@ -176,10 +169,10 @@ build_windows(){ cp -r README.md $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ ## Copy the Frontend releases - cp -r front-tmp/conf $PACKAGE_PREFIX-$PACKAGE-windows-amd64/conf/frontend.conf cp -r frontend/app $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ - cp -r frontend/Readme.md $PACKAGE_PREFIX-$PACKAGE-windows-amd64/frontendReadme.md - echo "apache-incubator-serviceomb-frontend.exe" >> $PACKAGE_PREFIX-$PACKAGE-windows-amd64/start-frontend.bat + + ## Copy start scripts + cp -r scripts/release/start_scripts/windows/* $PACKAGE_PREFIX-$PACKAGE-windows-amd64/ ## Archive the Release tar -czvf $PACKAGE_PREFIX-$PACKAGE-windows-amd64.tar.gz $PACKAGE_PREFIX-$PACKAGE-windows-amd64 diff --git a/scripts/frontend/start_linux.sh b/scripts/release/start_scripts/linux/start-frontend.sh similarity index 72% rename from scripts/frontend/start_linux.sh rename to scripts/release/start_scripts/linux/start-frontend.sh index cd1f1d26..fe32a755 100644 --- a/scripts/frontend/start_linux.sh +++ b/scripts/release/start_scripts/linux/start-frontend.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,15 +14,5 @@ # 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. -#!/bin/bash -cd /opt/frontend/ -cd conf/ -. app.conf -echo $SC_HOST_IP -echo $SC_HOST_PORT -echo $SC_HOST_MODE -cd ../ -sed -i '/ip/c\ip:"'$SC_HOST_MODE'://'$SC_HOST_IP'",' ./app/apiList/apiList.js -sed -i '/port/c\port:"'$SC_HOST_PORT'"' ./app/apiList/apiList.js -./scfrontend > start-sc-frontend.log 2>&1 +./apache-incubator-serviceomb-frontend > start-sc-frontend.log 2>&1 & diff --git a/scripts/release/start_scripts/linux/start-service-center.sh b/scripts/release/start_scripts/linux/start-service-center.sh new file mode 100644 index 00000000..baa50bce --- /dev/null +++ b/scripts/release/start_scripts/linux/start-service-center.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env 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. + +./apache-incubator-servicecomb-service-center > start-sc.log 2>&1 & diff --git a/scripts/release/start_scripts/linux/stop-frontend.sh b/scripts/release/start_scripts/linux/stop-frontend.sh new file mode 100644 index 00000000..642c0d89 --- /dev/null +++ b/scripts/release/start_scripts/linux/stop-frontend.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env 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. + +kill -9 $(ps aux | grep 'apache-incubator-serviceomb-frontend' | awk '{print $2}') diff --git a/scripts/release/start_scripts/linux/stop-service-center.sh b/scripts/release/start_scripts/linux/stop-service-center.sh new file mode 100644 index 00000000..3f8216b5 --- /dev/null +++ b/scripts/release/start_scripts/linux/stop-service-center.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env 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. + +kill -9 $(ps aux | grep 'apache-incubator-servicecomb-service-center' | awk '{print $2}') diff --git a/scripts/release/start_scripts/windows/start-frontend.bat b/scripts/release/start_scripts/windows/start-frontend.bat new file mode 100644 index 00000000..21dc005d --- /dev/null +++ b/scripts/release/start_scripts/windows/start-frontend.bat @@ -0,0 +1,16 @@ +# 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. + +apache-incubator-serviceomb-frontend.exe diff --git a/scripts/release/start_scripts/windows/start-service-center.bat b/scripts/release/start_scripts/windows/start-service-center.bat new file mode 100644 index 00000000..f6d53ed1 --- /dev/null +++ b/scripts/release/start_scripts/windows/start-service-center.bat @@ -0,0 +1,16 @@ +# 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. + +apache-incubator-servicecomb-service-center.exe diff --git a/scripts/ut.sh b/scripts/ut.sh index a20f23b3..e8cb0d37 100755 --- a/scripts/ut.sh +++ b/scripts/ut.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,7 @@ # 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. -#!/bin/sh + set -e export COVERAGE_PATH=$(pwd) cd $1 diff --git a/scripts/ut_test_in_docker.sh b/scripts/ut_test_in_docker.sh index 2bbbd24b..fed3fbe5 100755 --- a/scripts/ut_test_in_docker.sh +++ b/scripts/ut_test_in_docker.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env 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. @@ -12,7 +14,6 @@ # 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. -#!/bin/bash set -x set +e ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
