diff options
author | Jacques Nadeau <jacques@apache.org> | 2013-09-10 19:02:19 -0700 |
---|---|---|
committer | Jacques Nadeau <jacques@apache.org> | 2013-09-10 19:02:19 -0700 |
commit | 43d71f1061face8eac853d8b72009b775362a5de (patch) | |
tree | 86e8983bcd13a14140f661618822361c525efe92 /exec | |
parent | 0a5e682d0727a166dd173ef60d1ae781e1496b52 (diff) |
DRILL-221, part 3. More license updates. Automatically run Rat plugin with appropriate excludes. Move Synth-log to sandbox until it is part of main mvn build to avoid weird RAT problems.
Diffstat (limited to 'exec')
-rw-r--r-- | exec/bufferl/pom.xml | 2 | ||||
-rw-r--r-- | exec/java-exec/pom.xml | 2 | ||||
-rw-r--r-- | exec/java-exec/src/main/codegen/config.fmpp | 16 | ||||
-rw-r--r-- | exec/java-exec/src/main/codegen/data/Casts.tdd | 18 | ||||
-rw-r--r-- | exec/java-exec/src/main/codegen/data/CompareTypes.tdd | 17 | ||||
-rw-r--r-- | exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd | 16 | ||||
-rw-r--r-- | exec/java-exec/src/main/codegen/includes/vv_imports.ftl | 11 | ||||
-rw-r--r-- | exec/java-exec/src/main/resources/logback.xml | 16 | ||||
-rwxr-xr-x | exec/java-exec/src/main/sh/runbit | 14 | ||||
-rw-r--r-- | exec/java-exec/src/test/resources/logback.xml | 18 | ||||
-rw-r--r-- | exec/java-exec/src/test/sh/logback.xml | 16 | ||||
-rwxr-xr-x | exec/java-exec/src/test/sh/runbit | 15 | ||||
-rw-r--r-- | exec/pom.xml | 2 | ||||
-rw-r--r-- | exec/ref/pom.xml | 2 | ||||
-rw-r--r-- | exec/ref/src/main/resources/logback-test.xml | 12 | ||||
-rw-r--r-- | exec/ref/src/test/resources/logback.xml | 12 |
16 files changed, 180 insertions, 9 deletions
diff --git a/exec/bufferl/pom.xml b/exec/bufferl/pom.xml index d52cae952..610a723bd 100644 --- a/exec/bufferl/pom.xml +++ b/exec/bufferl/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.apache.drill.exec</groupId> <artifactId>exec-parent</artifactId> - <version>1.0.0-m1-SNAPSHOT</version> + <version>1.0.0-m1-incubating-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 1c5af4b8c..d912ca912 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0.0-m1-SNAPSHOT</version> + <version>1.0.0-m1-incubating-SNAPSHOT</version> </parent> <artifactId>java-exec</artifactId> <name>exec/Java Execution Engine</name> diff --git a/exec/java-exec/src/main/codegen/config.fmpp b/exec/java-exec/src/main/codegen/config.fmpp index ea27863a6..cd2b2cce1 100644 --- a/exec/java-exec/src/main/codegen/config.fmpp +++ b/exec/java-exec/src/main/codegen/config.fmpp @@ -1,3 +1,19 @@ +# 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. + data: { vv: tdd(../data/ValueVectorTypes.tdd), compare: tdd(../data/CompareTypes.tdd), diff --git a/exec/java-exec/src/main/codegen/data/Casts.tdd b/exec/java-exec/src/main/codegen/data/Casts.tdd index c6ee25898..760b0f965 100644 --- a/exec/java-exec/src/main/codegen/data/Casts.tdd +++ b/exec/java-exec/src/main/codegen/data/Casts.tdd @@ -1,3 +1,19 @@ +# 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. + { types: [ {from: "Int", to: "BigInt"}, @@ -14,4 +30,4 @@ {to: "BigInt", from: "Float8" , explicit: "long"} ] -}
\ No newline at end of file +} diff --git a/exec/java-exec/src/main/codegen/data/CompareTypes.tdd b/exec/java-exec/src/main/codegen/data/CompareTypes.tdd index 9c26a3f4f..f384d5299 100644 --- a/exec/java-exec/src/main/codegen/data/CompareTypes.tdd +++ b/exec/java-exec/src/main/codegen/data/CompareTypes.tdd @@ -1,6 +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. { types: [ {comparables: ["Float4", "Float8", "Int", "BigInt", "NullableFloat4", "NullableFloat8", "NullableInt", "NullableBigInt"], mode: "fixed"}, {comparables: ["VarChar", "VarBinary", "NullableVarChar", "NullableVarBinary"], mode: "var"} ] -}
\ No newline at end of file +} diff --git a/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd b/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd index d20167162..88a59746a 100644 --- a/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd +++ b/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd @@ -1,3 +1,19 @@ +# 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. + { modes: [ {name: "Optional", prefix: "Nullable"}, diff --git a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl index 202928002..3e5a156f7 100644 --- a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl +++ b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl @@ -1,3 +1,14 @@ +<#-- 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. --> + import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/exec/java-exec/src/main/resources/logback.xml b/exec/java-exec/src/main/resources/logback.xml index feb75b30f..35f02600d 100644 --- a/exec/java-exec/src/main/resources/logback.xml +++ b/exec/java-exec/src/main/resources/logback.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> diff --git a/exec/java-exec/src/main/sh/runbit b/exec/java-exec/src/main/sh/runbit index 4e1b59941..4c4aa21ba 100755 --- a/exec/java-exec/src/main/sh/runbit +++ b/exec/java-exec/src/main/sh/runbit @@ -1,5 +1,19 @@ #!/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. if [ -z $JAVA_HOME ] then diff --git a/exec/java-exec/src/test/resources/logback.xml b/exec/java-exec/src/test/resources/logback.xml index 206a46989..dd32405c3 100644 --- a/exec/java-exec/src/test/resources/logback.xml +++ b/exec/java-exec/src/test/resources/logback.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> @@ -25,4 +41,4 @@ <appender-ref ref="STDOUT" /> </root> -</configuration>
\ No newline at end of file +</configuration> diff --git a/exec/java-exec/src/test/sh/logback.xml b/exec/java-exec/src/test/sh/logback.xml index 6f2928ad4..ec7ea44dc 100644 --- a/exec/java-exec/src/test/sh/logback.xml +++ b/exec/java-exec/src/test/sh/logback.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> diff --git a/exec/java-exec/src/test/sh/runbit b/exec/java-exec/src/test/sh/runbit index 8a5400628..7e4e73b8a 100755 --- a/exec/java-exec/src/test/sh/runbit +++ b/exec/java-exec/src/test/sh/runbit @@ -1,5 +1,20 @@ #!/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. + PROJECT_ROOT=../../../ mvn dependency:build-classpath -f=$PROJECT_ROOT/pom.xml -Dmdep.outputFile=target/sh/cp.txt diff --git a/exec/pom.xml b/exec/pom.xml index f0601dc07..3859fb0d5 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0.0-m1-SNAPSHOT</version> + <version>1.0.0-m1-incubating-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> diff --git a/exec/ref/pom.xml b/exec/ref/pom.xml index c7f74e011..1a4c809d6 100644 --- a/exec/ref/pom.xml +++ b/exec/ref/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0.0-m1-SNAPSHOT</version> + <version>1.0.0-m1-incubating-SNAPSHOT</version> </parent> <artifactId>ref</artifactId> diff --git a/exec/ref/src/main/resources/logback-test.xml b/exec/ref/src/main/resources/logback-test.xml index 9a53c126e..3d970a18b 100644 --- a/exec/ref/src/main/resources/logback-test.xml +++ b/exec/ref/src/main/resources/logback-test.xml @@ -1,4 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- 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> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> @@ -30,4 +40,4 @@ </root> -</configuration>
\ No newline at end of file +</configuration> diff --git a/exec/ref/src/test/resources/logback.xml b/exec/ref/src/test/resources/logback.xml index 10547b297..39bb0c86b 100644 --- a/exec/ref/src/test/resources/logback.xml +++ b/exec/ref/src/test/resources/logback.xml @@ -1,4 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- 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> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> @@ -43,4 +53,4 @@ <appender-ref ref="FILE" /> </root> -</configuration>
\ No newline at end of file +</configuration> |