This is an automated email from the ASF dual-hosted git repository. yuanbo pushed a commit to branch TUBEMQ-469 in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
commit d3ca3f0ff238851ccec00e216e1958cf5d9d6cd3 Author: gosonzhang <[email protected]> AuthorDate: Mon Feb 8 22:32:18 2021 +0800 [TUBEMQ-558] Adjust the LICENSE of the file header (#424) Co-authored-by: gosonzhang <[email protected]> --- tubemq-docker/tubemq-all/Dockerfile | 20 ++++++++++++-------- tubemq-manager/bin/start-manager.sh | 8 +++++++- tubemq-manager/bin/stop-manager.sh | 8 +++++++- tubemq-manager/conf/logback.xml | 25 ++++++++++++++----------- tubemq-manager/src/main/assembly/assembly.xml | 25 ++++++++++++++----------- 5 files changed, 54 insertions(+), 32 deletions(-) diff --git a/tubemq-docker/tubemq-all/Dockerfile b/tubemq-docker/tubemq-all/Dockerfile index 1f404d3..605d1f1 100644 --- a/tubemq-docker/tubemq-all/Dockerfile +++ b/tubemq-docker/tubemq-all/Dockerfile @@ -1,13 +1,17 @@ -# with the License. You may obtain a copy of the License at +# 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 +# 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. +# 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. # # tubemq depend on zookeeper FROM zookeeper:3.4 diff --git a/tubemq-manager/bin/start-manager.sh b/tubemq-manager/bin/start-manager.sh index 19acbef..a81953d 100755 --- a/tubemq-manager/bin/start-manager.sh +++ b/tubemq-manager/bin/start-manager.sh @@ -1,3 +1,8 @@ +#!/bin/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 @@ -8,8 +13,9 @@ # 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 an +# See the License for the specific language governing permissions and # limitations under the License. +# base_dir=$(dirname $0) diff --git a/tubemq-manager/bin/stop-manager.sh b/tubemq-manager/bin/stop-manager.sh index a3b7abd..e26d999 100755 --- a/tubemq-manager/bin/stop-manager.sh +++ b/tubemq-manager/bin/stop-manager.sh @@ -1,3 +1,8 @@ +#!/bin/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 @@ -8,8 +13,9 @@ # 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 an +# See the License for the specific language governing permissions and # limitations under the License. +# SIGNAL=${SIGNAL:-TERM} diff --git a/tubemq-manager/conf/logback.xml b/tubemq-manager/conf/logback.xml index 3e4259f..97130b2 100644 --- a/tubemq-manager/conf/logback.xml +++ b/tubemq-manager/conf/logback.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - 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. See accompanying LICENSE file. +// 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. --> <configuration> <property name="FILE_ERROR_PATTERN" diff --git a/tubemq-manager/src/main/assembly/assembly.xml b/tubemq-manager/src/main/assembly/assembly.xml index 82a8b8a..d1ca6ee 100644 --- a/tubemq-manager/src/main/assembly/assembly.xml +++ b/tubemq-manager/src/main/assembly/assembly.xml @@ -1,15 +1,18 @@ <!-- - 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. See accompanying LICENSE file. +// 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. --> <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
