Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed: prepare release and fixed license and notice end year
- Loading branch information
Showing
28 changed files
with
396 additions
and
414 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
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,5 +1,5 @@ | ||
Apache Dubbo Js | ||
Copyright 2018-2022 The Apache Software Foundation | ||
Copyright 2018-2021 The Apache Software Foundation | ||
|
||
This product includes software developed at | ||
The Apache Software Foundation (http://www.apache.org/). |
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
22 changes: 11 additions & 11 deletions
22
dubbo-java/dubbo-demo/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties
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
23 changes: 12 additions & 11 deletions
23
dubbo-java/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
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
50 changes: 18 additions & 32 deletions
50
dubbo-java/dubbo-demo/dubbo-demo-provider-with-nacos/src/main/assembly/conf/dubbo.properties
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
41 changes: 6 additions & 35 deletions
41
dubbo-java/dubbo-demo/dubbo-demo-provider-with-nacos/src/main/resources/log4j.properties
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
26 changes: 7 additions & 19 deletions
26
...ava/dubbo-demo/dubbo-demo-provider-with-zookeeper/src/main/assembly/conf/dubbo.properties
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
25 changes: 6 additions & 19 deletions
25
dubbo-java/dubbo-demo/dubbo-demo-provider-with-zookeeper/src/main/resources/log4j.properties
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
68 changes: 20 additions & 48 deletions
68
dubbo-java/dubbo-demo/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties
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,58 +1,30 @@ | ||
# 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 | ||
# 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. | ||
|
||
# Copyright 1999-2018 Alibaba Group Holding Ltd. | ||
# Licensed 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 | ||
# 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. | ||
|
||
# | ||
# 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. | ||
|
||
## | ||
dubbo.container=log4j,spring | ||
dubbo.application.name=demo-provider | ||
dubbo.application.owner= | ||
dubbo.registry.address=multicast://224.5.6.7:1234 | ||
#dubbo.registry.address=zookeeper://127.0.0.1:2181 | ||
#dubbo.registry.address=redis://127.0.0.1:6379 | ||
#dubbo.registry.address=dubbo://127.0.0.1:9090 | ||
dubbo.monitor.protocol=registry | ||
dubbo.protocol.name=dubbo | ||
dubbo.protocol.port=20880 | ||
dubbo.service.loadbalance=roundrobin | ||
dubbo.log4j.file=logs/dubbo-demo-provider.log | ||
|
||
## | ||
dubbo.container=log4j,spring | ||
dubbo.application.name=demo-provider | ||
dubbo.application.owner= | ||
dubbo.registry.address=multicast://224.5.6.7:1234 | ||
#dubbo.registry.address=zookeeper://127.0.0.1:2181 | ||
#dubbo.registry.address=redis://127.0.0.1:6379 | ||
#dubbo.registry.address=dubbo://127.0.0.1:9090 | ||
dubbo.monitor.protocol=registry | ||
dubbo.protocol.name=dubbo | ||
dubbo.protocol.port=20880 | ||
dubbo.service.loadbalance=roundrobin | ||
dubbo.log4j.file=logs/dubbo-demo-provider.log | ||
dubbo.log4j.level=WARN |
Oops, something went wrong.