From cba85f063554cd3b6ced991c6644264a61d4470c Mon Sep 17 00:00:00 2001 From: nkorange Date: Sat, 2 Feb 2019 15:14:16 +0800 Subject: [PATCH] #502 Fix licence problem --- .../alibaba/nacos/api/naming/CommonParams.java | 15 +++++++++++++++ .../nacos/naming/cluster/ServerListManager.java | 15 +++++++++++++++ .../nacos/naming/cluster/servers/Server.java | 15 +++++++++++++++ .../cluster/servers/ServerChangeListener.java | 15 +++++++++++++++ .../nacos/naming/consistency/ApplyAction.java | 15 +++++++++++++++ .../raft/RaftConsistencyServiceImpl.java | 15 +++++++++++++++ .../healthcheck/NoneHealthCheckProcessor.java | 15 +++++++++++++++ test/src/test/resources/application.properties | 2 +- 8 files changed, 106 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java b/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java index 6e3643d30..f2b7b7100 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.api.naming; /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerListManager.java b/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerListManager.java index efe08e008..aed72b8ee 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerListManager.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerListManager.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.cluster; import com.alibaba.fastjson.JSON; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/Server.java b/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/Server.java index 5182b5075..fcd9cdc63 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/Server.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/Server.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.cluster.servers; import com.alibaba.fastjson.JSON; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/ServerChangeListener.java b/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/ServerChangeListener.java index 65191f8bf..c4ebbea64 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/ServerChangeListener.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/cluster/servers/ServerChangeListener.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.cluster.servers; import java.util.List; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/ApplyAction.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/ApplyAction.java index 31436608a..e3fbe00d3 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/ApplyAction.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/consistency/ApplyAction.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.consistency; /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java index b3a945ab6..520a2fc76 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.consistency.persistent.raft; import com.alibaba.nacos.api.exception.NacosException; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NoneHealthCheckProcessor.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NoneHealthCheckProcessor.java index a9a665d0b..a9ecb3338 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NoneHealthCheckProcessor.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NoneHealthCheckProcessor.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ package com.alibaba.nacos.naming.healthcheck; import org.springframework.stereotype.Component; diff --git a/test/src/test/resources/application.properties b/test/src/test/resources/application.properties index 0d0854daf..6bfd3583c 100644 --- a/test/src/test/resources/application.properties +++ b/test/src/test/resources/application.properties @@ -14,7 +14,7 @@ management.metrics.export.influx.enabled=false #management.metrics.export.influx.consistency=one #management.metrics.export.influx.compressed=true -server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.enabled=false server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D # default current work dir server.tomcat.basedir=