-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #751 from apache/feature/685-update-container-conf…
…ig-properties-usage Feature/685 update container config properties usage
- Loading branch information
Showing
74 changed files
with
1,697 additions
and
1,722 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
bundles/remote_services/remote_service_admin_dfi/gtest/client.properties.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
CELIX_AUTO_START_1=@rsa_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ @tst_bundle_file@ | ||
LOGHELPER_ENABLE_STDOUT_FALLBACK=true | ||
CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true | ||
CELIX_FRAMEWORK_CACHE_DIR=.cacheClient | ||
|
||
DISCOVERY_CFG_POLL_INTERVAL=1 | ||
DISCOVERY_CFG_POLL_TIMEOUT=5 | ||
RSA_PORT=50881 | ||
DISCOVERY_CFG_SERVER_PORT=50991 | ||
DISCOVERY_CFG_POLL_ENDPOINTS=http://localhost:50992/org.apache.celix.discovery.configured | ||
{ | ||
"CELIX_AUTO_START_1":"@rsa_bundle_file@,@discovery_bundle_file@,@topology_manager_bundle_file@,@tst_bundle_file@", | ||
"LOGHELPER_ENABLE_STDOUT_FALLBACK":true, | ||
"CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE":true, | ||
"CELIX_FRAMEWORK_CACHE_DIR":".cacheClient", | ||
"DISCOVERY_CFG_POLL_INTERVAL":1, | ||
"DISCOVERY_CFG_POLL_TIMEOUT":5, | ||
"RSA_PORT":50881, | ||
"DISCOVERY_CFG_SERVER_PORT":50991, | ||
"DISCOVERY_CFG_POLL_ENDPOINTS":"http://localhost:50992/org.apache.celix.discovery.configured" | ||
} |
25 changes: 5 additions & 20 deletions
25
bundles/remote_services/remote_service_admin_dfi/gtest/config.properties.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,5 @@ | ||
# 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. | ||
|
||
CELIX_AUTO_START_1=@rsa_bundle_file@ @calc_bundle_file@ | ||
LOGHELPER_ENABLE_STDOUT_FALLBACK=true | ||
CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true | ||
{ | ||
"CELIX_AUTO_START_1":"@rsa_bundle_file@,@calc_bundle_file@", | ||
"LOGHELPER_ENABLE_STDOUT_FALLBACK":true, | ||
"CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE":true | ||
} |
37 changes: 11 additions & 26 deletions
37
bundles/remote_services/remote_service_admin_dfi/gtest/server.properties.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,11 @@ | ||
# 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. | ||
CELIX_AUTO_START_1=@rsa_bundle_file@ @calc_bundle_file@ @remote_example_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ | ||
LOGHELPER_ENABLE_STDOUT_FALLBACK=true | ||
CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true | ||
CELIX_FRAMEWORK_CACHE_DIR=.cacheServer | ||
|
||
DISCOVERY_CFG_POLL_INTERVAL=1 | ||
DISCOVERY_CFG_POLL_TIMEOUT=5 | ||
RSA_PORT=50882 | ||
DISCOVERY_CFG_SERVER_PORT=50992 | ||
DISCOVERY_CFG_POLL_ENDPOINTS=http://localhost:50991/org.apache.celix.discovery.configured | ||
{ | ||
"CELIX_AUTO_START_1":"@rsa_bundle_file@,@calc_bundle_file@,@remote_example_bundle_file@,@discovery_bundle_file@,@topology_manager_bundle_file@", | ||
"LOGHELPER_ENABLE_STDOUT_FALLBACK":true, | ||
"CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE":true, | ||
"CELIX_FRAMEWORK_CACHE_DIR":".cacheServer", | ||
"DISCOVERY_CFG_POLL_INTERVAL":1, | ||
"DISCOVERY_CFG_POLL_TIMEOUT":5, | ||
"RSA_PORT":50882, | ||
"DISCOVERY_CFG_SERVER_PORT":50992, | ||
"DISCOVERY_CFG_POLL_ENDPOINTS":"http://localhost:50991/org.apache.celix.discovery.configured" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.