You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by ga...@apache.org on 2013/01/03 05:03:38 UTC
svn commit: r1428166 - in /incubator/hcatalog/branches/branch-0.5:
CHANGES.txt build-support/ant/checkstyle.xml
build-support/checkstyle/apache_header.txt
build-support/checkstyle/apache_header_java.txt
webhcat/svr/src/main/bin/webhcat_server.sh
Author: gates
Date: Thu Jan 3 05:03:38 2013
New Revision: 1428166
URL: http://svn.apache.org/viewvc?rev=1428166&view=rev
Log:
HCATALOG-586 checkstyle fails every time complaining that it's own header file does not have the proper header
Removed:
incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header_java.txt
Modified:
incubator/hcatalog/branches/branch-0.5/CHANGES.txt
incubator/hcatalog/branches/branch-0.5/build-support/ant/checkstyle.xml
incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header.txt
incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_server.sh
Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1428166&r1=1428165&r2=1428166&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Thu Jan 3 05:03:38 2013
@@ -158,6 +158,8 @@ Release 0.5.0 - Unreleased
OPTIMIZATIONS
BUG FIXES
+ HCAT-586 checkstyle fails every time complaining that it's own header file does not have the proper header (gates)
+
HCAT-580 Optimizations in HCAT-538 break e2e tests (daijy via gates)
HCAT-583 e2e tests do not build (gates)
Modified: incubator/hcatalog/branches/branch-0.5/build-support/ant/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/build-support/ant/checkstyle.xml?rev=1428166&r1=1428165&r2=1428166&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/build-support/ant/checkstyle.xml (original)
+++ incubator/hcatalog/branches/branch-0.5/build-support/ant/checkstyle.xml Thu Jan 3 05:03:38 2013
@@ -50,11 +50,15 @@
<exclude name="README.txt"/>
<exclude name="RELEASE_NOTES.txt"/>
<exclude name="*.patch"/>
- <exclude name="**/*.swp"/> <!-- Don't hork on Alan's vim swap files -->
- <exclude name="src/test/e2e/**/*.pm"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.pl"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.xml"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.conf"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
+ <exclude name="tags"/>
+ <exclude name="**/*.swp"/> <!-- vim swap files -->
+ <exclude name="**/*.orig"/> <!-- files created by patch -->
+ <exclude name="**/*.rej"/> <!-- files created by patch -->
+ <exclude name="src/test/e2e/harness/**"/> <!-- These aren't under hcat's control -->
+ <exclude name="src/test/e2e/hcatalog/testdist/**"/> <!-- Test run results -->
+ <exclude name="src/test/e2e/hcatalog/tar/**"/> <!-- Test build area -->
+ <exclude name="src/test/e2e/hcatalog/udfs/java/*.jar"/> <!-- Test build area -->
+ <exclude name="src/test/e2e/hcatalog/hcattests.tar"/> <!-- Test build artifact -->
</fileset>
<formatter type="plain"/>
<formatter type="xml" toFile="${build.dir}/checkstyle/checkstyle_result.xml"/>
Modified: incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header.txt?rev=1428166&r1=1428165&r2=1428166&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header.txt (original)
+++ incubator/hcatalog/branches/branch-0.5/build-support/checkstyle/apache_header.txt Thu Jan 3 05:03:38 2013
@@ -1,19 +1,19 @@
^#!
^<\?(xml|xml-stylesheet).*>$
^\W*$
-^\W*Licensed to the Apache Software Foundation \(ASF\) under one$
-^\W*or more contributor license agreements. See the NOTICE file$
-^\W*distributed with this work for additional information$
-^\W*regarding copyright ownership. The ASF licenses this file$
-^\W*to you under the Apache License, Version 2.0 \(the$
-^\W*"License"\); you may not use this file except in compliance$
-^\W*with the License. You may obtain a copy of the License at$
-^\W*$
-^\W*http://www.apache.org/licenses/LICENSE-2.0$
-^\W*$
-^\W*Unless required by applicable law or agreed to in writing,$
-^\W*software distributed under the License is distributed on an$
-^\W*"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
-^\W*KIND, either express or implied. See the License for the$
-^\W*specific language governing permissions and limitations$
-^\W*under the License.$
+\W*Licensed to the Apache Software Foundation \(ASF\) under one$
+\W*or more contributor license agreements. See the NOTICE file$
+\W*distributed with this work for additional information$
+\W*regarding copyright ownership. The ASF licenses this file$
+\W*to you under the Apache License, Version 2.0 \(the$
+\W*"License"\); you may not use this file except in compliance$
+\W*with the License. You may obtain a copy of the License at$
+\W*$
+\W*http://www.apache.org/licenses/LICENSE-2.0$
+\W*$
+\W*Unless required by applicable law or agreed to in writing,$
+\W*software distributed under the License is distributed on an$
+\W*"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
+\W*KIND, either express or implied. See the License for the$
+\W*specific language governing permissions and limitations$
+\W*under the License.$
Modified: incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_server.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_server.sh?rev=1428166&r1=1428165&r2=1428166&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_server.sh (original)
+++ incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_server.sh Thu Jan 3 05:03:38 2013
@@ -10,12 +10,12 @@
#
# 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.
#
# Support functions
#