Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 448e75780 -> d2caaa2d6 refs/heads/master eae953e6a -> 041761ca6
ACCUMULO-2745 Update README files with license headers Replaced readme.txt without a license header with a README that has one, for naming consistency. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0234ad8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0234ad8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0234ad8 Branch: refs/heads/1.6.0-SNAPSHOT Commit: c0234ad84a03f13ebdcdbe3022f7863a3c56a234 Parents: 448e757 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Apr 28 19:31:44 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Apr 28 19:33:07 2014 -0400 ---------------------------------------------------------------------- README | 18 ++++++++++++++++++ conf/examples/crypto/README | 23 +++++++++++++++++++++++ conf/examples/crypto/readme.txt | 5 ----- test/compat/japi-compliance/README | 24 +++++++++++++++++++----- 4 files changed, 60 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0234ad8/README ---------------------------------------------------------------------- diff --git a/README b/README index 3568c58..a2d758b 100644 --- a/README +++ b/README @@ -1,3 +1,21 @@ +Title: Apache Accumulo +Notice: 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. + ****************************************************************************** 0. Introduction http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0234ad8/conf/examples/crypto/README ---------------------------------------------------------------------- diff --git a/conf/examples/crypto/README b/conf/examples/crypto/README new file mode 100644 index 0000000..75fa6b1 --- /dev/null +++ b/conf/examples/crypto/README @@ -0,0 +1,23 @@ +Title: Apache Accumulo Crypto Configuration Example +Notice: 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. + +This accumulo-site.xml file demonstrates how to configure the basic encryption at rest feature. + +The default configuration shown here is not entirely secure, as the master key for all encryption keys +is stored alongside the encrypted files. Placing that master key somewhere secure is an exercise +left to the reader. http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0234ad8/conf/examples/crypto/readme.txt ---------------------------------------------------------------------- diff --git a/conf/examples/crypto/readme.txt b/conf/examples/crypto/readme.txt deleted file mode 100644 index c638b6e..0000000 --- a/conf/examples/crypto/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -This accumulo-site.xml file demonstrates how to configure the basic encryption at rest feature. - -The default configuration shown here is not entirely secure, as the master key for all encryption keys -is stored alongside the encrypted files. Placing that master key somewhere secure is an exercise -left to the reader. http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0234ad8/test/compat/japi-compliance/README ---------------------------------------------------------------------- diff --git a/test/compat/japi-compliance/README b/test/compat/japi-compliance/README index f49434d..8715f98 100644 --- a/test/compat/japi-compliance/README +++ b/test/compat/japi-compliance/README @@ -1,14 +1,28 @@ +Title: Java API Compliance Checker Instructions +Notice: 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. + There is a tool that can analyze the difference between APIs called japi-compliance[1]. This tool is useful for checking API compatability of different Accumulo versions. To run this tool edit the xml files to specify the location of accumulo core jars and set the library version. Then run the following command. - japi-compliance-checker.pl -skip-deprecated -old japi-accumulo-1.4.xml -new japi-accumulo-1.5.xml -l accumulo - + japi-compliance-checker.pl -skip-deprecated -old japi-accumulo-1.5.xml -new japi-accumulo-1.6.xml -l accumulo [1]: http://ispras.linuxbase.org/index.php/Java_API_Compliance_Checker - - -
