Ian Maxon has submitted this change and it was merged. Change subject: Tweak more licenses ......................................................................
Tweak more licenses Change-Id: Iadb5074d0e0d4fb2b7d4103aa405e9fc91f44bc6 Reviewed-on: https://asterix-gerrit.ics.uci.edu/430 Reviewed-by: Till Westmann <[email protected]> Tested-by: Ian Maxon <[email protected]> --- M asterix-app/src/main/resources/webui/static/css/style.css D asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite/.tinysocial-suite.5.adm.swp M asterix-examples/src/main/resources/admaql101-demo/demo.tpl M asterix-examples/src/main/resources/tweetbook-demo/tweetbook.tpl M asterix-fuzzyjoin/data/verify.sh M asterix-fuzzyjoin/data/verify.stage1.sh M asterix-fuzzyjoin/data/verify.stage2.sh M asterix-fuzzyjoin/data/verify.stage3.sh M asterix-installer/src/main/resources/zookeeper/stop_zk M asterix-installer/src/main/resources/zookeeper/zk.init M asterix-installer/src/test/resources/clusterts/Vagrantfile M asterix-tools/src/test/resources/adgts/dgscripts/events/event.adg M asterix-tools/src/test/resources/adgts/dgscripts/users/user.adg M asterix-yarn/src/main/resources/scripts/asterix 14 files changed, 229 insertions(+), 2 deletions(-) Approvals: Ian Maxon: Verified Till Westmann: Looks good to me, approved diff --git a/asterix-app/src/main/resources/webui/static/css/style.css b/asterix-app/src/main/resources/webui/static/css/style.css index a3e411c..b9b733c 100644 --- a/asterix-app/src/main/resources/webui/static/css/style.css +++ b/asterix-app/src/main/resources/webui/static/css/style.css @@ -1,3 +1,22 @@ +/* + * 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. + */ + body { background: none repeat scroll 0 0 white; color: black; diff --git a/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite/.tinysocial-suite.5.adm.swp b/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite/.tinysocial-suite.5.adm.swp deleted file mode 100644 index e7eb7a1..0000000 --- a/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite/.tinysocial-suite.5.adm.swp +++ /dev/null Binary files differ diff --git a/asterix-examples/src/main/resources/admaql101-demo/demo.tpl b/asterix-examples/src/main/resources/admaql101-demo/demo.tpl index 3e1537a..69fa94f 100644 --- a/asterix-examples/src/main/resources/admaql101-demo/demo.tpl +++ b/asterix-examples/src/main/resources/admaql101-demo/demo.tpl @@ -1,5 +1,22 @@ <!DOCTYPE html> - +<!-- + ! 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. + !--> <html> <head> <title>AsterixDB TinySocial Demo</title> diff --git a/asterix-examples/src/main/resources/tweetbook-demo/tweetbook.tpl b/asterix-examples/src/main/resources/tweetbook-demo/tweetbook.tpl index d6fb3b8..5e81a82 100755 --- a/asterix-examples/src/main/resources/tweetbook-demo/tweetbook.tpl +++ b/asterix-examples/src/main/resources/tweetbook-demo/tweetbook.tpl @@ -1,4 +1,22 @@ <!DOCTYPE html> +<!-- + ! 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. + !--> <html style="width: 100%; height: 100%;"> <head> <title>ASTERIX Demo</title> diff --git a/asterix-fuzzyjoin/data/verify.sh b/asterix-fuzzyjoin/data/verify.sh index 19ad36e..21ae948 100755 --- a/asterix-fuzzyjoin/data/verify.sh +++ b/asterix-fuzzyjoin/data/verify.sh @@ -1,4 +1,21 @@ #!/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 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. + TMP=/tmp/verify_ @@ -53,4 +70,4 @@ fi rm ${TMP}0 ${TMP}1 -echo Pass \ No newline at end of file +echo Pass diff --git a/asterix-fuzzyjoin/data/verify.stage1.sh b/asterix-fuzzyjoin/data/verify.stage1.sh index e648fb5..dc394aa 100755 --- a/asterix-fuzzyjoin/data/verify.stage1.sh +++ b/asterix-fuzzyjoin/data/verify.stage1.sh @@ -1,4 +1,21 @@ #!/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 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. + d=tokens-000 f=part diff --git a/asterix-fuzzyjoin/data/verify.stage2.sh b/asterix-fuzzyjoin/data/verify.stage2.sh index be98a4c..6b5659f 100755 --- a/asterix-fuzzyjoin/data/verify.stage2.sh +++ b/asterix-fuzzyjoin/data/verify.stage2.sh @@ -1,4 +1,21 @@ #!/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 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. + TMP=/tmp/verify_stage2_ d=ridpairs-000 diff --git a/asterix-fuzzyjoin/data/verify.stage3.sh b/asterix-fuzzyjoin/data/verify.stage3.sh index dac5a93..8bb65bd 100755 --- a/asterix-fuzzyjoin/data/verify.stage3.sh +++ b/asterix-fuzzyjoin/data/verify.stage3.sh @@ -1,4 +1,21 @@ #!/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 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. + TMP=/tmp/verify_stage3_ d=recordpairs-000 diff --git a/asterix-installer/src/main/resources/zookeeper/stop_zk b/asterix-installer/src/main/resources/zookeeper/stop_zk index 84d9b74..598ba27 100644 --- a/asterix-installer/src/main/resources/zookeeper/stop_zk +++ b/asterix-installer/src/main/resources/zookeeper/stop_zk @@ -1,4 +1,21 @@ #!/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. + ZK_HOME=$1 shift 1 diff --git a/asterix-installer/src/main/resources/zookeeper/zk.init b/asterix-installer/src/main/resources/zookeeper/zk.init index 6b26363..e15f3d5 100644 --- a/asterix-installer/src/main/resources/zookeeper/zk.init +++ b/asterix-installer/src/main/resources/zookeeper/zk.init @@ -1,4 +1,21 @@ #!/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. + ZK_HOME=$1 SERVER_JAVA_HOME=$2 diff --git a/asterix-installer/src/test/resources/clusterts/Vagrantfile b/asterix-installer/src/test/resources/clusterts/Vagrantfile index fdd1852..11f6cbe 100644 --- a/asterix-installer/src/test/resources/clusterts/Vagrantfile +++ b/asterix-installer/src/test/resources/clusterts/Vagrantfile @@ -1,6 +1,23 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# 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. + # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! VAGRANTFILE_API_VERSION = "2" diff --git a/asterix-tools/src/test/resources/adgts/dgscripts/events/event.adg b/asterix-tools/src/test/resources/adgts/dgscripts/events/event.adg index b757994..acfec63 100644 --- a/asterix-tools/src/test/resources/adgts/dgscripts/events/event.adg +++ b/asterix-tools/src/test/resources/adgts/dgscripts/events/event.adg @@ -1,3 +1,21 @@ +/* + * 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. + */ drop dataverse events if exists; create dataverse events; use dataverse events; diff --git a/asterix-tools/src/test/resources/adgts/dgscripts/users/user.adg b/asterix-tools/src/test/resources/adgts/dgscripts/users/user.adg index 8ad2ad5..3e63a62 100644 --- a/asterix-tools/src/test/resources/adgts/dgscripts/users/user.adg +++ b/asterix-tools/src/test/resources/adgts/dgscripts/users/user.adg @@ -1,3 +1,22 @@ +/* + * 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. + */ + drop dataverse events if exists; create dataverse events; use dataverse events; diff --git a/asterix-yarn/src/main/resources/scripts/asterix b/asterix-yarn/src/main/resources/scripts/asterix index 4acc431..c107843 100644 --- a/asterix-yarn/src/main/resources/scripts/asterix +++ b/asterix-yarn/src/main/resources/scripts/asterix @@ -1,4 +1,21 @@ #!/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. + if [ -z $ASTERIX_HOME ] then pushd $(dirname $0) >/dev/null -- To view, visit https://asterix-gerrit.ics.uci.edu/430 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iadb5074d0e0d4fb2b7d4103aa405e9fc91f44bc6 Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: release-0.8.7 Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
