[incubator-rya-site] branch master updated: fixing typo in release notes
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-rya-site.git The following commit(s) were added to refs/heads/master by this push: new dca937b fixing typo in release notes dca937b is described below commit dca937b053863db50b5a68f534c27c33faae055c Author: Aaron Mihalik AuthorDate: Mon Jul 29 10:11:23 2019 -0400 fixing typo in release notes --- content/_posts/2019-07-27-relnotes-4.0.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_posts/2019-07-27-relnotes-4.0.0.md b/content/_posts/2019-07-27-relnotes-4.0.0.md index 6c09e39..239efa0 100644 --- a/content/_posts/2019-07-27-relnotes-4.0.0.md +++ b/content/_posts/2019-07-27-relnotes-4.0.0.md @@ -6,7 +6,7 @@ description: Details of what changed in v4.0.0 of Rya (Incubating) categories: [releasenotes] jira: https://issues.apache.org/jira/browse/ --- -Release Notes v3.2.12 +Release Notes v4.0.0 See the full [list of issues](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319020=12341289) resolved in this release.
[incubator-rya-site] branch asf-site updated: typo fix to release notes
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-rya-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 118c12a typo fix to release notes 118c12a is described below commit 118c12a89b9afa9304a9da7ba9773dffa555b389 Author: Aaron Mihalik AuthorDate: Mon Jul 29 11:00:45 2019 -0400 typo fix to release notes --- content/feed.xml | 38 +++ content/news/2019/07/27/relnotes-4.0.0/index.html | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 766098c..0d4c6fc 100755 --- a/content/feed.xml +++ b/content/feed.xml @@ -3,15 +3,15 @@ -http://0.0.0.0:4000// -http://0.0.0.0:4000//feed.xml; rel="self" type="application/rss+xml"/> -Mon, 29 Jul 2019 08:44:06 -0500 -Mon, 29 Jul 2019 08:44:06 -0500 +http://rya.apache.org// +http://rya.apache.org//feed.xml; rel="self" type="application/rss+xml"/> +Mon, 29 Jul 2019 09:40:51 -0500 +Mon, 29 Jul 2019 09:40:51 -0500 Jekyll v3.8.5 Release Notes v4.0.0 -pRelease Notes v3.2.12/p +pRelease Notes v4.0.0/p pSee the full a href=https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319020amp;version=12341289list of issues/a resolved in this release./p @@ -108,8 +108,8 @@ /ul Sat, 27 Jul 2019 00:00:00 -0500 -http://0.0.0.0:4000//news/2019/07/27/relnotes-4.0.0/ -http://0.0.0.0:4000//news/2019/07/27/relnotes-4.0.0/ +http://rya.apache.org//news/2019/07/27/relnotes-4.0.0/ +http://rya.apache.org//news/2019/07/27/relnotes-4.0.0/ releasenotes @@ -152,8 +152,8 @@ succeed./p /ul Sat, 27 Jul 2019 00:00:00 -0500 -http://0.0.0.0:4000//news/2019/07/27/release-4.0.0/ -http://0.0.0.0:4000//news/2019/07/27/release-4.0.0/ +http://rya.apache.org//news/2019/07/27/release-4.0.0/ +http://rya.apache.org//news/2019/07/27/release-4.0.0/ release @@ -194,8 +194,8 @@ succeed./p Sun, 04 Mar 2018 00:00:00 -0600 -http://0.0.0.0:4000//news/2018/03/04/relnotes-3.2.12/ -http://0.0.0.0:4000//news/2018/03/04/relnotes-3.2.12/ +http://rya.apache.org//news/2018/03/04/relnotes-3.2.12/ +http://rya.apache.org//news/2018/03/04/relnotes-3.2.12/ releasenotes @@ -238,8 +238,8 @@ succeed./p /ul Sun, 04 Mar 2018 00:00:00 -0600 -http://0.0.0.0:4000//news/2018/03/04/release-3.2.12/ -http://0.0.0.0:4000//news/2018/03/04/release-3.2.12/ +http://rya.apache.org//news/2018/03/04/release-3.2.12/ +http://rya.apache.org//news/2018/03/04/release-3.2.12/ release @@ -301,8 +301,8 @@ succeed./p Tue, 10 Oct 2017 00:00:00 -0500 -http://0.0.0.0:4000//news/2017/10/10/relnotes-3.2.11/ -http://0.0.0.0:4000//news/2017/10/10/relnotes-3.2.11/ +http://rya.apache.org//news/2017/10/10/relnotes-3.2.11/ +http://rya.apache.org//news/2017/10/10/relnotes-3.2.11/ releasenotes @@ -345,8 +345,8 @@ succeed./p /ul Tue, 10 Oct 2017 00:00:00 -0500 -http://0.0.0.0:4000//news/2017/10/10/release-3.2.11/ -http://0.0.0.0:4000//news/2017/10/10/release-3.2.11/ +http://rya.apache.org//news/2017/10/10/release-3.2.11/ +http://rya.apache.org//news/2017/10/10/release-3.2.11/ release @@ -389,8 +389,8 @@ succeed./p /ul Fri, 28 Oct 2016 00:00:00 -0500 -http://0.0.0.0:4000//news/2016/10/28/release-3.2.10/ -http://0.0.0.0:4000//news/2016/10/28/release-3.2.10/ +http://rya.apache.org//news/2016/10/28/release-3.2.10/ +http://rya.apache.org//news/2016/10/28/release-3.2.10/ v3.2.10 diff --git a/content/news/2019/07/27/relnotes-4.0.0/index.html b/content/news/2019/07/27/relnotes-4.0.0/index.html index fd66419..ffe8e75 100755 --- a/content/news/2019/07/27/relnotes-4.0.0/index.html +++ b/content/news/2019/07/27/relnotes-4.0.0/index.html @@ -88,7 +88,7 @@ 27 July 2019 - Release Notes v3.2.12 + Release Notes v4.0.0 See the full https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319020version=12341289;>list of issues resolved in this release.
[incubator-rya-site] branch master updated: adding 4.0.0 release notes
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-rya-site.git The following commit(s) were added to refs/heads/master by this push: new 8991ddd adding 4.0.0 release notes 8991ddd is described below commit 8991ddd9133d35993f9c1d203471486d2b861854 Author: Aaron Mihalik AuthorDate: Sat Jul 27 09:55:25 2019 -0400 adding 4.0.0 release notes --- content/_config.yml | 2 +- content/_posts/2019-07-27-release-4.0.0.md | 51 + content/_posts/2019-07-27-relnotes-4.0.0.md | 71 + 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/content/_config.yml b/content/_config.yml index 4fbd445..2e69e82 100644 --- a/content/_config.yml +++ b/content/_config.yml @@ -19,7 +19,7 @@ excerpt_separator: "" repository: https://git-wip-us.apache.org/repos/asf/incubator-rya-site destination: target -exclude: [README.md,Gemfile*] +exclude: [README.md,Gemfile*,vendor] keep_files: [".git", ".svn", "apidocs"] # The base path where the website is deployed diff --git a/content/_posts/2019-07-27-release-4.0.0.md b/content/_posts/2019-07-27-release-4.0.0.md new file mode 100644 index 000..2cac24e --- /dev/null +++ b/content/_posts/2019-07-27-release-4.0.0.md @@ -0,0 +1,51 @@ +--- +layout: post +date: "2019-07-27" +title: Release 4.0.0 +description: details of the forth release of Rya (Incubating) +version: 4.0.0 +fullVersion: rya-incubating-4.0.0 +filename: rya-project-4.0.0-incubating-source-release +releaseNotes: "{% post_url 2019-07-27-relnotes-4.0.0 %}" +categories: [release] +--- +{% comment %} +Some of the variables above are used on the summary page that iterates through posts where catagories=release. +{% endcomment %}{% capture apacheDistMirror %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %} +{% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %} + + + + + +This is Rya's third Apache release, version {{ page.version }}. It is available as a source code download: + +- [Source download from Apache]({{ apacheDistMirror }}/{{ page.filename }}.zip) +- Verify: {% comment %} +{% endcomment %} [pgp]( {{ d }}/{{ page.filename }}.zip.asc ){% comment %} +{% endcomment %} [md5]( {{ d }}/{{ page.filename }}.zip.md5 ){% comment %} +{% endcomment %} [sha1]({{ d }}/{{ page.filename }}.zip.sha1){% comment %} +{% endcomment %} [sha512]({{ d }}/{{ page.filename }}.zip.sha512) +- [Release notes]({{ page.releaseNotes | liquify }}) +- [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22) + +[Verify](http://www.apache.org/dyn/closer.cgi#verify) +using the corresponding *pgp* signature (using the committer file in +[KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)). +If you cannot do that, the *md5* or *sha1* hash file may be used to check that the +download has completed okay. + +For fast downloads, current source distributions are hosted on mirror servers; +older source distributions are in the +[archive](http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/). +If a download from a mirror fails, retry, and the second download will likely +succeed. + +For security, hash and signature files are always hosted at +[Apache](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}). + +Next steps: +- [Building from Source](https://github.com/apache/incubator-rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/build-source.md) +- [Quick Start](https://github.com/apache/incubator-rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/quickstart.md) +- [Typical First Steps](https://github.com/apache/incubator-rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/sm-firststeps.md) +- [Manual -- includes documents above](https://github.com/apache/incubator-rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/index.md) diff --git a/content/_posts/2019-07-27-relnotes-4.0.0.md b/content/_posts/2019-07-27-relnotes-4.0.0.md new file mode 100644 index 000..6c09e39 --- /dev/null +++ b/content/_posts/2019-07-27-relnotes-4.0.0.md @@ -0,0 +1,71 @@ +--- +layout: post +date: "2019-07-27" +title: Release Notes v4.0.0 +description: Details of what changed in v4.0.0 of Rya (Incubating) +categories: [releasenotes] +jira: https://issues.apache.org/jira/browse/ +--- +Release Notes v3.2.12 + +See the full [list of issues](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319020=12341289) resolved in this release. + +Here are the release highlights: + +* [RYA-446]({{page.
[incubator-rya] annotated tag rya-incubating-4.0.0-rc1 deleted (was c6e3f03)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to annotated tag rya-incubating-4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. *** WARNING: tag rya-incubating-4.0.0-rc1 was deleted! *** tag was c6e3f03 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-rya] branch 4.0.0-rc1 deleted (was 9ed219e)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to branch 4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. was 9ed219e [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-rya] annotated tag rel/rya-incubating-4.0.0 updated (824090a -> 4889b30)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to annotated tag rel/rya-incubating-4.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. *** WARNING: tag rel/rya-incubating-4.0.0 was modified! *** from 824090a (commit) to 4889b30 (tag) tagging 824090ac1b33c3b4ba52bfb8a67abfdc4f0ceea3 (commit) replaces rel/rya-incubating-3.2.12 by Aaron Mihalik on Sat Jul 27 08:05:48 2019 -0400 - Log - rya-incubating-4.0.0 Release --- No new revisions were added by this update. Summary of changes:
[incubator-rya] annotated tag rel/rya-incubating-4.0.0 deleted (was 391ce92)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to annotated tag rel/rya-incubating-4.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. *** WARNING: tag rel/rya-incubating-4.0.0 was deleted! *** tag was 391ce92 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-rya] annotated tag rel/rya-incubating-4.0.0 created (now 391ce92)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to annotated tag rel/rya-incubating-4.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. at 391ce92 (tag) tagging 9ed219e7376880794b0566cd5ceff0e23ade6f4b (commit) replaces rya-incubating-4.0.0-rc1 by Aaron Mihalik on Fri Jul 26 09:19:36 2019 -0400 - Log - rya-incubating-4.0.0 Release --- No new revisions were added by this update.
svn commit: r35029 - /release/incubator/rya/rya-incubating-4.0.0/
Author: mihalik Date: Fri Jul 26 13:17:37 2019 New Revision: 35029 Log: Adding rya-incubating-4.0.0 Added: release/incubator/rya/rya-incubating-4.0.0/ release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip (with props) release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.asc release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.md5 release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha1 release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha512 Added: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip == Binary file - no diff available. Propchange: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.asc == --- release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.asc (added) +++ release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.asc Fri Jul 26 13:17:37 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQIcBAABCgAGBQJdLdlpAAoJEMPMQMr1Dq4aT3UP/0arJsRNJdbVUPQIHGPz9m9G +ZR25h5F7xbbAaUTTXCEoEImXiFYEa5kUDkwIQwM7SdNrQbk7erxxAwkgroZzl1oD +cGeEDkln7/LcO9QXD0iZkWuX0/inohzrd2BMHmfD6J4QJkxCPlGq19mgmq6C/S9z +RiPbS4hmuEXItTliSGCfguWygwf0IFOB5TCF6nGw/yYT3+0QpSzXxtOwWnET5pkM +ireUtWJzCLWFBGMSTcSmLw+MWzkTEFOBOdIeRFDyRV9zN4g1qPuU/jn5qrodQp+8 +nnetN8CERrvTHKNuZaFLMyDygy21c2jQDo6aHq86EIuKAso6/QQhuKLKAtvG/9bI +7JOYFfFJQyPRETaZn4FPhnJH41891zzvljfCAN71/Se4I5+uhMometUREGBa86OL +lTv273YbfhKeo3440725g1BPyYzNNv+b7Q7CfktEnFsN2CFT6aC+2wMx7FYNZVRX +Qb7inzXgsNenGRBbA3vuPEUAa+VD+N/Eveyzs1NZ8iAnl8Esflv8SjVVXM/IUas7 +x2EK9oGIrkpedvbkoap5PgZJo6t/XJIrymE5kB2FW+0GWTRlPKXHPjwchxpwvggv +t/1yRxaFN4JaVB1HKBSd5flXuEhenfQh5+8BYYC6rnjjjmHhl0DZD8n4X2lbaHar +jcD0gs7hUCNQyoTL5lY/ +=EfBV +-END PGP SIGNATURE- Added: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.md5 == --- release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.md5 (added) +++ release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.md5 Fri Jul 26 13:17:37 2019 @@ -0,0 +1 @@ +1d46620a37df803c3ba0b1b383c1da10 *rya-project-4.0.0-incubating-source-release.zip Added: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha1 == --- release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha1 (added) +++ release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha1 Fri Jul 26 13:17:37 2019 @@ -0,0 +1 @@ +e5e91b19abddbdf3c9f0e18469433e730bef7957 *rya-project-4.0.0-incubating-source-release.zip Added: release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha512 == --- release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha512 (added) +++ release/incubator/rya/rya-incubating-4.0.0/rya-project-4.0.0-incubating-source-release.zip.sha512 Fri Jul 26 13:17:37 2019 @@ -0,0 +1 @@ +3053b7087ddda6c51f4849f06acc57b7e63e1eab01b791b2c49dd38f6eb215d5713725906b6204416cbb9799dde615a0fd79e5fe7c5391f9a916482fe68d142f *rya-project-4.0.0-incubating-source-release.zip
svn commit: r34893 - /dev/incubator/rya/rya-incubating-4.0.0-rc1/
Author: mihalik Date: Tue Jul 16 14:09:57 2019 New Revision: 34893 Log: Adding rya-incubating-4.0.0-rc1 Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/ dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip (with props) dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.asc dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.md5 dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha1 dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha512 Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.asc == --- dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.asc (added) +++ dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.asc Tue Jul 16 14:09:57 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQIcBAABCgAGBQJdLdlpAAoJEMPMQMr1Dq4aT3UP/0arJsRNJdbVUPQIHGPz9m9G +ZR25h5F7xbbAaUTTXCEoEImXiFYEa5kUDkwIQwM7SdNrQbk7erxxAwkgroZzl1oD +cGeEDkln7/LcO9QXD0iZkWuX0/inohzrd2BMHmfD6J4QJkxCPlGq19mgmq6C/S9z +RiPbS4hmuEXItTliSGCfguWygwf0IFOB5TCF6nGw/yYT3+0QpSzXxtOwWnET5pkM +ireUtWJzCLWFBGMSTcSmLw+MWzkTEFOBOdIeRFDyRV9zN4g1qPuU/jn5qrodQp+8 +nnetN8CERrvTHKNuZaFLMyDygy21c2jQDo6aHq86EIuKAso6/QQhuKLKAtvG/9bI +7JOYFfFJQyPRETaZn4FPhnJH41891zzvljfCAN71/Se4I5+uhMometUREGBa86OL +lTv273YbfhKeo3440725g1BPyYzNNv+b7Q7CfktEnFsN2CFT6aC+2wMx7FYNZVRX +Qb7inzXgsNenGRBbA3vuPEUAa+VD+N/Eveyzs1NZ8iAnl8Esflv8SjVVXM/IUas7 +x2EK9oGIrkpedvbkoap5PgZJo6t/XJIrymE5kB2FW+0GWTRlPKXHPjwchxpwvggv +t/1yRxaFN4JaVB1HKBSd5flXuEhenfQh5+8BYYC6rnjjjmHhl0DZD8n4X2lbaHar +jcD0gs7hUCNQyoTL5lY/ +=EfBV +-END PGP SIGNATURE- Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.md5 == --- dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.md5 (added) +++ dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.md5 Tue Jul 16 14:09:57 2019 @@ -0,0 +1 @@ +1d46620a37df803c3ba0b1b383c1da10 *rya-project-4.0.0-incubating-source-release.zip Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha1 == --- dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha1 (added) +++ dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha1 Tue Jul 16 14:09:57 2019 @@ -0,0 +1 @@ +e5e91b19abddbdf3c9f0e18469433e730bef7957 *rya-project-4.0.0-incubating-source-release.zip Added: dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha512 == --- dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha512 (added) +++ dev/incubator/rya/rya-incubating-4.0.0-rc1/rya-project-4.0.0-incubating-source-release.zip.sha512 Tue Jul 16 14:09:57 2019 @@ -0,0 +1 @@ +3053b7087ddda6c51f4849f06acc57b7e63e1eab01b791b2c49dd38f6eb215d5713725906b6204416cbb9799dde615a0fd79e5fe7c5391f9a916482fe68d142f *rya-project-4.0.0-incubating-source-release.zip
[incubator-rya] branch 4.0.0-rc1 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a commit to branch 4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git The following commit(s) were added to refs/heads/4.0.0-rc1 by this push: new 9ed219e [maven-release-plugin] prepare for next development iteration 9ed219e is described below commit 9ed219e7376880794b0566cd5ceff0e23ade6f4b Author: Aaron Mihalik AuthorDate: Tue Jul 16 10:03:13 2019 -0400 [maven-release-plugin] prepare for next development iteration --- common/pom.xml| 2 +- common/rya.api.function/pom.xml | 2 +- common/rya.api.model/pom.xml | 2 +- common/rya.api/pom.xml| 2 +- common/rya.provenance/pom.xml | 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml| 2 +- extras/kafka.connect/accumulo-it/pom.xml | 2 +- extras/kafka.connect/accumulo/pom.xml | 2 +- extras/kafka.connect/api/pom.xml | 2 +- extras/kafka.connect/client/pom.xml | 2 +- extras/kafka.connect/mongo-it/pom.xml | 2 +- extras/kafka.connect/mongo/pom.xml| 2 +- extras/kafka.connect/pom.xml | 2 +- extras/periodic.notification/api/pom.xml | 2 +- extras/periodic.notification/pom.xml | 2 +- extras/periodic.notification/service/pom.xml | 2 +- extras/periodic.notification/tests/pom.xml| 2 +- extras/periodic.notification/twill.yarn/pom.xml | 4 ++-- extras/periodic.notification/twill/pom.xml| 2 +- extras/pom.xml| 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.export/export.accumulo/pom.xml | 2 +- extras/rya.export/export.api/pom.xml | 2 +- extras/rya.export/export.client/pom.xml | 2 +- extras/rya.export/export.integration/pom.xml | 2 +- extras/rya.export/export.mongo/pom.xml| 2 +- extras/rya.export/pom.xml | 2 +- extras/rya.forwardchain/pom.xml | 2 +- extras/rya.geoindexing/geo.common/pom.xml | 2 +- extras/rya.geoindexing/geo.geomesa/pom.xml| 2 +- extras/rya.geoindexing/geo.geowave/pom.xml| 2 +- extras/rya.geoindexing/geo.mongo/pom.xml | 2 +- extras/rya.geoindexing/pom.xml| 2 +- extras/rya.giraph/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml | 2 +- extras/rya.merger/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml| 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.pcj.fluo/rya.pcj.functions.geo/pom.xml | 2 +- extras/rya.prospector/pom.xml | 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/rya.streams/api/pom.xml| 2 +- extras/rya.streams/client/pom.xml | 2 +- extras/rya.streams/geo/pom.xml| 2 +- extras/rya.streams/integration/pom.xml| 2 +- extras/rya.streams/kafka-test/pom.xml | 2 +- extras/rya.streams/kafka/pom.xml | 2 +- extras/rya.streams/pom.xml| 2 +- extras/rya.streams/query-manager/pom.xml | 2 +- extras/shell/pom.xml | 2 +- extras/vagrantExample/pom.xml | 2 +- mapreduce/pom.xml | 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml| 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- spark/pom.xml | 2 +- test/accumulo/pom.xml | 2 +- test/kafka/pom.xml| 2 +- test/mongo/pom.xml| 2 +- test/pom.xml | 2 +- test/rdf/pom.xml | 2 +- web/pom.xml
[incubator-rya] annotated tag rya-incubating-4.0.0-rc1 created (now c6e3f03)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to annotated tag rya-incubating-4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. at c6e3f03 (tag) tagging 824090ac1b33c3b4ba52bfb8a67abfdc4f0ceea3 (commit) replaces rel/rya-incubating-3.2.12 by Aaron Mihalik on Tue Jul 16 10:03:09 2019 -0400 - Log - [maven-release-plugin] copy for tag rya-incubating-4.0.0-rc1 --- No new revisions were added by this update.
[incubator-rya] 01/01: [maven-release-plugin] prepare release rya-incubating-4.0.0-rc1
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a commit to branch 4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git commit 824090ac1b33c3b4ba52bfb8a67abfdc4f0ceea3 Author: Aaron Mihalik AuthorDate: Tue Jul 16 09:44:27 2019 -0400 [maven-release-plugin] prepare release rya-incubating-4.0.0-rc1 --- common/pom.xml| 2 +- common/rya.api.function/pom.xml | 2 +- common/rya.api.model/pom.xml | 2 +- common/rya.api/pom.xml| 2 +- common/rya.provenance/pom.xml | 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml| 2 +- extras/kafka.connect/accumulo-it/pom.xml | 6 ++ extras/kafka.connect/accumulo/pom.xml | 6 ++ extras/kafka.connect/api/pom.xml | 6 ++ extras/kafka.connect/client/pom.xml | 6 ++ extras/kafka.connect/mongo-it/pom.xml | 6 ++ extras/kafka.connect/mongo/pom.xml| 6 ++ extras/kafka.connect/pom.xml | 6 ++ extras/periodic.notification/api/pom.xml | 2 +- extras/periodic.notification/pom.xml | 2 +- extras/periodic.notification/service/pom.xml | 2 +- extras/periodic.notification/tests/pom.xml| 2 +- extras/periodic.notification/twill.yarn/pom.xml | 4 ++-- extras/periodic.notification/twill/pom.xml| 2 +- extras/pom.xml| 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.export/export.accumulo/pom.xml | 2 +- extras/rya.export/export.api/pom.xml | 2 +- extras/rya.export/export.client/pom.xml | 2 +- extras/rya.export/export.integration/pom.xml | 2 +- extras/rya.export/export.mongo/pom.xml| 2 +- extras/rya.export/pom.xml | 2 +- extras/rya.forwardchain/pom.xml | 2 +- extras/rya.geoindexing/geo.common/pom.xml | 2 +- extras/rya.geoindexing/geo.geomesa/pom.xml| 2 +- extras/rya.geoindexing/geo.geowave/pom.xml| 2 +- extras/rya.geoindexing/geo.mongo/pom.xml | 2 +- extras/rya.geoindexing/pom.xml| 2 +- extras/rya.giraph/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml | 2 +- extras/rya.merger/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml| 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.pcj.fluo/rya.pcj.functions.geo/pom.xml | 2 +- extras/rya.prospector/pom.xml | 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/rya.streams/api/pom.xml| 2 +- extras/rya.streams/client/pom.xml | 2 +- extras/rya.streams/geo/pom.xml| 2 +- extras/rya.streams/integration/pom.xml| 2 +- extras/rya.streams/kafka-test/pom.xml | 2 +- extras/rya.streams/kafka/pom.xml | 2 +- extras/rya.streams/pom.xml| 2 +- extras/rya.streams/query-manager/pom.xml | 2 +- extras/shell/pom.xml | 2 +- extras/vagrantExample/pom.xml | 2 +- mapreduce/pom.xml | 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml| 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- spark/pom.xml | 2 +- test/accumulo/pom.xml | 2 +- test/kafka/pom.xml| 2 +- test/mongo/pom.xml| 2 +- test/pom.xml | 2 +- test/rdf/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 78 files changed, 87 insertions(+), 101 deletions(-) diff --git
[incubator-rya] branch 4.0.0-rc1 created (now 824090a)
This is an automated email from the ASF dual-hosted git repository. mihalik pushed a change to branch 4.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-rya.git. at 824090a [maven-release-plugin] prepare release rya-incubating-4.0.0-rc1 This branch includes the following new commits: new 824090a [maven-release-plugin] prepare release rya-incubating-4.0.0-rc1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
incubator-rya git commit: RYA-393 Fixed MongoDB DAO Batch Writer from dropping statements. Closes #236
Repository: incubator-rya Updated Branches: refs/heads/master 853e0eea7 -> b372ebcdb RYA-393 Fixed MongoDB DAO Batch Writer from dropping statements. Closes #236 Fixed secondary indexers so they flush when the DAO flushes. Indexers now close when DAO closes. Fixed daemon thread in MongoDB batch writer. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/b372ebcd Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/b372ebcd Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/b372ebcd Branch: refs/heads/master Commit: b372ebcdb43d19315b7d430ae55fedf45654245c Parents: 853e0ee Author: eric.white <eric.wh...@parsons.com> Authored: Wed Oct 4 11:21:06 2017 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Oct 24 09:39:13 2017 -0400 -- .../org/apache/rya/accumulo/AccumuloRyaDAO.java | 11 ++ .../org/apache/rya/mongodb/MongoDBRyaDAO.java | 18 ++ .../rya/mongodb/batch/MongoDbBatchWriter.java | 11 +- .../batch/collection/MongoCollectionType.java | 3 +- .../rya/mongodb/MongoDBRyaBatchWriterIT.java| 168 +++ .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 8 +- .../org/apache/rya/mongodb/MongoTestBase.java | 17 ++ .../indexing/mongodb/AbstractMongoIndexer.java | 6 + 8 files changed, 239 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b372ebcd/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java -- diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java index 8c99e44..a8350d9 100644 --- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java +++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java @@ -472,11 +472,22 @@ public class AccumuloRyaDAO implements RyaDAO, RyaName public void flush() throws RyaDAOException { try { mt_bw.flush(); +flushIndexers(); } catch (final MutationsRejectedException e) { throw new RyaDAOException(e); } } +private void flushIndexers() throws RyaDAOException { +for (final AccumuloIndexer indexer : secondaryIndexers) { +try { +indexer.flush(); +} catch (final IOException e) { +logger.error("Error flushing data in indexer: " + indexer.getClass().getSimpleName(), e); +} +} +} + protected String[] getTables() { // core tables final List tableNames = Lists.newArrayList( http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b372ebcd/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java -- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java index fe0f6f9..d263b9c 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java @@ -171,6 +171,13 @@ public final class MongoDBRyaDAO implements RyaDAO{ } catch (final MongoDbBatchWriterException e) { throw new RyaDAOException("Error shutting down MongoDB batch writer", e); } +for(final MongoSecondaryIndex indexer : secondaryIndexers) { +try { +indexer.close(); +} catch (final IOException e) { +log.error("Error closing indexer: " + indexer.getClass().getSimpleName(), e); +} +} if (mongoClient != null) { mongoClient.close(); } @@ -314,8 +321,19 @@ public final class MongoDBRyaDAO implements RyaDAO{ public void flush() throws RyaDAOException { try { mongoDbBatchWriter.flush(); +flushIndexers(); } catch (final MongoDbBatchWriterException e) { throw new RyaDAOException("Error flushing data.", e); } } + +private void flushIndexers() throws RyaDAOException { +for (final MongoSecondaryIndex indexer : secondaryIndexers) { +try { +indexer.flush(); +} catch (final IOException e) { +log.error("Error flushing data in indexer: " + indexer.getClass().getSimpleName(), e); +} +} +} } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b372ebcd/dao/mongodb.rya/s
[7/7] incubator-rya git commit: RYA-325 Renamed rya.console to rya.shell. Closes #194
RYA-325 Renamed rya.console to rya.shell. Closes #194 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/2564ac0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/2564ac0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/2564ac0a Branch: refs/heads/master Commit: 2564ac0ab7f1f0bbfad88d1bf671b9e7b0eea1f0 Parents: ec74291 Author: jdasch <jdasch@localhost.localdomain> Authored: Thu Aug 3 14:53:41 2017 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Thu Aug 3 22:16:26 2017 -0400 -- extras/pom.xml | 2 +- extras/rya.console/.gitignore | 8 - extras/rya.console/pom.xml | 221 - .../src/main/assembly/binary-release.xml| 33 -- .../src/main/assembly/component-release.xml | 90 .../src/main/config/log4j.properties| 35 -- .../rya.console/src/main/examples/Query1.sparql | 24 - .../src/main/examples/example.script| 26 - extras/rya.console/src/main/examples/triples.nt | 25 - .../org/apache/rya/shell/RyaAdminCommands.java | 388 --- .../org/apache/rya/shell/RyaBannerProvider.java | 97 .../java/org/apache/rya/shell/RyaCommands.java | 166 --- .../apache/rya/shell/RyaConnectionCommands.java | 166 --- .../org/apache/rya/shell/RyaPromptProvider.java | 62 --- .../rya/shell/RyaShellHistoryProvider.java | 51 -- .../org/apache/rya/shell/SharedShellState.java | 339 - .../apache/rya/shell/util/ConnectorFactory.java | 67 --- .../apache/rya/shell/util/ConsolePrinter.java | 85 .../apache/rya/shell/util/InstallPrompt.java| 139 -- .../rya/shell/util/InstanceNamesFormatter.java | 78 --- .../org/apache/rya/shell/util/JLinePrompt.java | 211 - .../apache/rya/shell/util/PasswordPrompt.java | 72 --- .../rya/shell/util/RyaDetailsFormatter.java | 120 - .../org/apache/rya/shell/util/SparqlPrompt.java | 82 .../apache/rya/shell/util/UninstallPrompt.java | 58 --- .../rya.console/src/main/resources/LICENSE.txt | 16 - .../META-INF/spring/spring-shell-plugin.xml | 50 -- extras/rya.console/src/main/scripts/rya | 33 -- .../apache/rya/shell/RyaAdminCommandsTest.java | 474 --- .../org/apache/rya/shell/RyaCommandsTest.java | 278 --- .../rya/shell/RyaConnectionCommandsIT.java | 250 -- .../apache/rya/shell/RyaPromptProviderTest.java | 80 .../org/apache/rya/shell/RyaShellITBase.java| 102 .../apache/rya/shell/SharedShellStateTest.java | 167 --- .../rya/shell/util/ConnectorFactoryIT.java | 57 --- .../shell/util/InstanceNamesFormatterTest.java | 81 .../rya/shell/util/RyaDetailsFormatterTest.java | 111 - .../src/test/resources/Query1.sparql| 20 - .../src/test/resources/RyaShellTest-context.xml | 63 --- extras/shell/.gitignore | 8 + extras/shell/pom.xml| 223 + .../shell/src/main/assembly/binary-release.xml | 33 ++ .../src/main/assembly/component-release.xml | 90 extras/shell/src/main/config/log4j.properties | 35 ++ extras/shell/src/main/examples/Query1.sparql| 24 + extras/shell/src/main/examples/example.script | 26 + extras/shell/src/main/examples/triples.nt | 25 + .../org/apache/rya/shell/RyaAdminCommands.java | 388 +++ .../org/apache/rya/shell/RyaBannerProvider.java | 97 .../java/org/apache/rya/shell/RyaCommands.java | 166 +++ .../apache/rya/shell/RyaConnectionCommands.java | 166 +++ .../org/apache/rya/shell/RyaPromptProvider.java | 62 +++ .../rya/shell/RyaShellHistoryProvider.java | 51 ++ .../org/apache/rya/shell/SharedShellState.java | 339 + .../apache/rya/shell/util/ConnectorFactory.java | 67 +++ .../apache/rya/shell/util/ConsolePrinter.java | 85 .../apache/rya/shell/util/InstallPrompt.java| 139 ++ .../rya/shell/util/InstanceNamesFormatter.java | 78 +++ .../org/apache/rya/shell/util/JLinePrompt.java | 211 + .../apache/rya/shell/util/PasswordPrompt.java | 72 +++ .../rya/shell/util/RyaDetailsFormatter.java | 120 + .../org/apache/rya/shell/util/SparqlPrompt.java | 82 .../apache/rya/shell/util/UninstallPrompt.java | 58 +++ extras/shell/src/main/resources/LICENSE.txt | 16 + .../META-INF/spring/spring-shell-plugin.xml | 50 ++ extras/shell/src/main/scripts/rya | 33 ++ .../apache/rya/shell/RyaAdminCommandsTest.java | 474 +++ .../org/apache/rya/shell/RyaCommandsTest.java | 278 +++ .../rya/shell/RyaConnectionCommandsIT.java | 250 ++ .../apache/rya/shell/RyaPromptProviderTest.java | 80 .../org/apac
incubator-rya git commit: RYA-330 Cleaned up build testing and added profile -P enable-it Closes #190 - Removed unnecessary overrides of the maven-failsafe-plugin. - Disabled all IT's by default - Mov
Repository: incubator-rya Updated Branches: refs/heads/master f761d5d26 -> ab8035a17 RYA-330 Cleaned up build testing and added profile -P enable-it Closes #190 - Removed unnecessary overrides of the maven-failsafe-plugin. - Disabled all IT's by default - Moved the tmp dir for surefire and failsafe to ${project.build.dir}. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ab8035a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ab8035a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ab8035a1 Branch: refs/heads/master Commit: ab8035a17113a1ac7de83a529078d932b2c8be9e Parents: f761d5d Author: jdasch <jdasch@localhost.localdomain> Authored: Mon Jul 31 14:53:59 2017 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Aug 1 16:28:08 2017 -0400 -- dao/accumulo.rya/pom.xml| 14 - dao/mongodb.rya/pom.xml | 12 - extras/rya.benchmark/pom.xml| 13 - extras/rya.console/pom.xml | 14 - extras/rya.export/export.api/pom.xml| 13 - extras/rya.export/pom.xml | 17 - extras/rya.geoindexing/pom.xml | 341 ++- .../rya.pcj.fluo/pcj.fluo.integration/pom.xml | 173 +- pom.xml | 35 ++ 9 files changed, 291 insertions(+), 341 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab8035a1/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 5812cda..623d38e 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -75,7 +75,6 @@ under the License. org.apache.accumulo accumulo-minicluster -${accumulo.version} @@ -94,19 +93,6 @@ under the License. - - -org.apache.maven.plugins -maven-failsafe-plugin - - - - integration-test - verify - - - - http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab8035a1/dao/mongodb.rya/pom.xml -- diff --git a/dao/mongodb.rya/pom.xml b/dao/mongodb.rya/pom.xml index 1c9edd8..44fe083 100644 --- a/dao/mongodb.rya/pom.xml +++ b/dao/mongodb.rya/pom.xml @@ -46,18 +46,6 @@ under the License. org.apache.maven.plugins -maven-failsafe-plugin - - - - integration-test - verify - - - - - -org.apache.maven.plugins maven-enforcer-plugin http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab8035a1/extras/rya.benchmark/pom.xml -- diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml index 6563f31..b75b5f0 100644 --- a/extras/rya.benchmark/pom.xml +++ b/extras/rya.benchmark/pom.xml @@ -167,19 +167,6 @@ - - -org.apache.maven.plugins -maven-failsafe-plugin - - - - integration-test - verify - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab8035a1/extras/rya.console/pom.xml -- diff --git a/extras/rya.console/pom.xml b/extras/rya.console/pom.xml index 779cf42..a9b9030 100644 --- a/extras/rya.console/pom.xml +++ b/extras/rya.console/pom.xml @@ -174,20 +174,6 @@ - - -org.apache.maven.plugins -maven-failsafe-plugin - - - - integration-test - verify - - - - - org.jacoco http://git-wip-us.apache.org/repos/asf/incubator-ry
incubator-rya git commit: RYA-315 Fixing issue with Core Indices on MongoDB. Closes #178.
Repository: incubator-rya Updated Branches: refs/heads/master f00a3f3e0 -> abe7d71b1 RYA-315 Fixing issue with Core Indices on MongoDB. Closes #178. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/abe7d71b Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/abe7d71b Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/abe7d71b Branch: refs/heads/master Commit: abe7d71b193df769f522b5677e9d8ce4cacb11a8 Parents: f00a3f3 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Jul 18 15:55:47 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Jul 18 17:58:43 2017 -0400 -- .../org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/abe7d71b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java -- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java index bbcb13b..8d194fc 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java @@ -72,7 +72,7 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy
incubator-rya git commit: RYA-287 minor POM mod to endPosTable error
Repository: incubator-rya Updated Branches: refs/heads/master c9b66c7c3 -> f8d02eb3d RYA-287 minor POM mod to endPosTable error Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/f8d02eb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/f8d02eb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/f8d02eb3 Branch: refs/heads/master Commit: f8d02eb3d5d22b8d810b39400c381ca9b4e2b68c Parents: c9b66c7 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Fri Jun 9 17:21:40 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Fri Jun 9 17:24:06 2017 -0400 -- extras/rya.benchmark/pom.xml | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f8d02eb3/extras/rya.benchmark/pom.xml -- diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml index bb1fa4f..bd70ed2 100644 --- a/extras/rya.benchmark/pom.xml +++ b/extras/rya.benchmark/pom.xml @@ -76,8 +76,23 @@ src/main/xsd - + + + +org.apache.maven.plugins +maven-compiler-plugin + + + + false + + + + + + + org.codehaus.mojo jaxb2-maven-plugin
[5/5] incubator-rya git commit: RYA-40 Make example config conform to properties file format Closes #160
RYA-40 Make example config conform to properties file format Closes #160 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/c9b66c7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/c9b66c7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/c9b66c7c Branch: refs/heads/master Commit: c9b66c7c3a9845461cfab799a62244bf17c423f1 Parents: 721ba07 Author: Jonathan Wonders <jwonder...@gmail.com> Authored: Fri May 19 17:49:55 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Fri Jun 2 19:13:01 2017 -0400 -- README.md | 25 ++--- 1 file changed, 18 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c9b66c7c/README.md -- diff --git a/README.md b/README.md index 05bf0e5..deb1973 100644 --- a/README.md +++ b/README.md @@ -87,14 +87,23 @@ To point the web.rya war to the appropriate database instance, make a properties Here is an example for accumulo: ``` -instance.name=accumulo #Accumulo instance name -instance.zk=localhost:2181 #Accumulo Zookeepers -instance.username=root #Accumulo username -instance.password=secret #Accumulo pwd -rya.tableprefix=triplestore_ #Rya Table Prefix -rya.displayqueryplan=true #To display the query plan +# Accumulo instance name +instance.name=accumulo +# Accumulo Zookeepers +instance.zk=localhost:2181 +# Accumulo username +instance.username=root +# Accumulo password +instance.password=secret + +# Rya Table Prefix +rya.tableprefix=triplestore_ +# To display the query plan +rya.displayqueryplan=true ``` +Please consult the [Accumulo], [ZooKeeper], and [Hadoop] documentation for help with setting up these prerequisites. + Here is an example for mongoDB (populate user/userpassword if authentication to mongoDB required): ``` rya.displayqueryplan=true @@ -331,4 +340,6 @@ myRepository.shutDown(); [RYA]: http://rya.incubator.apache.org/ - +[Accumulo]: https://accumulo.apache.org/ +[ZooKeeper]: https://zookeeper.apache.org/ +[Hadoop]: http://hadoop.apache.org/
[4/5] incubator-rya git commit: RYA-278 Fixes AccumuloLoadStatements::loadTurtleFile test closes #157
RYA-278 Fixes AccumuloLoadStatements::loadTurtleFile test closes #157 Ignores org.apache.rya predicates rather than mvm.rya predicates to filter out rya version metadata. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/721ba077 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/721ba077 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/721ba077 Branch: refs/heads/master Commit: 721ba077018c763079ac994e3ea9fc748deee631 Parents: 4765aa0 Author: Jonathan Wonders <jwonder...@gmail.com> Authored: Sun May 7 11:52:16 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Fri Jun 2 19:10:14 2017 -0400 -- .../rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/721ba077/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java -- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java index 5f73bac..a4ec09c 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java @@ -115,11 +115,16 @@ public class AccumuloLoadStatementsFileIT extends AccumuloITBase { final Statement statement = RyaToRdfConversions.convertStatement(ryaStatement); // Filter out the rya version statement if it is present. -if(!statement.getPredicate().equals( vf.createURI("urn:mvm.rya/2012/05#version") )) { +if(!isRyaMetadataStatement(vf, statement)) { statements.add( statement ); } } assertEquals(expected, statements); } + +private boolean isRyaMetadataStatement(ValueFactory vf, Statement statement) { +return statement.getPredicate().equals( vf.createURI("urn:org.apache.rya/2012/05#version") ) || +statement.getPredicate().equals( vf.createURI("urn:org.apache.rya/2012/05#rts") ); +} } \ No newline at end of file
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH e50a1ff6f -> 4729e4dd9 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/4729e4dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/4729e4dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/4729e4dd Branch: refs/heads/RYA-INFRA-PUSH Commit: 4729e4dd9c463736956e13606fd93a254a70b424 Parents: e50a1ff Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 12:46:32 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 12:46:32 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH a3a04a862 -> e50a1ff6f Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/e50a1ff6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/e50a1ff6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/e50a1ff6 Branch: refs/heads/RYA-INFRA-PUSH Commit: e50a1ff6f374b1fa89c9506f528608625cd5a98a Parents: a3a04a8 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 12:16:31 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 12:16:31 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 3441349a8 -> a3a04a862 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a3a04a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a3a04a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a3a04a86 Branch: refs/heads/RYA-INFRA-PUSH Commit: a3a04a8623e1148215b291c2f72a547a93f48275 Parents: 3441349 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 15:54:42 2017 + Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 15:54:42 2017 + -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 2cb6babac -> 3441349a8 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/3441349a Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/3441349a Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/3441349a Branch: refs/heads/RYA-INFRA-PUSH Commit: 3441349a867364c1139af728829eaca73ea101f3 Parents: 2cb6bab Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 15:51:34 2017 + Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 15:51:34 2017 + -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 48c9a780b -> 9d03b637c Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/9d03b637 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/9d03b637 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/9d03b637 Branch: refs/heads/RYA-INFRA-PUSH Commit: 9d03b637c0f00b278273152d39a5aa4926c35c93 Parents: 48c9a78 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 15:47:35 2017 + Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 15:47:35 2017 + -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 2dcfb9e33 -> 48c9a780b Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/48c9a780 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/48c9a780 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/48c9a780 Branch: refs/heads/RYA-INFRA-PUSH Commit: 48c9a780b061c433c61f4a49079e815a40b0fab3 Parents: 2dcfb9e Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 15:43:57 2017 + Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 15:43:57 2017 + -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH cf6936b12 -> 2dcfb9e33 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/2dcfb9e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/2dcfb9e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/2dcfb9e3 Branch: refs/heads/RYA-INFRA-PUSH Commit: 2dcfb9e332968d0f6be11304a01d9bed2bf74a0d Parents: cf6936b Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 11:27:33 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 11:27:33 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH c160cfb0d -> cf6936b12 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/cf6936b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/cf6936b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/cf6936b1 Branch: refs/heads/RYA-INFRA-PUSH Commit: cf6936b12d2f10c512ccc51bccfae80970101754 Parents: c160cfb Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 11:17:49 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 11:17:49 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 00ae914f2 -> c160cfb0d Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/c160cfb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/c160cfb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/c160cfb0 Branch: refs/heads/RYA-INFRA-PUSH Commit: c160cfb0df8732e03e3c0299d5611a0081415a2d Parents: 00ae914 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 11:05:20 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 11:05:20 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 721647359 -> 00ae914f2 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/00ae914f Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/00ae914f Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/00ae914f Branch: refs/heads/RYA-INFRA-PUSH Commit: 00ae914f24c6d74086869f22f6c98a92b9e02267 Parents: 7216473 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 10:58:55 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 10:58:55 2017 -0400 -- --
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH 80319bbb1 -> 721647359 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/72164735 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/72164735 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/72164735 Branch: refs/heads/RYA-INFRA-PUSH Commit: 7216473598e7a42b2ff6a1c997cbced618a512bf Parents: 80319bb Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Tue Apr 4 10:55:37 2017 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Tue Apr 4 10:55:37 2017 -0400 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/72164735/README.md -- diff --git a/README.md b/README.md index ed9a735..86ad50a 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,4 @@ This branch does not contain any source code. It exists for two reasons: -If you push a large change and it doesn't immediately get mirrored to GitHub, feel free to edit this readme, push the commit, and hopefully the process wakes up. :) +If you push a large change and it doesn't immediately get mirrored to GitHub, feel free to edit this readme, push the commit, and hopefully the process wakes up. :) x100
[2/2] incubator-rya git commit: Bug Fix: Issues with 'adding context' Closes #128
Bug Fix: Issues with 'adding context' Closes #128 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/7e25bdaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/7e25bdaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/7e25bdaa Branch: refs/heads/master Commit: 7e25bdaa0a244cfeec478b2d26cfcb5cb33c2dd2 Parents: 8f779fd Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Thu Dec 15 16:57:41 2016 -0500 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sat Dec 17 22:53:33 2016 -0500 -- .../rya/api/domain/StatementMetadata.java | 18 +++-- .../rya/api/domain/StatementMetadataTest.java | 39 .../SimpleMongoDBStorageStrategyTest.java | 2 + 3 files changed, 55 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7e25bdaa/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java -- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java index 904f86c..a70e5da 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java @@ -1,4 +1,3 @@ -package org.apache.rya.api.domain; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,6 +16,7 @@ package org.apache.rya.api.domain; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.api.domain; import java.io.UnsupportedEncodingException; import java.util.HashMap; @@ -43,9 +43,16 @@ public class StatementMetadata { public StatementMetadata(byte[] value) throws RdfDAOException { try { -// try to convert back to a json string and then back to the map. -String metadataString = new String(value, "UTF8"); -metadataMap = gson.fromJson(metadataString, HashMap.class); +if (value == null) { +metadataMap = new HashMap<>(); +} else { +// try to convert back to a json string and then back to the map. +String metadataString = new String(value, "UTF8"); +metadataMap = gson.fromJson(metadataString, HashMap.class); +if (metadataMap == null) { +metadataMap = new HashMap<>(); +} +} } catch (UnsupportedEncodingException e) { throw new RdfDAOException(e); } @@ -65,6 +72,9 @@ public class StatementMetadata { public byte[] toBytes() { // convert the map to a json string +if (metadataMap.isEmpty()) { +return null; +} String metadataString = gson.toJson(metadataMap); // TODO may want to cache this for performance reasons return metadataString.getBytes(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7e25bdaa/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java b/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java new file mode 100644 index 000..2252dc2 --- /dev/null +++ b/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java @@ -0,0 +1,39 @@ +/* + * 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. + */ +package org.apache.rya.api.domain; + +import org.junit.Assert; +import org.junit.Test; + +public class StatementMetadataTest { + +@Test +public void simpleTests() throws Exception { +StatementMet
incubator-rya git commit: BUG FIX: Fixing compile issue
Repository: incubator-rya Updated Branches: refs/heads/master 8fca552e1 -> 5e79264df BUG FIX: Fixing compile issue Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/5e79264d Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/5e79264d Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/5e79264d Branch: refs/heads/master Commit: 5e79264dfbdc890d6e67f6a20c2d46fc43146d7c Parents: 8fca552 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Thu Dec 15 16:20:24 2016 -0500 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Thu Dec 15 16:20:24 2016 -0500 -- .../org/apache/rya/indexing/GeoRyaSailFactory.java | 17 +++-- 1 file changed, 3 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/5e79264d/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java -- diff --git a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java index 5d2c52d..89933df 100644 --- a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java +++ b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java @@ -26,6 +26,8 @@ import java.util.Objects; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.hadoop.conf.Configuration; import org.openrdf.sail.Sail; import org.openrdf.sail.SailException; @@ -36,6 +38,7 @@ import com.mongodb.MongoClient; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException; import org.apache.rya.api.instance.RyaDetailsToConfiguration; @@ -144,18 +147,4 @@ public class GeoRyaSailFactory { dao.init(); return dao; } -<<<<<<< HEAD:extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java -=== - -private static void updateAccumuloConfig(final AccumuloRdfConfiguration config, final String user, final String pswd, final String ryaInstance) throws AccumuloException, AccumuloSecurityException { -try { -final PasswordToken pswdToken = new PasswordToken(pswd); -final Instance accInst = ConfigUtils.getInstance(config); -final AccumuloRyaInstanceDetailsRepository ryaDetailsRepo = new AccumuloRyaInstanceDetailsRepository(accInst.getConnector(user, pswdToken), ryaInstance); - RyaDetailsToConfiguration.addRyaDetailsToConfiguration(ryaDetailsRepo.getRyaInstanceDetails(), config); -} catch(final RyaDetailsRepositoryException e) { -LOG.info("Instance does not have a rya details collection, skipping."); -} -} ->>>>>>> RYA-161 Merge Tool with client:extras/indexing/src/main/java/mvm/rya/sail/config/RyaSailFactory.java } \ No newline at end of file
[4/7] incubator-rya git commit: RYA-110 Add Rya Uninstall command to the Rya Console.
RYA-110 Add Rya Uninstall command to the Rya Console. Closes #94 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/5c54c293 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/5c54c293 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/5c54c293 Branch: refs/heads/master Commit: 5c54c2935a5de4a5bec133708ace2792084ecea3 Parents: ab4fca4 Author: Kevin Chilton <kevin.chil...@parsons.com> Authored: Thu Sep 15 16:12:00 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Nov 1 10:54:04 2016 -0400 -- .../org/apache/rya/api/client/RyaClient.java| 14 ++- .../org/apache/rya/api/client/Uninstall.java| 38 .../accumulo/AccumuloConnectionDetails.java | 2 +- .../accumulo/AccumuloRyaClientFactory.java | 3 +- .../api/client/accumulo/AccumuloUninstall.java | 96 .../api/client/accumulo/AccumuloInstallIT.java | 7 +- .../client/accumulo/AccumuloUninstallIT.java| 82 + extras/rya.console/pom.xml | 9 +- .../org/apache/rya/shell/RyaAdminCommands.java | 35 ++- .../apache/rya/shell/util/UninstallPrompt.java | 58 .../apache/rya/shell/RyaAdminCommandsTest.java | 67 -- .../src/test/resources/RyaShellTest-context.xml | 5 + 12 files changed, 395 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/5c54c293/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java -- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java index b290957..d4b5047 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java @@ -40,6 +40,7 @@ public class RyaClient { private final ListInstances listInstances; private final AddUser addUser; private final RemoveUser removeUser; +private final Uninstall uninstall; /** * Constructs an instance of {@link RyaClient}. @@ -53,16 +54,18 @@ public class RyaClient { final InstanceExists instanceExists, final ListInstances listInstances, final AddUser addUser, -final RemoveUser removeUser) { +final RemoveUser removeUser, +final Uninstall uninstall) { this.install = requireNonNull(install); this.createPcj = requireNonNull(createPcj); this.deletePcj = requireNonNull(deletePcj); -bactchUpdatePCJ = requireNonNull(batchUpdatePcj); +this.bactchUpdatePCJ = requireNonNull(batchUpdatePcj); this.getInstanceDetails = requireNonNull(getInstanceDetails); this.instanceExists = requireNonNull(instanceExists); this.listInstances = requireNonNull(listInstances); this.addUser = requireNonNull(addUser); this.removeUser = requireNonNull(removeUser); +this.uninstall = requireNonNull(uninstall); } /** @@ -130,4 +133,11 @@ public class RyaClient { public RemoveUser getRemoveUser() { return removeUser; } + +/** + * @return An instance of {@link Uninstall} that is connected to a Rya storage. + */ +public Uninstall getUninstall() { +return uninstall; +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/5c54c293/common/rya.api/src/main/java/org/apache/rya/api/client/Uninstall.java -- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/Uninstall.java b/common/rya.api/src/main/java/org/apache/rya/api/client/Uninstall.java new file mode 100644 index 000..b88f305 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/Uninstall.java @@ -0,0 +1,38 @@ +/** + * 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 + * specifi
[7/7] incubator-rya git commit: RYA-174 Removing Mongo Test Factory from non-test code
RYA-174 Removing Mongo Test Factory from non-test code Closes #118 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/f0b11e2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/f0b11e2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/f0b11e2c Branch: refs/heads/master Commit: f0b11e2cd3d276ae1207c8d3ecb8dd2b7827df84 Parents: 961b16a Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Thu Oct 20 23:23:59 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Nov 1 11:44:47 2016 -0400 -- .../apache/rya/mongodb/MockMongoFactory.java| 97 .../rya/mongodb/MongoConnectorFactory.java | 35 ++- .../rya/mongodb/MongoDBRdfConfiguration.java| 9 -- .../org/apache/rya/mongodb/MongoDBRyaDAO.java | 4 - .../rya/mongodb/MongoDBQueryEngineTest.java | 1 - .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 1 - .../apache/rya/mongodb/MongoDBRyaDAOTest.java | 1 - .../apache/rya/mongodb/MongoRyaTestBase.java| 73 +-- .../indexing/mongodb/AbstractMongoIndexer.java | 6 +- .../mongo/MongoFreeTextIndexerTest.java | 1 - .../mongo/MongoTemporalIndexerTest.java | 1 - .../src/main/java/MongoRyaDirectExample.java| 32 +-- .../indexing/mongo/MongoGeoIndexerSfTest.java | 1 - .../rya/indexing/mongo/MongoGeoIndexerTest.java | 1 - 14 files changed, 141 insertions(+), 122 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f0b11e2c/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MockMongoFactory.java -- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MockMongoFactory.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MockMongoFactory.java new file mode 100644 index 000..baafcea --- /dev/null +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MockMongoFactory.java @@ -0,0 +1,97 @@ +/* + * 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. + */ +package org.apache.rya.mongodb; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.UnknownHostException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.mongodb.MongoClient; +import com.mongodb.MongoException; +import com.mongodb.ServerAddress; + +import de.flapdoodle.embed.mongo.Command; +import de.flapdoodle.embed.mongo.MongodExecutable; +import de.flapdoodle.embed.mongo.MongodProcess; +import de.flapdoodle.embed.mongo.MongodStarter; +import de.flapdoodle.embed.mongo.config.IMongodConfig; +import de.flapdoodle.embed.mongo.config.MongodConfigBuilder; +import de.flapdoodle.embed.mongo.config.Net; +import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder; +import de.flapdoodle.embed.mongo.distribution.IFeatureAwareVersion; +import de.flapdoodle.embed.mongo.distribution.Version; + +public class MockMongoFactory { +private static Logger logger = LoggerFactory.getLogger(MockMongoFactory.class.getName()); + +public static MockMongoFactory newFactory() throws IOException { +return MockMongoFactory.with(Version.Main.PRODUCTION); +} + +public static MockMongoFactory with(final IFeatureAwareVersion version) throws IOException { +return new MockMongoFactory(version); +} + +private final MongodExecutable mongodExecutable; +private final MongodProcess mongodProcess; + +/** + * Create the testing utility using the specified version of MongoDB. + * + * @param version + *version of MongoDB. + */ +private MockMongoFactory(final IFeatureAwareVersion version) throws IOException { +final MongodStarter runtime = MongodStarter.getInstance(new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger).build()); +mongodExecutable = runtime.prepare(newMongodConfig(version)); +mongodProcess = mongodExecutable.start(); +} + +private IMo
[1/7] incubator-rya git commit: RYA-106 Implemented AddUser and RemoveUser commands to the RyaClient as well as their Accumulo implementations. This ensures all tables associated with a Rya instance w
Repository: incubator-rya Updated Branches: refs/heads/master ed0b0f7fd -> f0b11e2cd http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab4fca46/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java -- diff --git a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java index 33bfd98..7e8b71f 100644 --- a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java +++ b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java @@ -24,20 +24,10 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.shell.core.CommandMarker; -import org.springframework.shell.core.annotation.CliAvailabilityIndicator; -import org.springframework.shell.core.annotation.CliCommand; -import org.springframework.shell.core.annotation.CliOption; -import org.springframework.stereotype.Component; - -import com.google.common.base.Optional; - import org.apache.rya.api.client.GetInstanceDetails; import org.apache.rya.api.client.Install.DuplicateInstanceNameException; import org.apache.rya.api.client.Install.InstallConfiguration; import org.apache.rya.api.client.InstanceDoesNotExistException; -import org.apache.rya.api.client.PCJDoesNotExistException; import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.client.RyaClientException; import org.apache.rya.api.instance.RyaDetails; @@ -47,6 +37,14 @@ import org.apache.rya.shell.util.InstallPrompt; import org.apache.rya.shell.util.InstanceNamesFormatter; import org.apache.rya.shell.util.RyaDetailsFormatter; import org.apache.rya.shell.util.SparqlPrompt; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.annotation.CliAvailabilityIndicator; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; +import org.springframework.stereotype.Component; + +import com.google.common.base.Optional; /** * Rya Shell commands that have to do with administrative tasks. @@ -56,11 +54,12 @@ public class RyaAdminCommands implements CommandMarker { public static final String CREATE_PCJ_CMD = "create-pcj"; public static final String DELETE_PCJ_CMD = "delete-pcj"; -public static final String BATCH_UPDATE_PCJ_CMD = "batch-update-pcj"; public static final String GET_INSTANCE_DETAILS_CMD = "get-instance-details"; public static final String INSTALL_CMD = "install"; public static final String LIST_INSTANCES_CMD = "list-instances"; public static final String UNINSTALL_CMD = "uninstall"; +public static final String ADD_USER_CMD = "add-user"; +public static final String REMOVE_USER_CMD = "remove-user"; private final SharedShellState state; private final InstallPrompt installPrompt; @@ -71,7 +70,7 @@ public class RyaAdminCommands implements CommandMarker { * * @param state - Holds shared state between all of the command classes. (not null) * @param installPrompt - Prompts a user for installation details. (not null) - * @param sparqlPrompt - Prompts a user for create PCJ details. (not null) + * @param sparqlPrompt - Prompts a user for a SPARQL query. (not null) */ @Autowired public RyaAdminCommands(final SharedShellState state, final InstallPrompt installPrompt, final SparqlPrompt sparqlPrompt) { @@ -101,7 +100,9 @@ public class RyaAdminCommands implements CommandMarker { */ @CliAvailabilityIndicator({ GET_INSTANCE_DETAILS_CMD, -UNINSTALL_CMD }) +UNINSTALL_CMD, +ADD_USER_CMD, +REMOVE_USER_CMD}) public boolean areInstanceCommandsAvailable() { switch(state.getShellState().getConnectionState()) { case CONNECTED_TO_INSTANCE: @@ -116,8 +117,7 @@ public class RyaAdminCommands implements CommandMarker { */ @CliAvailabilityIndicator({ CREATE_PCJ_CMD, -DELETE_PCJ_CMD, -BATCH_UPDATE_PCJ_CMD}) +DELETE_PCJ_CMD }) public boolean arePCJCommandsAvailable() { // The PCJ commands are only available if the Shell is connected to an instance of Rya // that is new enough to use the RyaDetailsRepository and is configured to maintain PCJs. @@ -141,18 +141,18 @@ public class RyaAdminCommands implements CommandMarker { public String listInstances() { // Fetch the command that is connected to the store. final ShellState shellState = state.getShellState(); -final RyaClient ryaClient = shellState.getConnectedCommands().get(); -final Optional ryaInstanceName = shellState.getRyaInstanceName(); +final
[6/7] incubator-rya git commit: RYA-185 Finished implementing and testing the accumulo load statement object.
RYA-185 Finished implementing and testing the accumulo load statement object. Closes #95 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/961b16aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/961b16aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/961b16aa Branch: refs/heads/master Commit: 961b16aac9c9c6fcef105e88dc56d3c9abe6804e Parents: a196b50 Author: Kevin Chilton <kevin.chil...@parsons.com> Authored: Fri Sep 16 01:03:08 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Nov 1 11:43:10 2016 -0400 -- .../mvm/rya/api/client/LoadStatementsFile.java | 20 --- .../rya/api/client/LoadStatementsFile.java | 44 ++ .../org/apache/rya/api/client/RyaClient.java| 12 +- .../accumulo/AccumuloLoadStatementsFile.java| 134 +++ .../accumulo/AccumuloRyaClientFactory.java | 9 +- .../accumulo/AccumuloLoadStatementsFileIT.java | 126 + extras/indexing/src/test/resources/example.ttl | 5 + 7 files changed, 325 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/961b16aa/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java b/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java deleted file mode 100644 index 3918a22..000 --- a/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java +++ /dev/null @@ -1,20 +0,0 @@ -package mvm.rya.api.client; - -import java.nio.file.Path; - -import javax.annotation.ParametersAreNonnullByDefault; - -/** - * Loads a local file of RDF statements into an instance of Rya. - */ -@ParametersAreNonnullByDefault -public interface LoadStatementsFile { - -/** - * Loads a local file of RDF statements into an instance of Rya. - * - * @param ryaInstanceName - The name of the Rya instance the statements will be loaded into. (not null) - * @param statementsFile - A file that holds RDF statements that will be loaded. (not null) - */ -public void loadStatements(String ryaInstanceName, Path statementsFile); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/961b16aa/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java -- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java new file mode 100644 index 000..0fd987a --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java @@ -0,0 +1,44 @@ +/** + * 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. + */ +package org.apache.rya.api.client; + +import java.nio.file.Path; + +import org.openrdf.rio.RDFFormat; + +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; + +/** + * Loads a local file of RDF statements into an instance of Rya. + */ +@DefaultAnnotation(NonNull.class) +public interface LoadStatementsFile { + +/** + * Loads a local file of RDF statements into an instance of Rya. + * + * @param ryaInstanceName - The name of the Rya instance the statements will be loaded into. (not null) + * @param statementsFile - A file that holds RDF statements that will be loaded. (not null) + * @param format - The format of the statements file. (not null) + * @throws InstanceDoesNotExistException No instance of Rya exists for the provided name. + * @throws RyaClientException Something caused the command to fail. + */ +public void loadStatements(String ryaInstanceName, Path statementsFile, RDFFormat format) throws InstanceDoesNotExistException, RyaClientException; +} \ No ne
[5/7] incubator-rya git commit: RYA-185 Add Load Statements File command to the Rya console.
RYA-185 Add Load Statements File command to the Rya console. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a196b508 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a196b508 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a196b508 Branch: refs/heads/master Commit: a196b508945c3d74b96ec6a203ca65b1cf83a0ff Parents: 5c54c29 Author: Kevin Chilton <kevin.chil...@parsons.com> Authored: Thu Sep 15 19:11:00 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Nov 1 11:42:43 2016 -0400 -- .../mvm/rya/api/client/LoadStatementsFile.java | 20 1 file changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a196b508/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java b/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java new file mode 100644 index 000..3918a22 --- /dev/null +++ b/common/rya.api/src/main/java/mvm/rya/api/client/LoadStatementsFile.java @@ -0,0 +1,20 @@ +package mvm.rya.api.client; + +import java.nio.file.Path; + +import javax.annotation.ParametersAreNonnullByDefault; + +/** + * Loads a local file of RDF statements into an instance of Rya. + */ +@ParametersAreNonnullByDefault +public interface LoadStatementsFile { + +/** + * Loads a local file of RDF statements into an instance of Rya. + * + * @param ryaInstanceName - The name of the Rya instance the statements will be loaded into. (not null) + * @param statementsFile - A file that holds RDF statements that will be loaded. (not null) + */ +public void loadStatements(String ryaInstanceName, Path statementsFile); +} \ No newline at end of file
[3/7] incubator-rya git commit: RYA-106 Implemented AddUser and RemoveUser commands to the RyaClient as well as their Accumulo implementations. This ensures all tables associated with a Rya instance w
RYA-106 Implemented AddUser and RemoveUser commands to the RyaClient as well as their Accumulo implementations. This ensures all tables associated with a Rya instance will have table permissions applied to the users that are allowed to access them. Closes #91 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ab4fca46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ab4fca46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ab4fca46 Branch: refs/heads/master Commit: ab4fca461a8b5f34be46aee22f183d60b499c9a8 Parents: ed0b0f7 Author: Kevin Chilton <kevin.chil...@parsons.com> Authored: Mon Sep 12 22:32:28 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Tue Nov 1 10:49:04 2016 -0400 -- .../java/org/apache/rya/api/client/AddUser.java | 39 +++ .../org/apache/rya/api/client/RemoveUser.java | 39 +++ .../org/apache/rya/api/client/RyaClient.java| 30 +- .../org/apache/rya/api/instance/RyaDetails.java | 88 +++-- .../api/instance/RyaDetailsToConfiguration.java | 2 +- .../apache/rya/api/instance/RyaDetailsTest.java | 14 +- .../instance/RyaDetailsToConfigurationTest.java | 13 +- .../rya/api/instance/RyaDetailsUpdaterTest.java | 12 +- .../AccumuloRyaInstanceDetailsRepository.java | 21 +- .../rya/accumulo/utils/TablePermissions.java| 102 ++ .../apache/rya/accumulo/AccumuloRyaITBase.java | 2 +- .../accumulo/MiniAccumuloClusterInstance.java | 2 +- .../AccumuloRyaDetailsRepositoryIT.java | 35 +- .../mongodb/instance/MongoDetailsAdapter.java | 20 +- .../instance/MongoDetailsAdapterTest.java | 30 +- .../instance/MongoRyaDetailsRepositoryIT.java | 57 +++- .../rya/accumulo/utils/RyaTableNames.java | 117 +++ .../api/client/accumulo/AccumuloAddUser.java| 106 ++ .../api/client/accumulo/AccumuloCommand.java| 5 +- .../api/client/accumulo/AccumuloInstall.java| 29 +- .../api/client/accumulo/AccumuloRemoveUser.java | 95 ++ .../accumulo/AccumuloRyaClientFactory.java | 5 +- .../accumulo/entity/EntityCentricIndex.java | 68 ++-- .../freetext/AccumuloFreeTextIndexer.java | 325 +++ .../temporal/AccumuloTemporalIndexer.java | 33 +- .../api/client/accumulo/AccumuloAddUserIT.java | 267 +++ .../accumulo/AccumuloBatchUpdatePCJIT.java | 17 +- .../accumulo/AccumuloGetInstanceDetailsIT.java | 10 +- .../client/accumulo/AccumuloRemoveUserIT.java | 168 ++ .../AccumuloIndexSetColumnVisibilityTest.java | 32 +- .../org/apache/rya/shell/RyaAdminCommands.java | 111 --- .../rya/shell/util/RyaDetailsFormatter.java | 12 +- .../apache/rya/shell/RyaAdminCommandsTest.java | 91 +++--- .../rya/shell/util/RyaDetailsFormatterTest.java | 18 +- .../accumulo/geo/GeoMesaGeoIndexer.java | 47 +-- .../storage/accumulo/AccumuloPcjStorage.java| 59 ++-- .../rya/indexing/pcj/fluo/demo/DemoDriver.java | 38 +-- 37 files changed, 1638 insertions(+), 521 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab4fca46/common/rya.api/src/main/java/org/apache/rya/api/client/AddUser.java -- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/AddUser.java b/common/rya.api/src/main/java/org/apache/rya/api/client/AddUser.java new file mode 100644 index 000..623f0e1 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/AddUser.java @@ -0,0 +1,39 @@ +/* + * 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. + */ +package org.apache.rya.api.client; + +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; + +/** + * Grants a user access to an instance of Rya. + */ +@DefaultAnnotation(NonNull.class) +public interface AddUser { + +/** + * Grants access to a specific Rya instance to a user of the storage system. +
[2/7] incubator-rya git commit: RYA-106 Implemented AddUser and RemoveUser commands to the RyaClient as well as their Accumulo implementations. This ensures all tables associated with a Rya instance w
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ab4fca46/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUser.java -- diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUser.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUser.java new file mode 100644 index 000..764e002 --- /dev/null +++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUser.java @@ -0,0 +1,95 @@ +/* + * 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. + */ +package org.apache.rya.api.client.accumulo; + +import static java.util.Objects.requireNonNull; + +import java.util.List; + +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.Connector; +import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository; +import org.apache.rya.accumulo.utils.RyaTableNames; +import org.apache.rya.accumulo.utils.TablePermissions; +import org.apache.rya.api.client.InstanceDoesNotExistException; +import org.apache.rya.api.client.RemoveUser; +import org.apache.rya.api.client.RyaClientException; +import org.apache.rya.api.instance.RyaDetails; +import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException; +import org.apache.rya.api.instance.RyaDetailsUpdater; +import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException; +import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException; + +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; + +/** + * An Accumulo implementation of the {@link DeleteUser} command. + */ +@DefaultAnnotation(NonNull.class) +public class AccumuloRemoveUser extends AccumuloCommand implements RemoveUser { + +private static final TablePermissions TABLE_PERMISSIONS = new TablePermissions(); + +/** + * Constructs an instance of {@link AccumuloDeleteUser}. + * + * @param connectionDetails - Details about the values that were used to create + * the connector to the cluster. (not null) + * @param connector - Provides programmatic access to the instance of Accumulo + * that hosts Rya instance. (not null) + */ +public AccumuloRemoveUser( +final AccumuloConnectionDetails connectionDetails, +final Connector connector) { +super(connectionDetails, connector); +} + +@Override +public void removeUser(final String instanceName, final String username) throws InstanceDoesNotExistException, RyaClientException { +requireNonNull(instanceName); +requireNonNull(username); + +// Update the instance details. +final RyaDetailsUpdater updater = new RyaDetailsUpdater( new AccumuloRyaInstanceDetailsRepository(getConnector(), instanceName) ); +try { +updater.update(originalDetails -> RyaDetails.builder( originalDetails ).removeUser(username).build()); +} catch (RyaDetailsRepositoryException | CouldNotApplyMutationException e) { +throw new RyaClientException("Could not remove the user '" + username + "' from the Rya instance's details.", e); +} + +// Revoke all access to all the instance's tables. +try { +// Build the list of tables that are present within the Rya instance. +final List tables = new RyaTableNames().getTableNames(instanceName, getConnector()); + +// Update the user permissions for those tables. +for(final String table : tables) { +try { +TABLE_PERMISSIONS.revokeAllPermissions(username, table, getConnector()); +} catch (AccumuloException | AccumuloSecurityException e) { +throw new RyaClientException("Could not revoke access to table '" + table + "' from user '" + username + "'.", e); +} +} +} catch (PCJStorageException | RyaDetailsRepositoryException e) { +
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Tags: refs/tags/rya-incubating-3.2.10-rc2 [deleted] 4949a4b42
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Tags: refs/tags/v3.2.10-RC1 [deleted] cda630bb6
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 [deleted] ed0b0f7fd
[1/2] incubator-rya git commit: [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3
Repository: incubator-rya Updated Branches: refs/heads/master c06c1073c -> ed0b0f7fd [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/66d8b7f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/66d8b7f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/66d8b7f0 Branch: refs/heads/master Commit: 66d8b7f060bddeeb7c50cb0918f98ce3b265c564 Parents: c06c107 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 01:05:10 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 01:05:10 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 11 --- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 6 ++ extras/rya.console/pom.xml | 5 ++--- extras/rya.geoindexing/pom.xml | 11 --- extras/rya.indexing.pcj/pom.xml | 7 ++- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 4 ++-- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 6 ++ extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 5 ++--- extras/rya.pcj.fluo/pom.xml | 7 ++- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 35 files changed, 52 insertions(+), 79 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 0908a25..94ceab7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 07179a9..5046b7d 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index c233ed8..b784703 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 0b6e85c..a4cb7ea 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating-SNAPSHOT +3.2.10-incubating accumulo.rya http://git-wip-us.apach
[2/2] incubator-rya git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ed0b0f7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ed0b0f7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ed0b0f7f Branch: refs/heads/master Commit: ed0b0f7fd08d0e5a5879d426b8e599c4317fa6da Parents: 66d8b7f Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 01:05:27 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 01:05:27 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.console/pom.xml | 2 +- extras/rya.geoindexing/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 94ceab7..0063336 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 5046b7d..6728c7c 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index b784703..8f42385 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index a4cb7ea..ddb6458 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating +3.2.11-incubating-SNAPSHOT accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/dao/mongodb.rya/pom.xml -- diff --git a/dao/mongodb.rya/pom.xml b/dao/mongodb
svn commit: r16731 - /release/incubator/rya/rya-incubating-3.2.10/
Author: mihalik Date: Fri Oct 28 21:41:04 2016 New Revision: 16731 Log: releasing rya-incubating-3.2.10 Added: release/incubator/rya/rya-incubating-3.2.10/ release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip (with props) release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.asc release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.md5 release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.sha1 Added: release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip == Binary file - no diff available. Propchange: release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.asc == --- release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.asc (added) +++ release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.asc Fri Oct 28 21:41:04 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQIcBAABCgAGBQJYCaKjAAoJEMPMQMr1Dq4a2NgP/3YZwTcAO5GExWHzroOzrN9f +sC5Qbi+M8cLikh80wCxMYQHMAVUWyfc0lYuRjlquB9jQMfvfnx2CU0QWPfuwQ0Lk +8Mp/QNMdMe0gHhEvUuiIxbspv+55nsuL7lbAce5YKljcGXFu9LarywPJTP7Qz75c +YJs/rERJ4xEhWQVxKQEsTJTvus7BgYhNbKNc6XTabPZNnHk0wZkiW0jx6RCwVzKb +aiIrTNCuz31XEAlgRH0YqDTPU/7hnR6jB/s37GKaMLuSO54H1uhmdqNTKWNbCf76 +pLFi4poWiKex3TuNkN89KCwm/BGwPeMFi0wGmLRHLDSIpCuZ2kWENA/+aVdiblgJ +aDDdkvaGZ1WG0cuUi0HZppp4Fn0gZ+TyXD7A/KGx0JMY9Qa12NImVwH4SBEhO95e +tuCOkkK0ckRuy5uaUzmJCueDcEr91UENxzcBnIZWwsXQ1m/OyIN6pUMNNsKZTAz5 +3FUwalbfMdgTTi6NOJDvMMxwWBmx+ZL0UGuHd6aIWfkpXD3Zxcj5GZbZOgSzxRB0 +yKUDBl7ug4K7BKwdcAGWZu9R+glKYt7d2GGgxSQVergJpySM+oZi4EkO9i71irrp +0m99y7h++KAi0W0oPXSgdJr9ivHW5Hsqy8ZP8bnDiK2Y/NUwXeheQnlSkxsSbEJ5 +WcwljDvXnZrfodE3iP1q +=5DrF +-END PGP SIGNATURE- Added: release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.md5 == --- release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.md5 (added) +++ release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.md5 Fri Oct 28 21:41:04 2016 @@ -0,0 +1 @@ +a28d9a146857576903ff4fc3f7dae908 rya-project-3.2.10-incubating-source-release.zip Added: release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.sha1 == --- release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.sha1 (added) +++ release/incubator/rya/rya-incubating-3.2.10/rya-project-3.2.10-incubating-source-release.zip.sha1 Fri Oct 28 21:41:04 2016 @@ -0,0 +1 @@ +4468f55b9f381e9103ca1e2e9c25b30e1cad4ed0 rya-project-3.2.10-incubating-source-release.zip
incubator-rya-site git commit: Fix broken img for empty github id; hardcoding theme name
Repository: incubator-rya-site Updated Branches: refs/heads/master f88be90bc -> 9928d5e22 Fix broken img for empty github id; hardcoding theme name Project: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/commit/9928d5e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/tree/9928d5e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/diff/9928d5e2 Branch: refs/heads/master Commit: 9928d5e22a0f82a8fe9784e3912e391ff97debba Parents: f88be90 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Sun Oct 23 09:36:24 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 23 09:36:24 2016 -0400 -- content/_data/contributors.yml | 12 ++-- content/_includes/JB/setup | 2 +- content/community-members.md | 6 -- 3 files changed, 11 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/9928d5e2/content/_data/contributors.yml -- diff --git a/content/_data/contributors.yml b/content/_data/contributors.yml index 9693f19..28c0e56 100644 --- a/content/_data/contributors.yml +++ b/content/_data/contributors.yml @@ -19,7 +19,7 @@ # - name: Jennifer Brown apacheId: jbrown - githubId: +# githubId: role: Committer org: Parsons @@ -31,7 +31,7 @@ - name: Kevin Chilton apacheId: - githubId: +# githubId: role: Contributor - name: Adina Crainiceanu @@ -49,13 +49,13 @@ - name: Adam Fuchs apacheId: afuchs - githubId: +# githubId: role: Champion org: - name: Craig Hahn apacheId: - githubId: +# githubId: org: role: Contributor @@ -109,13 +109,13 @@ - name: Amila Wijayarathna apacheId: - githubId: +# githubId: org: role: Contributor - name: Edward J. Yoon apacheId: edwardyoon - githubId: +# githubId: org: role: Mentor http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/9928d5e2/content/_includes/JB/setup -- diff --git a/content/_includes/JB/setup b/content/_includes/JB/setup index e863325..0d8b0b7 100644 --- a/content/_includes/JB/setup +++ b/content/_includes/JB/setup @@ -16,7 +16,7 @@ {% if site.JB.ASSET_PATH %} {% assign ASSET_PATH = site.JB.ASSET_PATH %} {% else %} - {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %} + {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/apache{% endcapture %} {% endif %} {% endif %} {% endcapture %}{% assign jbcache = nil %} http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/9928d5e2/content/community-members.md -- diff --git a/content/community-members.md b/content/community-members.md index 4edf3ae..3bad8d0 100644 --- a/content/community-members.md +++ b/content/community-members.md @@ -32,11 +32,12 @@ limitations under the License. {% if site.data.contributors %} -Full NameApache IDGitHubRoleAffiliation + Full Name Apache ID GitHub Role Affiliation + {% for member in site.data.contributors %} -http://github.com/{{ member.githubId }}">http://github.com/{{ member.githubId }}.png{% else %}{{ member.avatar }}{% endunless %}"> +{% if member.githubId %}http://github.com/{{ member.githubId }}">http://github.com/{{ member.githubId }}.png{% else %}{{ member.avatar }}{% endunless %}">{% endif %} {{member.name}} {{member.apacheId}} http://github.com/{{ member.githubId }}">{{ member.githubId }} @@ -45,5 +46,6 @@ limitations under the License. {% endfor %} + {% endif %}
incubator-rya-site git commit: Fix broken img for empty github id, Accumulo name, Add lotts org
Repository: incubator-rya-site Updated Branches: refs/heads/asf-site 721d8b796 -> a05d51a68 Fix broken img for empty github id, Accumulo name, Add lotts org Project: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/commit/a05d51a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/tree/a05d51a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/diff/a05d51a6 Branch: refs/heads/asf-site Commit: a05d51a682abd4403139cbadcea72fcd4c00eb13 Parents: 721d8b7 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Sun Oct 23 09:38:41 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 23 09:38:41 2016 -0400 -- content/community-members/index.html | 25 - content/feed.xml | 6 +++--- content/index.html | 4 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/a05d51a6/content/community-members/index.html -- diff --git a/content/community-members/index.html b/content/community-members/index.html index 7f319d1..34ff234 100755 --- a/content/community-members/index.html +++ b/content/community-members/index.html @@ -94,11 +94,12 @@ -Full NameApache IDGitHubRoleAffiliation - + Full Name Apache ID GitHub Role Affiliation + + -http://github.com/;>http://github.com/.png; /> + Jennifer Brown jbrown http://github.com/;> @@ -116,7 +117,7 @@ -http://github.com/;>http://github.com/.png; /> + Kevin Chilton http://github.com/;> @@ -143,7 +144,7 @@ -http://github.com/;>http://github.com/.png; /> + Adam Fuchs afuchs http://github.com/;> @@ -152,7 +153,7 @@ -http://github.com/;>http://github.com/.png; /> + Craig Hahn http://github.com/;> @@ -166,7 +167,7 @@ http://github.com/dlotts;>dlotts Contributor - +Parsons @@ -215,7 +216,7 @@ -http://github.com/;>http://github.com/.png; /> + Seetharam Venkatesh venkatesh http://github.com/;> @@ -233,7 +234,7 @@ -http://github.com/;>http://github.com/.png; /> + Amila Wijayarathna http://github.com/;> @@ -242,7 +243,7 @@ -http://github.com/;>http://github.com/.png; /> + Edward J. Yoon edwardyoon http://github.com/;> @@ -250,11 +251,9 @@ + - - - http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/a05d51a6/content/feed.xml -- diff --git a/content/feed.xml b/content/feed.xml index 35fec90..71a7fd5 100755 --- a/content/feed.xml +++ b/content/feed.xml @@ -5,9 +5,9 @@ // -Tue, 13 Sep 2016 16:24:40 -0400 -Tue, 13 Sep 2016 16:24:40 -0400 -Jekyll v3.0.3 +Sun, 23 Oct 2016 09:36:43 -0400 +Sun, 23 Oct 2016 09:36:43 -0400 +Jekyll v3.2.1 http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/a05d51a6/content/index.html -- diff --git a/content/index.html b/content/index.html index b2cb753..a96ab56 100755 --- a/content/index.html +++ b/content/index.html @@ -75,7 +75,7 @@ Apache Rya (incubating) -Apache Rya (incubating) is a scalable RDF triple store built on top of a columnar index store (Accumulo). +Apache Rya (incubating) is a scalable RDF triple store built on top of a columnar index store (Apache Accumulo®). Get Rya @@ -101,7 +101,7 @@ Apache Rya -Rya (pronounced âree-uhâ /rÄÉ/) is a cloud-based RDF triple store that supports SPARQL queries. Rya is a scalable RDF data management system built on top of Accumulo. Rya uses novel storage methods, indexing schemes, and query processing techniques that scale to billions of triples across multiple nodes. Rya provides fast and easy access to the data through SPARQL, a conventional query mechanism for RDF data. +Rya (pronounced âree-uhâ /rÄÉ/) is a cloud-based RDF triple store that supports SPARQL queries. Rya is a scalable RDF data management system built on top of Apache Accumulo®. Rya uses novel storage methods, indexing s
[2/2] incubator-rya-site git commit: fix wording for Apache Accumulo ®
fix wording for Apache Accumulo ® Project: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/commit/f88be90b Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/tree/f88be90b Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/diff/f88be90b Branch: refs/heads/master Commit: f88be90bc77e4d3aaba70a117f4e92112d94e418 Parents: d82bd7e Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 17:54:27 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 17:54:27 2016 -0400 -- content/_data/project.yml | 2 +- content/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/f88be90b/content/_data/project.yml -- diff --git a/content/_data/project.yml b/content/_data/project.yml index fa23e5e..75fc87f 100644 --- a/content/_data/project.yml +++ b/content/_data/project.yml @@ -20,7 +20,7 @@ short_name: Rya unix_name: rya incubator_name: incubator-rya incubator_slash_name: incubator/rya -description: Apache Rya (incubating) is a scalable RDF triple store built on top of a columnar index store (Accumulo). +description: Apache Rya (incubating) is a scalable RDF triple store built on top of a columnar index store (Apache Accumulo®). download: download http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/f88be90b/content/index.md -- diff --git a/content/index.md b/content/index.md index 2611f10..fbad6a2 100644 --- a/content/index.md +++ b/content/index.md @@ -26,4 +26,4 @@ limitations under the License. ## Apache Rya -Rya (pronounced "ree-uh" /rÄÉ/) is a cloud-based RDF triple store that supports SPARQL queries. Rya is a scalable RDF data management system built on top of Accumulo. Rya uses novel storage methods, indexing schemes, and query processing techniques that scale to billions of triples across multiple nodes. Rya provides fast and easy access to the data through SPARQL, a conventional query mechanism for RDF data. +Rya (pronounced "ree-uh" /rÄÉ/) is a cloud-based RDF triple store that supports SPARQL queries. Rya is a scalable RDF data management system built on top of Apache Accumulo®. Rya uses novel storage methods, indexing schemes, and query processing techniques that scale to billions of triples across multiple nodes. Rya provides fast and easy access to the data through SPARQL, a conventional query mechanism for RDF data.
[1/2] incubator-rya-site git commit: Adding Org for dlotts
Repository: incubator-rya-site Updated Branches: refs/heads/master 641d7fecb -> f88be90bc Adding Org for dlotts Project: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/commit/d82bd7eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/tree/d82bd7eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya-site/diff/d82bd7eb Branch: refs/heads/master Commit: d82bd7ebb64994ef8269da68e6d626835726675d Parents: 641d7fe Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 17:47:56 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 17:47:56 2016 -0400 -- content/_data/contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya-site/blob/d82bd7eb/content/_data/contributors.yml -- diff --git a/content/_data/contributors.yml b/content/_data/contributors.yml index dd08be8..9693f19 100644 --- a/content/_data/contributors.yml +++ b/content/_data/contributors.yml @@ -62,7 +62,7 @@ - name: David Lotts apacheId: githubId: dlotts - org: + org: Parsons role: Contributor - name: Caleb Meier
svn commit: r16625 - /release/incubator/rya/KEYS
Author: mihalik Date: Fri Oct 21 21:17:37 2016 New Revision: 16625 Log: Updating Rya KEYS Modified: release/incubator/rya/KEYS Modified: release/incubator/rya/KEYS == --- release/incubator/rya/KEYS (original) +++ release/incubator/rya/KEYS Fri Oct 21 21:17:37 2016 @@ -1,10 +1,18 @@ -This file contains the GPG keys needed to verify Apache Rya releases. To -update this file, execute the following command: -(gpg --list-sigs && gpg --armor --export ) >> KEYS +This file contains the PGP keys of various developers. + +Users: pgp < KEYS + gpg --import KEYS +Developers: +pgp -kxa and append it to this file. +(pgpk -ll && pgpk -xa ) >> this file. +(gpg --list-sigs + && gpg --armor --export ) >> this file. + pub 4096R/F50EAE1A 2016-03-01 [expires: 2020-03-01] uid [ultimate] Aaron Mihalik <aaron.miha...@gmail.com> sig 3F50EAE1A 2016-03-01 Aaron Mihalik <aaron.miha...@gmail.com> +sig B36941A2 2016-10-17 David Wayne Lotts (AKA dlotts dalo daxlo) <david...@lotts.org> sub 4096R/6E436BFA 2016-03-01 [expires: 2020-03-01] sig F50EAE1A 2016-03-01 Aaron Mihalik <aaron.miha...@gmail.com> @@ -34,29 +42,41 @@ y+uSZgV2G4le7irtJprcuZiQYIims3sy5st+5Vp9 O5xKq+NtzcLy/EA+mfbyHSY4XeeIFLDtUj0qQk+rOrqHt/oKdo2wup+0D/2dkwTd HBz0SkQLZWXigs3g705/K1/ypVNdtkXtjoJa4WNdxipoF4MoyOvpjbprw9C+Qaqs cZr7uRzusCyuddX6jCqThBpZQ66nvJKusqtXR+jk/SX9wJMvcRqZLu+DXT5Uf2+X -3C90g5lK/sfUgEqWF2NzNMHi4s6khSUgMeS5A3hR0KhjEl54P3YBkzO5Ag0EVtXs -FwEQAJcy2jUxD65daTTynu/WOts4fu+Nc0sIW+4UDiesyRJKopfP4fMBAIuQ9H4N -M6F//GnAfUM7A3CdAaWql2fuVlTPdRm68iBZ/UNDhGio2IfqpYjzzJZ3riYXjDfX -xosGUmsffPgKJpyv4HHsfDg4tUituGok45ldihn5ypghd21nTHChleXskrZZ3N8c -yFKilKnB93E93mO111e0FJ6p8B4rCcK4bJMXY2EIgQ4evRGucdIE2gtcpaLZDeV7 -TtgJw7EbmQfnHep7VFfSx2qkIiywtK7rviG73s/YEHe4Mz6T1MMMZhvi0PntoVPS -6z2mZkTu8JTd7ukkYBY6SnUaoeAYVJdP1q6qexUjG6blflj4EEfJJ1+l54ZgwsKV -wDu2N6gRMepgxZoRGh/KhX+N0nzftcCxjXFk1s1egfhQwIBoS9dqnm44hU9hWhNc -eflBMqbcl8EeN1I4vO3ZG7tLWcDXpWgyNE1uyRVxIwM8gs/pr3lkHhKpsFhtjHLL -pGo7CdbSp5LlhD4Zkeu+yp69PKSZbh4sxPCOLgnk58Nck/67vV8LpnL5MzYUu89u -DcOL90gMlPLz86Lm2aulutiTJw6gIVrMEm5aUclodGJDVB4SOD75ksXtGlpLOUGf -7mVXI3giMUsVmpT9C0jpmGaway08cFBVW7lZ+H50GAJSPjiLABEBAAGJAiUEGAEK -AA8FAlbV7BcCGwwFCQeGH4AACgkQw8xAyvUOrhq1aBAAsKw07EJAV8wQ7PLT4HXA -yo8hFqLWIYI6A+E71t/C6agJY1uRvBonV3TcGDBKma5hLxcr53AVX0eswO5mRxQ3 -E90ky31YAyQIoQkvW6hb69uK64+EYd6xIdMnSaaJlk2Co5nc5PBBWkrwwjZt+WCz -Vh6rWUWLo9XlEyHEo39OoLSIeBTjemdflbLtNmPoFf35HfwCDNhylYV0fjM6/xiH -h74vP7sbGLN7dTy+JmuJkFVRpRTEnoE9IPIy6ouJ1Z7Pw1JFWwaKEK0/8J+I0cnA -n9Ui/Wy4hSf/lBRLajvDJoqYWZYvyLs5kjcdsq87aeYZs04nQLUYy7UCM1ICSfco -YD4BhcPVJ9j6ZpleG5GyXCmDJfIiBCBdyT2eNGws1YzenHEJUT0pTphT9lAF/sbQ -RyG5mIWAwGpRLGs8ANU0AC9nt+Qcg/4XJOG36FhtS6aWAOo/Bhu7a/8+GF1YK8P6 -t1+57Dk+Ui717MBtVTUChfplJruCrQucSsMhqoxv/lffvWKntGVN0gNdvw2HCrmB -GpoD/zh2T+zCJgd0fBoV5EFF1bj9aqyN0ZUduEnwbvm9aRWEHXwVcDFFAUXlbiW8 -7GUrVx4LgrdoXg1iR4eu2iVSiTupa4+SehfhQFKVfH1IBv77JW/W/SsmU53fi644 -ssSj9X5P72yTnqDXLQvM9kU= -=F6Pu +3C90g5lK/sfUgEqWF2NzNMHi4s6khSUgMeS5A3hR0KhjEl54P3YBkzOJAhwEEAEC +AAYFAlgFAlQACgkQ/L3bXrNpQaLMLw//WPcTreWCLjSwBBR8aQUf/DF+uwDEtrMY +4Y1madD6iH05iLVh3nhW1qZVLLQExf6CGvXxmex+ZiQMLQlDp3TEGOnYFZz7/yQP +zMgk3VbxQkPkcRSw2b2lOMxxSD6H6AUWQqv1Ogop6iHOVClRxkVkDO8/2jMLeS9Q +ufzfVrUQCTzjmLU5k4IbxEfSz6of5dgzoksvWn7rzB/ONv7nchZMD/iIaaLDk6XB +71moKtZncySFDO+0GxTeZS+PbuRv1hgB587XzSl07Nt0O4FxZrw0cuUusx9EE5l7 +MHQS+g8Z0cqijpOFkVcSGOalHFfPYtoHWJUtH5uxY/ctX/qd0KNa4Z42KYKjPwEd +4yZlxUsLuqiKLLtvQA+YcgwXrDKhtBLkYrEEBmmTCIvEJmr6870pob2XRvQlghpp +VFHaRtR+lNbxZnFNmLExwjNRCmZ3NDGaRHBPhazEdee+LzmTaDJ+4spO3855IWdW +WehIus0QN9HDDU60FgxJq6NXmDN5OnVMd5A58+C+/bb+EzDxhVa880NO82XQkSFL +VyPxZ8vavL9tr6lKC7XPw2LB9Qdo+nEENpd4OQaMGeX9r8HHbD97Q+0CsBtBYrtb +5vP7/ImkZyCEZljFliFVtrbOWFFekU7YSxfkSPAiX0ogtTT+3JYloaIoU27ctuNd +8sAkx7R25la5Ag0EVtXsFwEQAJcy2jUxD65daTTynu/WOts4fu+Nc0sIW+4UDies +yRJKopfP4fMBAIuQ9H4NM6F//GnAfUM7A3CdAaWql2fuVlTPdRm68iBZ/UNDhGio +2IfqpYjzzJZ3riYXjDfXxosGUmsffPgKJpyv4HHsfDg4tUituGok45ldihn5ypgh +d21nTHChleXskrZZ3N8cyFKilKnB93E93mO111e0FJ6p8B4rCcK4bJMXY2EIgQ4e +vRGucdIE2gtcpaLZDeV7TtgJw7EbmQfnHep7VFfSx2qkIiywtK7rviG73s/YEHe4 +Mz6T1MMMZhvi0PntoVPS6z2mZkTu8JTd7ukkYBY6SnUaoeAYVJdP1q6qexUjG6bl +flj4EEfJJ1+l54ZgwsKVwDu2N6gRMepgxZoRGh/KhX+N0nzftcCxjXFk1s1egfhQ +wIBoS9dqnm44hU9hWhNceflBMqbcl8EeN1I4vO3ZG7tLWcDXpWgyNE1uyRVxIwM8 +gs/pr3lkHhKpsFhtjHLLpGo7CdbSp5LlhD4Zkeu+yp69PKSZbh4sxPCOLgnk58Nc +k/67vV8LpnL5MzYUu89uDcOL90gMlPLz86Lm2aulutiTJw6gIVrMEm5aUclodGJD +VB4SOD75ksXtGlpLOUGf7mVXI3giMUsVmpT9C0jpmGaway08cFBVW7lZ+H50GAJS +PjiLABEBAAGJAiUEGAEKAA8FAlbV7BcCGwwFCQeGH4AACgkQw8xAyvUOrhq1aBAA +sKw07EJAV8wQ7PLT4HXAyo8hFqLWIYI6A+E71t/C6agJY1uRvBonV3TcGDBKma5h +Lxcr53AVX0eswO5mRxQ3E90ky31YAyQIoQkvW6hb69uK64+EYd6xIdMnSaaJlk2C +o5nc5PBBWkrwwjZt+WCzVh6rWUWLo9XlEyHEo39OoLSIeBTjemdflbLtNmPoFf35 +HfwCDNhylYV0fjM6/xiHh74vP7sbGLN7dTy+JmuJkFVRpRTEnoE9IPIy6ouJ1
svn commit: r16624 - /dev/incubator/rya/KEYS
Author: mihalik Date: Fri Oct 21 21:17:00 2016 New Revision: 16624 Log: Removing duplicate keys file Removed: dev/incubator/rya/KEYS
svn commit: r16616 - /dev/incubator/rya/rya-incubating-3.2.10-rc3/
Author: mihalik Date: Fri Oct 21 05:13:34 2016 New Revision: 16616 Log: Adding rya-incubating-3.2.10-rc3 Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip (with props) dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc Fri Oct 21 05:13:34 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQIcBAABCgAGBQJYCaKjAAoJEMPMQMr1Dq4a2NgP/3YZwTcAO5GExWHzroOzrN9f +sC5Qbi+M8cLikh80wCxMYQHMAVUWyfc0lYuRjlquB9jQMfvfnx2CU0QWPfuwQ0Lk +8Mp/QNMdMe0gHhEvUuiIxbspv+55nsuL7lbAce5YKljcGXFu9LarywPJTP7Qz75c +YJs/rERJ4xEhWQVxKQEsTJTvus7BgYhNbKNc6XTabPZNnHk0wZkiW0jx6RCwVzKb +aiIrTNCuz31XEAlgRH0YqDTPU/7hnR6jB/s37GKaMLuSO54H1uhmdqNTKWNbCf76 +pLFi4poWiKex3TuNkN89KCwm/BGwPeMFi0wGmLRHLDSIpCuZ2kWENA/+aVdiblgJ +aDDdkvaGZ1WG0cuUi0HZppp4Fn0gZ+TyXD7A/KGx0JMY9Qa12NImVwH4SBEhO95e +tuCOkkK0ckRuy5uaUzmJCueDcEr91UENxzcBnIZWwsXQ1m/OyIN6pUMNNsKZTAz5 +3FUwalbfMdgTTi6NOJDvMMxwWBmx+ZL0UGuHd6aIWfkpXD3Zxcj5GZbZOgSzxRB0 +yKUDBl7ug4K7BKwdcAGWZu9R+glKYt7d2GGgxSQVergJpySM+oZi4EkO9i71irrp +0m99y7h++KAi0W0oPXSgdJr9ivHW5Hsqy8ZP8bnDiK2Y/NUwXeheQnlSkxsSbEJ5 +WcwljDvXnZrfodE3iP1q +=5DrF +-END PGP SIGNATURE- Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 Fri Oct 21 05:13:34 2016 @@ -0,0 +1 @@ +a28d9a146857576903ff4fc3f7dae908 rya-project-3.2.10-incubating-source-release.zip Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 Fri Oct 21 05:13:34 2016 @@ -0,0 +1 @@ +4468f55b9f381e9103ca1e2e9c25b30e1cad4ed0 rya-project-3.2.10-incubating-source-release.zip
svn commit: r16615 - /dev/incubator/rya/rya-incubating-3.2.10-rc3/
Author: mihalik Date: Fri Oct 21 05:08:45 2016 New Revision: 16615 Log: Removing rya-incubating-3.2.10-rc3 Removed: dev/incubator/rya/rya-incubating-3.2.10-rc3/
incubator-rya git commit: [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 [created] 66d8b7f06 [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/66d8b7f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/66d8b7f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/66d8b7f0 Branch: refs/heads/3.2.10-RC3 Commit: 66d8b7f060bddeeb7c50cb0918f98ce3b265c564 Parents: c06c107 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 01:05:10 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 01:05:10 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 11 --- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 6 ++ extras/rya.console/pom.xml | 5 ++--- extras/rya.geoindexing/pom.xml | 11 --- extras/rya.indexing.pcj/pom.xml | 7 ++- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 4 ++-- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 6 ++ extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 5 ++--- extras/rya.pcj.fluo/pom.xml | 7 ++- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 35 files changed, 52 insertions(+), 79 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 0908a25..94ceab7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 07179a9..5046b7d 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index c233ed8..b784703 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/66d8b7f0/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 0b6e85c..a4cb7ea 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating-SNAPSHOT +3.2.10-incubating accumulo.rya http://git-wip-us.apac
incubator-rya git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 66d8b7f06 -> ed0b0f7fd [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/ed0b0f7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/ed0b0f7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/ed0b0f7f Branch: refs/heads/3.2.10-RC3 Commit: ed0b0f7fd08d0e5a5879d426b8e599c4317fa6da Parents: 66d8b7f Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 01:05:27 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 01:05:27 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.console/pom.xml | 2 +- extras/rya.geoindexing/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 94ceab7..0063336 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 5046b7d..6728c7c 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index b784703..8f42385 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index a4cb7ea..ddb6458 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating +3.2.11-incubating-SNAPSHOT accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ed0b0f7f/dao/mong
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Tags: refs/tags/rya-incubating-3.2.10-rc3 [deleted] 525bd5683
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 [deleted] c4c80872d
svn commit: r16614 - /dev/incubator/rya/rya-incubating-3.2.10-rc3/
Author: mihalik Date: Fri Oct 21 04:45:08 2016 New Revision: 16614 Log: Adding rya-incubating-3.2.10-rc3 Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip (with props) dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.asc Fri Oct 21 04:45:08 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQIcBAABCgAGBQJYCZeQAAoJEMPMQMr1Dq4a/ywQAK9PaCq9ztxQP0xc6WU1HvtJ +Z25ANCHqpuQy/1vZiet4uElMIEt5SSzWz2MkUaMc/RVu1o2LVgmxbJ+r8BuPHqqD +uM/kVUtPkCBgE6SGbIrOqHNYlJLfKxVMxV5Z+WHt9dE4xRcuYqCds8S7BoJx3uWU +6i3FwR+CJnd8lKwdQJ/LvLKegikZ4xS9XvwZU9yhOaKOZbvOgcSbxwgQDPsD2U2w +2ZfRfhhNQ0NrxUdjSR8zFP0E5BkTzgdHvpGYpC4Kt1BtKzSEqnuucQVPjBzffMln +TuzKUC8AHlcje50XuCzrZHLipCS5o181+szpWoZA7PEjj4wHY8JUBzmvKqpVgg3+ +Oh1icvlPdesGecXzKTJ+WW0wXm+E/04NqaSVCAhx+ot0z1sYnL1AVkYHOJP+96tA +XeatoFVkO+kTBZ2ObVssnZpjznwpyLOq5iAzjkCu4+RFqu3qVSLawTCxB6FY144F +EwuByH2tmnX0x2KbMneRlRWgUUu6H+N3m/BKm8axK+rlH5AxhLm/qwS2kmiq0ZCT +Q8ASlwlBKp0YWTe+WyopLMqXbGwS9vfnIySSv9ZrlIPYou1hDcUj2lc+arvhx8qo +TOR9Xjk4W4Ce3ygKvziLKSMFZMb1wTFid8lPf3EAsvdU3ySXp3nB/S6ChG9LfBsj +8stIuvelyiiE6nX6SZL5 +=Yxe6 +-END PGP SIGNATURE- Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.md5 Fri Oct 21 04:45:08 2016 @@ -0,0 +1 @@ +404d1cfec6350605050fc4cfed46c5df rya-project-3.2.10-incubating-source-release.zip Added: dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 == --- dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 (added) +++ dev/incubator/rya/rya-incubating-3.2.10-rc3/rya-project-3.2.10-incubating-source-release.zip.sha1 Fri Oct 21 04:45:08 2016 @@ -0,0 +1 @@ +6f510fe85d1f07ff6d4937b08e26ed91cfda9242 rya-project-3.2.10-incubating-source-release.zip
incubator-rya git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 9147af216 -> c4c80872d [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/c4c80872 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/c4c80872 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/c4c80872 Branch: refs/heads/3.2.10-RC3 Commit: c4c80872d8ed02c3b52582ffb79244af3a0a5a50 Parents: 9147af2 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 00:17:50 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 00:17:50 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.console/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c4c80872/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 94ceab7..0063336 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c4c80872/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 5046b7d..6728c7c 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c4c80872/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index b784703..8f42385 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c4c80872/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index a4cb7ea..ddb6458 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating +3.2.11-incubating-SNAPSHOT accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c4c80872/dao/mongodb.rya/pom.xml -- d
incubator-rya git commit: [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 [created] 9147af216 [maven-release-plugin] prepare release rya-incubating-3.2.10-rc3 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/9147af21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/9147af21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/9147af21 Branch: refs/heads/3.2.10-RC3 Commit: 9147af2167c5bfa023c0d6a61d37aab2ac4b08d2 Parents: c06c107 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 00:17:33 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 00:17:33 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 11 --- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 6 ++ extras/rya.console/pom.xml | 5 ++--- extras/rya.indexing.pcj/pom.xml | 7 ++- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 4 ++-- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 6 ++ extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 5 ++--- extras/rya.pcj.fluo/pom.xml | 7 ++- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 34 files changed, 48 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9147af21/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 0908a25..94ceab7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9147af21/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 07179a9..5046b7d 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9147af21/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index c233ed8..b784703 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9147af21/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 0b6e85c..a4cb7ea 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating-SNAPSHOT +3.2.10-incubating accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9147af21/dao/mongodb
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Tags: refs/tags/rya-incubating-3.2.10-rc3 [created] 525bd5683
incubator-rya git commit: [maven-release-plugin] prepare release rya-incubating-3.2.10-rc2
Repository: incubator-rya Updated Branches: refs/heads/master c06c1073c -> 8ad20e34b [maven-release-plugin] prepare release rya-incubating-3.2.10-rc2 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/8ad20e34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/8ad20e34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/8ad20e34 Branch: refs/heads/master Commit: 8ad20e34b6312c368599391a96aa245b2dfc6aff Parents: c06c107 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Fri Oct 21 00:10:23 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Fri Oct 21 00:10:23 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 11 --- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 6 ++ extras/rya.console/pom.xml | 5 ++--- extras/rya.indexing.pcj/pom.xml | 7 ++- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 4 ++-- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 6 ++ extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 5 ++--- extras/rya.pcj.fluo/pom.xml | 7 ++- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 34 files changed, 48 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ad20e34/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 0908a25..94ceab7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ad20e34/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 07179a9..5046b7d 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ad20e34/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index c233ed8..b784703 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ad20e34/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 0b6e85c..a4cb7ea 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating-SNAPSHOT +3.2.10-incubating accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8ad20e34/dao/mong
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC3 [deleted] 5b3e7e84c
[2/5] incubator-rya git commit: RYA-200 Removing findbugs:jsr305 Dependency
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java -- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java index 1a0bbc5..d98f556 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSet.java @@ -20,14 +20,14 @@ package org.apache.rya.indexing.pcj.storage.accumulo; import static java.util.Objects.requireNonNull; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.query.BindingSet; /** * Decorates a {@link BindingSet} with a collection of visibilities. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class VisibilityBindingSet extends BindingSetDecorator { private static final long serialVersionUID = 1L; private String visibility; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java -- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java index 307d0b4..8530efe 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java @@ -18,7 +18,7 @@ */ package org.apache.rya.indexing.pcj.storage.accumulo; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.openrdf.query.BindingSet; @@ -26,7 +26,7 @@ import org.openrdf.query.BindingSet; * Converts {@link BindingSet}s to Strings and back again. The Strings do not * include the binding names and are ordered with a {@link VariableOrder}. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public class VisibilityBindingSetStringConverter extends BindingSetStringConverter { public static final char VISIBILITY_DELIM = 1; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java -- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java index 54fe325..462bf4d 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.update; import java.util.Collection; -import javax.annotation.ParametersAreNonnullByDefault; +// SEE RYA-211 import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.storage.PcjException; @@ -30,7 +30,7 @@ import org.apache.rya.api.domain.RyaStatement; * Updates the state of all PCJ indices whenever {@link RyaStatement}s are * added to or removed from the system. */ -@ParametersAreNonnullByDefault +// SEE RYA-211 @ParametersAreNonnullByDefault public interface PrecomputedJoinUpdater { /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a0a871fc/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java -- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java index d31e578..1066050 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreatePcj.java @@ -26,7 +26,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.NO import java.util.HashSet; import
svn commit: r16548 - in /dev/incubator/rya/rya-incubating-3.2.10-rc2: rya-project-3.2.10-incubating-source-release.zip rya-project-3.2.10-incubating-source-release.zip.asc
Author: mihalik Date: Mon Oct 17 03:40:12 2016 New Revision: 16548 Log: updating rya-incubating-3.2.10-rc2 Modified: dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.asc Modified: dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip == Binary files - no diff available. Modified: dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.asc == --- dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.asc (original) +++ dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.asc Mon Oct 17 03:40:12 2016 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Comment: GPGTools - https://gpgtools.org -iQIbBAABCgAGBQJYBDVuAAoJEMPMQMr1Dq4aoTIP9ivdsFWr/vPBF4I+W1ZquCFa -6Vhq4YaJJ8VI+DxqoQqH8fd34+RH1ypsVrDIItV9AkJN5wlMukiKce7/xRTeWN6i -dutl+a5H7pVmYhjXd8Q5ZIfV/P5o9W02cN2VvTmG5tFoLnUCChTbNoHql+84Iw8R -yYKjqH9asGakHEme+hygGDSTMRzapMZ5a3bJ8V3w+jE1fxnk/25WrjpLi2QNx8wj -jl0pZgKlLqlZsgOiZWfZqystxbDx7jchJwi1peUbnljt/QSOjwww5p7kj2wycoVD -9lnGPBMEXbhYCb0wti3L3/GgAUrrsl6j6sFw6J/Vv1qjTOXjppsHiaTkEUBPd9Cd -qA1hZZAmivmC24fuooTX+G761d6l2sjrxhpVEFRPYi+Dji0SwjuuPnPXXFirVklc -NIzFi8EwxQw6uTAlqrIAK+o9Qol5Ik1KsZXFkHQLk4CELeLui19lTPi9vlKqG+CL -H+UF7dkqY20ZJJLbZQJzDUcJ5cV15zxavfLoqWKZxqvcQ6k3lvCjO8AQzhqESAJf -L5MdJk9pj6Zd//x0tPGFzQpMJWTnoa02Y9aA5nJsLGodWg4zFS2FngtcoVHNBK+t -sO8HC9NeoB2VTRhj3tNXR64E91fhqUSPoZvBO/iD4ywSQOsxrQ71PXLxAGci8ZTd -pAG1Du12yB2QMwmScUM= -=MxHS +iQIcBAABCgAGBQJYBDh6AAoJEMPMQMr1Dq4ameQQAIFG877FZ0e153xsr/2zN/6u +x7liW31Gf98/f+7D97kQtkzWUyC7+rumj6t0RkKt0rVhQRI5oQcDd70duw4iYAlS +1e6UIdwhZEji5wtCjepW4jUkgWfqcYKrYTWFxCW7KE/cKrD4VHs8nMgzYk+37Lxy +76+xL1pecTQygCQ+lR4Yx28bEkhrb9xrzKkcq/EpBmdeoOI1Sgxz5Yx7L57la8zO +n90d5JETGCgaroGCxiSLzEIpGXHKZWYH8c9Tz80jPyp6I6QInpRXRdHDg59jN7Lj +kqtpKYhlv3Xl0HGQ6FWtMNsOrs8smBv33Mc4PmSpD0rtEleYA+/NM6C1hQhNUQ65 +meitnuuLUKNZhFgNhRD4IzhqLvq05VS2jmh3Y4gV+vkg6qmsaHeHyF4cqiTV/8zv +dtHpB8FDeqCUQgTOqZ1ykhhmaZGUAPi7V3T9yV+n9XPRxQg7k3P5opTIcViCytqR +4tQ8GMVee2qYOvIWaZbT4EgAQStKf6D81jT74dUCvatuzd2JTLtnCaRaRxh+JqIq +4BYF8Cnd4iZHm00lFrsUisDT6/LZI/rfOxmvpAA/YVMF/6G2rLaPNLF4ed24A92d +1kJqHDFeLkqUBtrQzELHUhjTCMvvjwmlFe+5QdNjljdMLAygYGu/j6ul7xKqrEwe +CdnxKsoBW2Zo64aWMBsv +=gzui -END PGP SIGNATURE-
svn commit: r16547 - in /dev/incubator/rya: ./ rya-incubating-3.2.10-rc2/
Author: mihalik Date: Mon Oct 17 03:22:35 2016 New Revision: 16547 Log: adding rya-incubating-3.2.10-rc2 Added: dev/incubator/rya/KEYS dev/incubator/rya/rya-incubating-3.2.10-rc2/ dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip (with props) dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.asc dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.md5 dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip.sha1 Added: dev/incubator/rya/KEYS == --- dev/incubator/rya/KEYS (added) +++ dev/incubator/rya/KEYS Mon Oct 17 03:22:35 2016 @@ -0,0 +1,62 @@ +This file contains the GPG keys needed to verify Apache Rya releases. To +update this file, execute the following command: +(gpg --list-sigs && gpg --armor --export ) >> KEYS + +pub 4096R/F50EAE1A 2016-03-01 [expires: 2020-03-01] +uid [ultimate] Aaron Mihalik <aaron.miha...@gmail.com> +sig 3F50EAE1A 2016-03-01 Aaron Mihalik <aaron.miha...@gmail.com> +sub 4096R/6E436BFA 2016-03-01 [expires: 2020-03-01] +sig F50EAE1A 2016-03-01 Aaron Mihalik <aaron.miha...@gmail.com> + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - https://gpgtools.org + +mQINBFbV7BcBEAC5L/h6o5cTRiDfn3Eeog8Il8IsTRiqaCC94Wcroq1zWy8j11Yr +iMdzjuuz71qpd4BRVQ8e5CjiK6UPJBXxa9Jr6hVEkz2ysegM3MA2/8aOibV5JE0l +Kq8lKpQXzMyLwTTv4BT4NrxKg4fzhvWPZvrN7Kk7yc/W3gzXstp8Xt/522meBQk4 +Oykuh+tQPZafqBXZuOnW6Ner8a6jcJ2upxYxw+buC3W2AqMKW+TSHppjpQyAKCCH +x1gcefizOJldAXfimrzHDgB/lWWvyFzQ1R6thrxfsQFfBKpVugdAJ2q6apv/HHIB +7EQr80qpyo8BbkIFP4tZTmZLCozi9jnQTvqIAHj55P8TbLAY4Q2ES5TQU1HOsau0 +CsA+Qndx+HLXvwUAGiPxhsJY6fwiQKMN1baXrgKvW6sA93T1rbBsM5BGXSkhrsHb +J9I7kQPT/VbbLJfFXUKaZG4MhnjFtZKwDJH6+x++fH9mH2M6hH2JIhOW8m704iT4 +sHgwhRlhS4vfEAkGiQGkYyqQcVlI4YS1TZpx1yNQzXiOxkYKW5/tQiBvbx18fha9 +i9O7GXYkYPsV0Oek2W/QQ3wY1yQsldM4fJ7NunuogRjIOyqdSDmqtlSuqEBoejo0 +R2VR5DQGvxBKER6sFFTF2GVIosWvbrBkifyrinZiPDa8d3vxEN79X5YEVQARAQAB +tCdBYXJvbiBNaWhhbGlrIDxhYXJvbi5taWhhbGlrQGdtYWlsLmNvbT6JAj0EEwEK +ACcFAlbV7BcCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQw8xA +yvUOrhpU+A//W4tvBxsKqZcerZpAPb7waQ9j+m6X60T6FpGIX72HI+AHJ/QzZUg3 +W2W6MGO6dCKyDa2M1bPHCqIYJCulbkAqbS8UOZ2zJFLEjX2khaKmo6vrk3O1Kvey +V9WfurAmQMHOTguy+mWTSP9gUc0BHNrzyHZH9re1XujmgmqlLMzkfq2s6tEemQPN +r3phIln4yD5uWly2Z22WYr/OLea92idUcdC71A/kJl3kRzaEAhy8yBK/1ZiOWx7h +Jy0Y5NCxcHvHhJqL7qKh1bgdYyERvwmc+Hd7dbrKQIrhn9gZz6o5r5dFMSURrkhq +ZPJ9v/Jhzz+KNhEVQ0KqobbjDNA0vLrq3gMy2lDx66dK7F9SqDvRoxgU9xA/hbSo +y+uSZgV2G4le7irtJprcuZiQYIims3sy5st+5Vp9mghfx2lpd69lYmGfIL3pBuNi +O5xKq+NtzcLy/EA+mfbyHSY4XeeIFLDtUj0qQk+rOrqHt/oKdo2wup+0D/2dkwTd +HBz0SkQLZWXigs3g705/K1/ypVNdtkXtjoJa4WNdxipoF4MoyOvpjbprw9C+Qaqs +cZr7uRzusCyuddX6jCqThBpZQ66nvJKusqtXR+jk/SX9wJMvcRqZLu+DXT5Uf2+X +3C90g5lK/sfUgEqWF2NzNMHi4s6khSUgMeS5A3hR0KhjEl54P3YBkzO5Ag0EVtXs +FwEQAJcy2jUxD65daTTynu/WOts4fu+Nc0sIW+4UDiesyRJKopfP4fMBAIuQ9H4N +M6F//GnAfUM7A3CdAaWql2fuVlTPdRm68iBZ/UNDhGio2IfqpYjzzJZ3riYXjDfX +xosGUmsffPgKJpyv4HHsfDg4tUituGok45ldihn5ypghd21nTHChleXskrZZ3N8c +yFKilKnB93E93mO111e0FJ6p8B4rCcK4bJMXY2EIgQ4evRGucdIE2gtcpaLZDeV7 +TtgJw7EbmQfnHep7VFfSx2qkIiywtK7rviG73s/YEHe4Mz6T1MMMZhvi0PntoVPS +6z2mZkTu8JTd7ukkYBY6SnUaoeAYVJdP1q6qexUjG6blflj4EEfJJ1+l54ZgwsKV +wDu2N6gRMepgxZoRGh/KhX+N0nzftcCxjXFk1s1egfhQwIBoS9dqnm44hU9hWhNc +eflBMqbcl8EeN1I4vO3ZG7tLWcDXpWgyNE1uyRVxIwM8gs/pr3lkHhKpsFhtjHLL +pGo7CdbSp5LlhD4Zkeu+yp69PKSZbh4sxPCOLgnk58Nck/67vV8LpnL5MzYUu89u +DcOL90gMlPLz86Lm2aulutiTJw6gIVrMEm5aUclodGJDVB4SOD75ksXtGlpLOUGf +7mVXI3giMUsVmpT9C0jpmGaway08cFBVW7lZ+H50GAJSPjiLABEBAAGJAiUEGAEK +AA8FAlbV7BcCGwwFCQeGH4AACgkQw8xAyvUOrhq1aBAAsKw07EJAV8wQ7PLT4HXA +yo8hFqLWIYI6A+E71t/C6agJY1uRvBonV3TcGDBKma5hLxcr53AVX0eswO5mRxQ3 +E90ky31YAyQIoQkvW6hb69uK64+EYd6xIdMnSaaJlk2Co5nc5PBBWkrwwjZt+WCz +Vh6rWUWLo9XlEyHEo39OoLSIeBTjemdflbLtNmPoFf35HfwCDNhylYV0fjM6/xiH +h74vP7sbGLN7dTy+JmuJkFVRpRTEnoE9IPIy6ouJ1Z7Pw1JFWwaKEK0/8J+I0cnA +n9Ui/Wy4hSf/lBRLajvDJoqYWZYvyLs5kjcdsq87aeYZs04nQLUYy7UCM1ICSfco +YD4BhcPVJ9j6ZpleG5GyXCmDJfIiBCBdyT2eNGws1YzenHEJUT0pTphT9lAF/sbQ +RyG5mIWAwGpRLGs8ANU0AC9nt+Qcg/4XJOG36FhtS6aWAOo/Bhu7a/8+GF1YK8P6 +t1+57Dk+Ui717MBtVTUChfplJruCrQucSsMhqoxv/lffvWKntGVN0gNdvw2HCrmB +GpoD/zh2T+zCJgd0fBoV5EFF1bj9aqyN0ZUduEnwbvm9aRWEHXwVcDFFAUXlbiW8 +7GUrVx4LgrdoXg1iR4eu2iVSiTupa4+SehfhQFKVfH1IBv77JW/W/SsmU53fi644 +ssSj9X5P72yTnqDXLQvM9kU= +=F6Pu +-END PGP PUBLIC KEY BLOCK- Added: dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/rya/rya-incubating-3.2.10-rc2/rya-project-3.2.10-incubating-source-release.zip -- svn:mime-type = application/octet-strea
incubator-rya git commit: Push to wake up infra
Repository: incubator-rya Updated Branches: refs/heads/RYA-INFRA-PUSH e93f0d0a8 -> 80319bbb1 Push to wake up infra Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/80319bbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/80319bbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/80319bbb Branch: refs/heads/RYA-INFRA-PUSH Commit: 80319bbb1ab043bfbb405dd511411e27b421977f Parents: e93f0d0 Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Sun Oct 16 23:07:10 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 16 23:07:10 2016 -0400 -- --
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC1 [deleted] 61d3a992c
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC [deleted] b7a0d609a
incubator-rya git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC 9f0d63e60 -> b7a0d609a [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/b7a0d609 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/b7a0d609 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/b7a0d609 Branch: refs/heads/3.2.10-RC Commit: b7a0d609ae325e4f092161c1ef265946336baff0 Parents: 9f0d63e Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Sun Oct 16 22:24:19 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 16 22:24:19 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 2 +- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 2 +- extras/rya.console/pom.xml | 2 +- extras/rya.indexing.pcj/pom.xml | 2 +- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 2 +- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 2 +- extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 2 +- extras/rya.pcj.fluo/pom.xml | 2 +- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b7a0d609/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 94ceab7..0063336 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b7a0d609/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index c7efc89..d3ffed3 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b7a0d609/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index b784703..8f42385 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating +3.2.11-incubating-SNAPSHOT rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b7a0d609/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index a4cb7ea..ddb6458 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating +3.2.11-incubating-SNAPSHOT accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/b7a0d609/dao/mongodb.rya/pom.xml -- diff --git a/
[incubator-rya] Git Push Summary
Repository: incubator-rya Updated Tags: refs/tags/rya-incubating-3.2.10-rc2 [created] 4949a4b42
incubator-rya git commit: [maven-release-plugin] prepare release rya-incubating-3.2.10-rc2
Repository: incubator-rya Updated Branches: refs/heads/3.2.10-RC [created] 9f0d63e60 [maven-release-plugin] prepare release rya-incubating-3.2.10-rc2 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/9f0d63e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/9f0d63e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/9f0d63e6 Branch: refs/heads/3.2.10-RC Commit: 9f0d63e6089df172eb3f41957d2956ec0035953a Parents: ef5e2bc Author: Aaron Mihalik <aaron.miha...@gmail.com> Authored: Sun Oct 16 22:24:01 2016 -0400 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 16 22:24:01 2016 -0400 -- common/pom.xml | 2 +- common/rya.api/pom.xml | 2 +- common/rya.provenance/pom.xml| 2 +- dao/accumulo.rya/pom.xml | 2 +- dao/mongodb.rya/pom.xml | 2 +- dao/pom.xml | 2 +- extras/indexing/pom.xml | 11 --- extras/indexingExample/pom.xml | 2 +- extras/pom.xml | 2 +- extras/rya.benchmark/pom.xml | 6 ++ extras/rya.console/pom.xml | 5 ++--- extras/rya.indexing.pcj/pom.xml | 7 ++- extras/rya.manual/pom.xml| 2 +- extras/rya.merger/pom.xml| 4 ++-- extras/rya.pcj.fluo/pcj.fluo.api/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.client/pom.xml | 7 ++- extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml| 6 ++ extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml | 5 ++--- extras/rya.pcj.fluo/pom.xml | 7 ++- extras/rya.prospector/pom.xml| 2 +- extras/rya.reasoning/pom.xml | 2 +- extras/vagrantExample/pom.xml| 2 +- mapreduce/pom.xml| 2 +- osgi/alx.rya.console/pom.xml | 2 +- osgi/alx.rya/pom.xml | 2 +- osgi/camel.rya/pom.xml | 2 +- osgi/pom.xml | 2 +- pig/accumulo.pig/pom.xml | 2 +- pig/pom.xml | 2 +- pom.xml | 4 ++-- sail/pom.xml | 2 +- web/pom.xml | 2 +- web/web.rya/pom.xml | 2 +- 34 files changed, 48 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9f0d63e6/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index 0908a25..94ceab7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya-project -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.common http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9f0d63e6/common/rya.api/pom.xml -- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index a6f434d..c7efc89 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.api http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9f0d63e6/common/rya.provenance/pom.xml -- diff --git a/common/rya.provenance/pom.xml b/common/rya.provenance/pom.xml index c233ed8..b784703 100644 --- a/common/rya.provenance/pom.xml +++ b/common/rya.provenance/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.rya rya.common -3.2.10-incubating-SNAPSHOT +3.2.10-incubating rya.provenance http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9f0d63e6/dao/accumulo.rya/pom.xml -- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index 0b6e85c..a4cb7ea 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.rya rya.dao -3.2.10-incubating-SNAPSHOT +3.2.10-incubating accumulo.rya http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9f0d63e6/dao/mongodb
incubator-rya git commit: RYA-182-Fixed SCM tag for Rya parent pom
Repository: incubator-rya Updated Branches: refs/heads/master 7ba4152cc -> 67dddf89b RYA-182-Fixed SCM tag for Rya parent pom Closes #108 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/67dddf89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/67dddf89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/67dddf89 Branch: refs/heads/master Commit: 67dddf89bef42a46fe87c3344cb690b8ae9ea37e Parents: 7ba4152 Author: Caleb Meier <caleb.me...@parsons.com> Authored: Thu Oct 13 15:30:22 2016 -0700 Committer: Aaron Mihalik <aaron.miha...@gmail.com> Committed: Sun Oct 16 17:10:57 2016 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/67dddf89/pom.xml -- diff --git a/pom.xml b/pom.xml index 4f14ddf..b170574 100644 --- a/pom.xml +++ b/pom.xml @@ -827,7 +827,7 @@ under the License. scm:git:git://git.apache.org/incubator-rya.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rya.git -v3.2.10-SNAPSHOT +HEAD https://git-wip-us.apache.org/repos/asf?p=incubator-rya.git
incubator-rya git commit: BUILD FIX Fixing SLF4J version
Repository: incubator-rya Updated Branches: refs/heads/master eb5170be1 -> 98f65f992 BUILD FIX Fixing SLF4J version Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/98f65f99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/98f65f99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/98f65f99 Branch: refs/heads/master Commit: 98f65f992de01f304bd455a6f4e39efa8c286eed Parents: eb5170b Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Sun Oct 16 16:07:10 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Sun Oct 16 16:07:10 2016 -0400 -- extras/rya.merger/pom.xml | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/98f65f99/extras/rya.merger/pom.xml -- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index c9b42e9..85658b8 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -102,13 +102,11 @@ under the License. org.slf4j slf4j-api -1.4.3 org.slf4j slf4j-log4j12 -1.4.3
incubator-rya git commit: RYA-179 Minor License change
Repository: incubator-rya Updated Branches: refs/heads/master bf01d4698 -> eb5170be1 RYA-179 Minor License change Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/eb5170be Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/eb5170be Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/eb5170be Branch: refs/heads/master Commit: eb5170be10cfede27aaebd31bccd1c5960c69ebc Parents: bf01d46 Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Sun Oct 16 15:43:35 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Sun Oct 16 15:43:35 2016 -0400 -- .../DocumentIndexIntersectingIterator.java | 34 +++- 1 file changed, 18 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/eb5170be/extras/indexing/src/main/java/org/apache/rya/accumulo/documentIndex/DocumentIndexIntersectingIterator.java -- diff --git a/extras/indexing/src/main/java/org/apache/rya/accumulo/documentIndex/DocumentIndexIntersectingIterator.java b/extras/indexing/src/main/java/org/apache/rya/accumulo/documentIndex/DocumentIndexIntersectingIterator.java index dc97974..6e5b72f 100644 --- a/extras/indexing/src/main/java/org/apache/rya/accumulo/documentIndex/DocumentIndexIntersectingIterator.java +++ b/extras/indexing/src/main/java/org/apache/rya/accumulo/documentIndex/DocumentIndexIntersectingIterator.java @@ -1,22 +1,24 @@ -package org.apache.rya.accumulo.documentIndex; - /* - * 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. + * 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. */ +package org.apache.rya.accumulo.documentIndex; + import java.io.IOException; import java.util.Collection; import java.util.Collections;
incubator-rya git commit: RYA-179 Fixed Year on Notice
Repository: incubator-rya Updated Branches: refs/heads/master a3557bf29 -> bf01d4698 RYA-179 Fixed Year on Notice Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/bf01d469 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/bf01d469 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/bf01d469 Branch: refs/heads/master Commit: bf01d4698b367e72257229b6b20d9edb3ee432c5 Parents: a3557bf Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Sun Oct 16 15:35:59 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Sun Oct 16 15:35:59 2016 -0400 -- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/bf01d469/NOTICE -- diff --git a/NOTICE b/NOTICE index 7148307..00e6b70 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Rya -Copyright 2015 The Apache Software Foundation +Copyright 2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
incubator-rya git commit: RYA-189 Enforce running Mongo on a 64bit JVM
Repository: incubator-rya Updated Branches: refs/heads/master 1d33b4359 -> a3557bf29 RYA-189 Enforce running Mongo on a 64bit JVM closes #112 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a3557bf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a3557bf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a3557bf2 Branch: refs/heads/master Commit: a3557bf2915192c2ce7b5d050b6f5a5f73360b55 Parents: 1d33b43 Author: David W. Lotts <david.lo...@parsons.com> Authored: Wed Oct 12 17:27:00 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Sat Oct 15 16:09:58 2016 -0400 -- dao/mongodb.rya/pom.xml | 15 +++ 1 file changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a3557bf2/dao/mongodb.rya/pom.xml -- diff --git a/dao/mongodb.rya/pom.xml b/dao/mongodb.rya/pom.xml index d57fffe..40554c0 100644 --- a/dao/mongodb.rya/pom.xml +++ b/dao/mongodb.rya/pom.xml @@ -44,6 +44,21 @@ under the License. + +org.apache.maven.plugins +maven-enforcer-plugin + + + +Testing MongoDB with Flapdoodle fails for arch=x86, which is 32bit JVM, fix by using a 64bit JDK +Tests will fail with the following error when using 32bit JVM on either Linux or Windows: +java.io.IOException: Could not start process: EOF + !x86 + + +true + +
[65/69] [abbrv] incubator-rya git commit: RYA-179 fixed license
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/1d33b435/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java -- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java index e8e9eb2..c4cbdb9 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java @@ -1,24 +1,22 @@ -package org.apache.rya.accumulo.mr.merge.demo; - /* - * #%L - * org.apache.rya.accumulo.mr.merge - * %% - * Copyright (C) 2014 Rya - * %% - * 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 + * 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. - * #L% + * 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. */ +package org.apache.rya.accumulo.mr.merge.demo; import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; @@ -91,13 +89,13 @@ public class MergeToolDemo { private AccumuloDualInstanceDriver accumuloDualInstanceDriver; -public static void main(String args[]) { +public static void main(final String args[]) { DemoUtilities.setupLogging(LOGGING_DETAIL); log.info("Setting up Merge Tool Demo"); Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { @Override -public void uncaughtException(Thread thread, Throwable throwable) { +public void uncaughtException(final Thread thread, final Throwable throwable) { log.fatal("Uncaught exception in " + thread.getName(), throwable); } }); @@ -109,7 +107,7 @@ public class MergeToolDemo { log.info("Shutting down..."); try { mergeToolDemo.tearDown(); -} catch (Exception e) { +} catch (final Exception e) { log.error("Error while shutting down", e); } finally { log.info("Done shutting down"); @@ -120,12 +118,12 @@ public class MergeToolDemo { try { mergeToolDemo.setUp(); mergeToolDemo.testMergeTool(); -} catch (Exception e) { +} catch (final Exception e) { log.error("Error while testing merge tool", e); } finally { try { mergeToolDemo.tearDown(); -} catch (Exception e) { +} catch (final Exception e) { log.error("Error shutting down merge tool.", e); } } @@ -154,7 +152,7 @@ public class MergeToolDemo { accumuloDualInstanceDriver.tearDown(); } -private void mergeToolRun(Date startDate) { +private void mergeToolRun(final Date startDate) { MergeTool.setupAndRun(new String[] { makeArgument(MRUtils.AC_MOCK_PROP, Boolean.toString(IS_MOCK)), makeArgument(MRUtils.AC_INSTANCE_PROP, PARENT_INSTANCE), @@ -184,7 +182,7 @@ public class MergeToolDemo { public void testMergeTool() throws Exception { log.info(""); -StringBuilder sb = new StringBuilder(); +final StringBuilder sb = new StringBuilder(); sb.append("Cases to check\n"); sb.append("\n"); sb.append("| **case** | **Parent** | **Child** | **assume that** | **merge modification** | **in parent after** |\n"); @@ -211,51 +209,51 @@ public class MergeToolDemo { // This statement was in both
[68/69] [abbrv] incubator-rya git commit: RYA-179 fixed license
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/1d33b435/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java -- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java index 26a00bd..f5a9dae 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java @@ -1,24 +1,22 @@ -package org.apache.rya.accumulo.mr.merge.mappers; - /* - * #%L - * org.apache.rya.accumulo.mr.merge - * %% - * Copyright (C) 2014 Rya - * %% - * 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 + * 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. - * #L% + * 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. */ +package org.apache.rya.accumulo.mr.merge.mappers; import java.io.IOException; import java.util.Collection; @@ -160,7 +158,7 @@ public class MergeToolMapper extends Mapper{ * @throws IOException */ @Override -public void run(Context context) throws IOException, InterruptedException { +public void run(final Context context) throws IOException, InterruptedException { setup(context); this.context = context; @@ -182,23 +180,23 @@ public class MergeToolMapper extends Mapper { parentRyaStatement = nextParentRyaStatement(); break; case ADVANCE_CHILD_AND_ADD: -RyaStatement tempChildRyaStatement = childRyaStatement; +final RyaStatement tempChildRyaStatement = childRyaStatement; childRyaStatement = nextChildRyaStatement(); addKey(tempChildRyaStatement, context); break; case ADVANCE_PARENT_AND_DELETE: -RyaStatement tempParentRyaStatement = parentRyaStatement; +final RyaStatement tempParentRyaStatement = parentRyaStatement; parentRyaStatement = nextParentRyaStatement(); deleteKey(tempParentRyaStatement, context); break; case ADVANCE_BOTH: -ColumnVisibility cv1 = new ColumnVisibility(parentRyaStatement.getColumnVisibility()); -ColumnVisibility cv2 = new ColumnVisibility(childRyaStatement.getColumnVisibility()); +final ColumnVisibility cv1 = new ColumnVisibility(parentRyaStatement.getColumnVisibility()); +final ColumnVisibility cv2 = new ColumnVisibility(childRyaStatement.getColumnVisibility()); // Update new column visibility now if necessary if (!cv1.equals(cv2) && !cv2.equals(AccumuloRdfConstants.EMPTY_CV)) { -ColumnVisibility newCv = combineColumnVisibilities(cv1, cv2); -RyaStatement newCvRyaStatement = updateRyaStatementColumnVisibility(parentRyaStatement, newCv); +final ColumnVisibility newCv = combineColumnVisibilities(cv1, cv2); +final RyaStatement newCvRyaStatement = updateRyaStatementColumnVisibility(parentRyaStatement, newCv); deleteKey(parentRyaStatement, context); addKey(newCvRyaStatement, context); @@ -230,50 +228,50 @@ public class
[66/69] [abbrv] incubator-rya git commit: RYA-179 fixed license
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/1d33b435/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java -- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java index b8ac63b..db760e5 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java @@ -1,24 +1,22 @@ -package org.apache.rya.accumulo.mr.merge.util; - /* - * #%L - * org.apache.rya.accumulo.mr.merge - * %% - * Copyright (C) 2014 Rya - * %% - * 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 + * 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. - * #L% + * 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. */ +package org.apache.rya.accumulo.mr.merge.util; import java.io.IOException; import java.net.HttpURLConnection; @@ -74,23 +72,23 @@ public final class TimeUtils { * @return the NTP server {@link Date} or {@code null}. * @throws IOException */ -public static Date getNtpServerDate(String timeServerHost) throws IOException { +public static Date getNtpServerDate(final String timeServerHost) throws IOException { try { TimeInfo timeInfo = null; -NTPUDPClient timeClient = new NTPUDPClient(); +final NTPUDPClient timeClient = new NTPUDPClient(); timeClient.setDefaultTimeout(NTP_SERVER_TIMEOUT_MS); -InetAddress inetAddress = InetAddress.getByName(timeServerHost); +final InetAddress inetAddress = InetAddress.getByName(timeServerHost); if (inetAddress != null) { timeInfo = timeClient.getTime(inetAddress); if (timeInfo != null) { // TODO: which time to use? -long serverTime = timeInfo.getMessage().getTransmitTimeStamp().getTime(); +final long serverTime = timeInfo.getMessage().getTransmitTimeStamp().getTime(); //long serverTime = timeInfo.getReturnTime(); -Date ntpDate = new Date(serverTime); +final Date ntpDate = new Date(serverTime); return ntpDate; } } -} catch (IOException e) { +} catch (final IOException e) { throw new IOException("Unable to get NTP server time.", e); } return null; @@ -104,11 +102,11 @@ public final class TimeUtils { * @throws IOException * @throws ParseException */ -public static Date getRemoteMachineDate(String urlString) throws IOException, ParseException { +public static Date getRemoteMachineDate(final String urlString) throws IOException, ParseException { Date remoteDate = null; HttpURLConnection conn = null; try { -URL url = new URL(urlString); +final URL url = new URL(urlString); // Set up the initial connection conn = (HttpURLConnection)url.openConnection(); @@ -119,12 +117,12 @@ public final class TimeUtils { conn.connect(); -Mapheader = conn.getHeaderFields(); -for (String key : header.keySet()) { +final Map header = conn.getHeaderFields(); +for (final String key : header.keySet()) { if (key != null && HttpHeaders.DATE.equals(key)) { -List data = header.get(key); -String dateString = data.get(0); -
[69/69] [abbrv] incubator-rya git commit: RYA-179 fixed license
RYA-179 fixed license Updated the licenses in the rya.merger project to use the correct Apache header. Also, moved the license to above the package declaration. closes #114 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/1d33b435 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/1d33b435 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/1d33b435 Branch: refs/heads/master Commit: 1d33b4359dac3bc479f98919493138aaf8031129 Parents: 093e7c2 Author: isper3at <smith...@gmail.com> Authored: Thu Oct 13 21:20:55 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Sat Oct 15 15:17:07 2016 -0400 -- .../AbstractDualInstanceAccumuloMRTool.java | 34 ++- .../apache/rya/accumulo/mr/merge/CopyTool.java | 57 ++--- .../apache/rya/accumulo/mr/merge/MergeTool.java | 188 +++--- .../accumulo/mr/merge/common/InstanceType.java | 36 ++- .../mr/merge/gui/DateTimePickerDialog.java | 77 +++--- .../merge/mappers/AccumuloCopyToolMapper.java | 40 ++- .../mr/merge/mappers/AccumuloRyaRuleMapper.java | 40 ++- .../mr/merge/mappers/BaseCopyToolMapper.java| 68 +++-- .../mr/merge/mappers/BaseRuleMapper.java| 78 +++--- .../mr/merge/mappers/FileCopyToolMapper.java| 50 ++-- .../mr/merge/mappers/MergeToolMapper.java | 178 +++-- .../mr/merge/mappers/RowRuleMapper.java | 68 +++-- .../mr/merge/reducers/MultipleFileReducer.java | 44 ++-- .../mr/merge/util/AccumuloInstanceDriver.java | 101 .../mr/merge/util/AccumuloQueryRuleset.java | 104 .../mr/merge/util/AccumuloRyaUtils.java | 247 +-- .../rya/accumulo/mr/merge/util/CopyRule.java| 126 +- .../rya/accumulo/mr/merge/util/GroupedRow.java | 66 +++-- .../accumulo/mr/merge/util/QueryRuleset.java| 180 +++--- .../rya/accumulo/mr/merge/util/TimeUtils.java | 110 - .../accumulo/mr/merge/util/ToolConfigUtils.java | 66 +++-- .../rya/accumulo/mr/merge/CopyToolTest.java | 98 .../rya/accumulo/mr/merge/MergeToolTest.java| 138 +-- .../rya/accumulo/mr/merge/RulesetCopyIT.java| 156 ++-- .../accumulo/mr/merge/demo/CopyToolDemo.java| 92 --- .../accumulo/mr/merge/demo/MergeToolDemo.java | 76 +++--- .../mr/merge/demo/util/DemoUtilities.java | 38 ++- .../driver/AccumuloDualInstanceDriver.java | 72 +++--- .../merge/driver/MiniAccumuloClusterDriver.java | 66 +++-- .../rya/accumulo/mr/merge/util/TestUtils.java | 76 +++--- 30 files changed, 1358 insertions(+), 1412 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/1d33b435/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java -- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java index fde6257..8e9c21b 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java @@ -1,24 +1,22 @@ -package org.apache.rya.accumulo.mr.merge; - /* - * #%L - * org.apache.rya.accumulo.mr.merge - * %% - * Copyright (C) 2014 Rya - * %% - * 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 + * 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. - * #L% + * 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 CONDITI
[63/69] [abbrv] incubator-rya git commit: RYA-198 Fixing Source Files
RYA-198 Fixing Source Files Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/17bde6d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/17bde6d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/17bde6d8 Branch: refs/heads/master Commit: 17bde6d85bceb163301f1f8dc6495ef2dbc8d6c4 Parents: 44a2dcf Author: Aaron Mihalik <miha...@alum.mit.edu> Authored: Fri Oct 14 16:08:29 2016 -0400 Committer: Aaron Mihalik <miha...@alum.mit.edu> Committed: Fri Oct 14 16:13:20 2016 -0400 -- .../InvalidValueTypeMarkerRuntimeException.java | 2 +- .../api/RdfCloudTripleStoreConfiguration.java | 8 +- .../rya/api/RdfCloudTripleStoreConstants.java | 10 +- .../rya/api/RdfCloudTripleStoreStatement.java | 2 +- .../rya/api/RdfCloudTripleStoreUtils.java | 8 +- .../apache/rya/api/client/BatchUpdatePCJ.java | 2 +- .../org/apache/rya/api/client/CreatePCJ.java| 2 +- .../org/apache/rya/api/client/DeletePCJ.java| 2 +- .../rya/api/client/GetInstanceDetails.java | 4 +- .../java/org/apache/rya/api/client/Install.java | 2 +- .../client/InstanceDoesNotExistException.java | 2 +- .../apache/rya/api/client/InstanceExists.java | 2 +- .../apache/rya/api/client/ListInstances.java| 2 +- .../api/client/PCJDoesNotExistException.java| 2 +- .../org/apache/rya/api/client/RyaClient.java| 2 +- .../rya/api/client/RyaClientException.java | 2 +- .../rya/api/date/DateTimeTtlValueConverter.java | 2 +- .../api/date/TimestampTtlStrValueConverter.java | 2 +- .../api/date/TimestampTtlValueConverter.java| 2 +- .../apache/rya/api/date/TtlValueConverter.java | 2 +- .../java/org/apache/rya/api/domain/Node.java| 2 +- .../org/apache/rya/api/domain/RangeURI.java | 2 +- .../org/apache/rya/api/domain/RangeValue.java | 2 +- .../org/apache/rya/api/domain/RyaRange.java | 2 +- .../org/apache/rya/api/domain/RyaSchema.java| 10 +- .../org/apache/rya/api/domain/RyaStatement.java | 2 +- .../java/org/apache/rya/api/domain/RyaType.java | 2 +- .../apache/rya/api/domain/RyaTypePrefix.java| 6 +- .../org/apache/rya/api/domain/RyaTypeRange.java | 2 +- .../java/org/apache/rya/api/domain/RyaURI.java | 2 +- .../org/apache/rya/api/domain/RyaURIPrefix.java | 4 +- .../org/apache/rya/api/domain/RyaURIRange.java | 2 +- .../rya/api/instance/ConfigurationFields.java | 2 +- .../org/apache/rya/api/instance/RyaDetails.java | 2 +- .../rya/api/instance/RyaDetailsRepository.java | 2 +- .../api/instance/RyaDetailsToConfiguration.java | 2 +- .../rya/api/instance/RyaDetailsUpdater.java | 8 +- .../rya/api/layout/TableLayoutStrategy.java | 2 +- .../api/layout/TablePrefixLayoutStrategy.java | 4 +- .../apache/rya/api/persist/RdfDAOException.java | 2 +- .../apache/rya/api/persist/RdfEvalStatsDAO.java | 4 +- .../apache/rya/api/persist/RyaConfigured.java | 4 +- .../java/org/apache/rya/api/persist/RyaDAO.java | 10 +- .../apache/rya/api/persist/RyaDAOException.java | 2 +- .../rya/api/persist/RyaNamespaceManager.java| 4 +- .../api/persist/index/RyaSecondaryIndexer.java | 6 +- .../persist/joinselect/SelectivityEvalDAO.java | 6 +- .../rya/api/persist/query/BatchRyaQuery.java| 8 +- .../apache/rya/api/persist/query/RyaQuery.java | 4 +- .../rya/api/persist/query/RyaQueryEngine.java | 10 +- .../rya/api/persist/query/RyaQueryOptions.java | 4 +- .../rya/api/persist/query/join/HashJoin.java| 20 ++-- .../api/persist/query/join/IterativeJoin.java | 16 +-- .../apache/rya/api/persist/query/join/Join.java | 12 +- .../rya/api/persist/query/join/MergeJoin.java | 14 +-- .../rya/api/persist/utils/RyaDAOHelper.java | 18 +-- .../strategy/AbstractTriplePatternStrategy.java | 12 +- .../rya/api/query/strategy/ByteRange.java | 2 +- .../query/strategy/TriplePatternStrategy.java | 12 +- .../AbstractHashedTriplePatternStrategy.java| 14 +-- .../HashedPoWholeRowTriplePatternStrategy.java | 26 ++--- .../HashedSpoWholeRowTriplePatternStrategy.java | 28 ++--- .../OspWholeRowTriplePatternStrategy.java | 26 ++--- .../PoWholeRowTriplePatternStrategy.java| 24 ++-- .../SpoWholeRowTriplePatternStrategy.java | 24 ++-- .../resolver/CustomRyaTypeResolverMapping.java | 2 +- .../rya/api/resolver/RdfToRyaConversions.java | 4 +- .../org/apache/rya/api/resolver/RyaContext.java | 30 ++--- .../rya/api/resolver/RyaToRdfConversions.java | 8 +- .../rya/api/resolver/RyaTripleContext.java | 36 +++--- .../rya/api/resolver/RyaTypeResolver.java | 8 +- .../api/resolver/RyaTypeResolverException.java | 2 +- .../api/resolver/RyaTypeResolverMapping.java| 2 +- .../resolver/impl/BooleanRyaTypeResolver.java | 4 +- .../
[31/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/instance/MongoDetailsAdapter.java -- diff --git a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/instance/MongoDetailsAdapter.java b/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/instance/MongoDetailsAdapter.java deleted file mode 100644 index 282ecbb..000 --- a/dao/mongodb.rya/src/main/java/mvm/rya/mongodb/instance/MongoDetailsAdapter.java +++ /dev/null @@ -1,236 +0,0 @@ -/** - * 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. - */ -package mvm.rya.mongodb.instance; - -import static java.util.Objects.requireNonNull; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map.Entry; - -import javax.annotation.ParametersAreNonnullByDefault; - -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.mongodb.BasicDBList; -import com.mongodb.BasicDBObject; -import com.mongodb.BasicDBObjectBuilder; -import com.mongodb.DBObject; - -import mvm.rya.api.instance.RyaDetails; -import mvm.rya.api.instance.RyaDetails.EntityCentricIndexDetails; -import mvm.rya.api.instance.RyaDetails.FreeTextIndexDetails; -import mvm.rya.api.instance.RyaDetails.GeoIndexDetails; -import mvm.rya.api.instance.RyaDetails.JoinSelectivityDetails; -import mvm.rya.api.instance.RyaDetails.PCJIndexDetails; -import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails; -import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails; -import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy; -import mvm.rya.api.instance.RyaDetails.ProspectorDetails; -import mvm.rya.api.instance.RyaDetails.TemporalIndexDetails; - -/** - * Serializes configuration details for use in Mongo. - * The {@link DBObject} will look like: - * - * {@code - * { - * "instanceName": string, - * "version": string?, - * "entityCentricDetails": boolean, - * "geoDetails": boolean, - * "pcjDetails": { - * "enabled": boolean, - * "fluoName": string, - * "pcjs": [{ - * "id": string, - * "updateStrategy": string, - * "lastUpdate": date - * },...,{} - * ] - * }, - * "temporalDetails": boolean, - * "freeTextDetails": boolean, - * "prospectorDetails": date, - * "joinSelectivityDetails": date - * } - * - */ -@ParametersAreNonnullByDefault -public class MongoDetailsAdapter { -public static final String INSTANCE_KEY = "instanceName"; -public static final String VERSION_KEY = "version"; - -public static final String ENTITY_DETAILS_KEY = "entityCentricDetails"; -public static final String GEO_DETAILS_KEY = "geoDetails"; -public static final String PCJ_DETAILS_KEY = "pcjDetails"; -public static final String PCJ_ENABLED_KEY = "enabled"; -public static final String PCJ_FLUO_KEY = "fluoName"; -public static final String PCJ_PCJS_KEY = "pcjs"; -public static final String PCJ_ID_KEY = "id"; -public static final String PCJ_UPDATE_STRAT_KEY = "updateStrategy"; -public static final String PCJ_LAST_UPDATE_KEY = "lastUpdate"; -public static final String TEMPORAL_DETAILS_KEY = "temporalDetails"; -public static final String FREETEXT_DETAILS_KEY = "freeTextDetails"; - -public static final String PROSPECTOR_DETAILS_KEY = "prospectorDetails"; -public static final String JOIN_SELECTIVITY_DETAILS_KEY = "joinSelectivitiyDetails"; - -/** - * Serializes {@link RyaDetails} to mongo {@link DBObject}. - * @param details - The details to be serialized. - * @return The mongo {@link DBObject}. - */ -public static BasicDBObject toDBObject(final RyaDetails details) { -Preconditions.checkNotNull(details); -final BasicDBObjectBuilder builder = BasicDBObjectBuilder.start() -.add(INSTANCE_KEY, details.getRyaInstanceName()) -.add(VERSION_KEY, details.getRyaVersion()) -.add(ENTITY_DETAILS_KEY, details.getEntityCentricIndexDetails().isEnabled()) -.add(GEO_DETAILS_KEY, details.getGeoIndexDetails().isEnabled()) -.add(PCJ_DETAILS_KEY,
[33/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/accumulo.rya/src/test/java/mvm/rya/accumulo/DefineTripleQueryRangeFactoryTest.java -- diff --git a/dao/accumulo.rya/src/test/java/mvm/rya/accumulo/DefineTripleQueryRangeFactoryTest.java b/dao/accumulo.rya/src/test/java/mvm/rya/accumulo/DefineTripleQueryRangeFactoryTest.java deleted file mode 100644 index 7c3331d..000 --- a/dao/accumulo.rya/src/test/java/mvm/rya/accumulo/DefineTripleQueryRangeFactoryTest.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * 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. - */ - -//package mvm.rya.accumulo; - -// -//import junit.framework.TestCase; -//import mvm.rya.accumulo.AccumuloRdfConfiguration; -//import mvm.rya.accumulo.DefineTripleQueryRangeFactory; -//import mvm.rya.accumulo.AccumuloRdfConfiguration; -//import mvm.rya.accumulo.DefineTripleQueryRangeFactory; -//import mvm.rya.api.domain.RangeValue; -//import org.apache.accumulo.core.data.Range; -//import org.openrdf.model.URI; -//import org.openrdf.model.Value; -//import org.openrdf.model.ValueFactory; -//import org.openrdf.model.impl.ValueFactoryImpl; -// -//import java.util.Map; -// -//import static mvm.rya.api.RdfCloudTripleStoreConstants.*; -// -///** -// */ -//public class DefineTripleQueryRangeFactoryTest extends TestCase { -// -//public static final String DELIM_BYTES_STR = new String(DELIM_BYTES); -//public static final String URI_MARKER_STR = "\u0007"; -//public static final String RANGE_ENDKEY_SUFFIX = "\u"; -//DefineTripleQueryRangeFactory factory = new DefineTripleQueryRangeFactory(); -//ValueFactory vf = ValueFactoryImpl.getInstance(); -//static String litdupsNS = "urn:test:litdups#"; -// -//private AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); -// -//public void testSPOCases() throws Exception { -//URI cpu = vf.createURI(litdupsNS, "cpu"); -//URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); -//URI obj = vf.createURI(litdupsNS, "uri1"); -// -////spo -//Map.Entryentry = -//factory.defineRange(cpu, loadPerc, obj, conf); -//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); -//String expected_start = URI_MARKER_STR + cpu.stringValue() + DELIM_BYTES_STR + -//URI_MARKER_STR + loadPerc.stringValue() + DELIM_BYTES_STR + -//URI_MARKER_STR + obj.stringValue(); -//assertEquals(expected_start, -//entry.getValue().getStartKey().getRow().toString()); -//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, -//entry.getValue().getEndKey().getRow().toString()); -// -// -////sp -//entry = factory.defineRange(cpu, loadPerc, null, conf); -//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); -//expected_start = URI_MARKER_STR + cpu.stringValue() + DELIM_BYTES_STR + -//URI_MARKER_STR + loadPerc.stringValue(); -//assertEquals(expected_start, -//entry.getValue().getStartKey().getRow().toString()); -//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, -//entry.getValue().getEndKey().getRow().toString()); -// -////s -//entry = factory.defineRange(cpu, null, null, conf); -//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); -//expected_start = URI_MARKER_STR + cpu.stringValue(); -//assertEquals(expected_start, -//entry.getValue().getStartKey().getRow().toString()); -//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, -//entry.getValue().getEndKey().getRow().toString()); -// -////all -//entry = factory.defineRange(null, null, null, conf); -//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); -//assertEquals("", -//entry.getValue().getStartKey().getRow().toString()); -//assertEquals(new String(new byte[]{Byte.MAX_VALUE}) + DELIM_STOP + RANGE_ENDKEY_SUFFIX, -//entry.getValue().getEndKey().getRow().toString()); -//} -// -//public void
[50/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java deleted file mode 100644 index 86e22a2..000 --- a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java +++ /dev/null @@ -1,520 +0,0 @@ -package mvm.rya.api; - -/* - * 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 java.util.List; - -import mvm.rya.api.layout.TableLayoutStrategy; -import mvm.rya.api.layout.TablePrefixLayoutStrategy; -import mvm.rya.api.persist.RdfEvalStatsDAO; - -import org.apache.hadoop.conf.Configuration; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; - -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; - -/** - * Rdf triple store specific configuration - */ -public abstract class RdfCloudTripleStoreConfiguration extends Configuration { - -//public static final String CONF_ISQUERYTIMEBASED = "query.timebased"; -public static final String CONF_TTL = "query.ttl"; -public static final String CONF_STARTTIME = "query.startTime"; -//public static final String CONF_TIMEINDEXURIS = "query.timeindexuris"; -public static final String CONF_NUM_THREADS = "query.numthreads"; -public static final String CONF_PERFORMANT = "query.performant"; -public static final String CONF_INFER = "query.infer"; -public static final String CONF_USE_STATS = "query.usestats"; -public static final String CONF_USE_COMPOSITE = "query.usecompositecard"; -public static final String CONF_USE_SELECTIVITY = "query.useselectivity"; -public static final String CONF_TBL_PREFIX = "query.tblprefix"; -public static final String CONF_BATCH_SIZE = "query.batchsize"; -public static final String CONF_OFFSET = "query.offset"; -public static final String CONF_LIMIT = "query.limit"; -public static final String CONF_QUERYPLAN_FLAG = "query.printqueryplan"; -public static final String CONF_QUERY_AUTH = "query.auth"; - public static final String CONF_RESULT_FORMAT = "query.resultformat"; -public static final String CONF_CV = "conf.cv"; -public static final String CONF_TBL_SPO = "tbl.spo"; -public static final String CONF_TBL_PO = "tbl.po"; -public static final String CONF_TBL_OSP = "tbl.osp"; -public static final String CONF_TBL_NS = "tbl.ns"; -public static final String CONF_TBL_EVAL = "tbl.eval"; -public static final String CONF_PREFIX_ROW_WITH_HASH = "tbl.hashprefix"; -public static final String CONF_OPTIMIZERS = "query.optimizers"; -public static final String CONF_PCJ_OPTIMIZER = "pcj.query.optimizer"; -public static final String CONF_PCJ_TABLES = "pcj.index.tables"; - - -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_DISP_QUERYPLAN = CONF_QUERYPLAN_FLAG; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_AUTH = CONF_QUERY_AUTH; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_CV = CONF_CV; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_TTL = CONF_TTL; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_STARTTIME = CONF_STARTTIME; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_PERFORMANT = CONF_PERFORMANT; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_INFER = CONF_INFER; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_USESTATS = CONF_USE_STATS; -/** - * @deprecated use CONF_* - */ -@Deprecated - public static final String BINDING_OFFSET = CONF_OFFSET; -
[49/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java b/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java deleted file mode 100644 index f5ca08c..000 --- a/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java +++ /dev/null @@ -1,38 +0,0 @@ -package mvm.rya.api.domain; - -/* - * 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 org.openrdf.model.impl.URIImpl; - -/** - * A Node is an expected node in the global graph. This typing of the URI allows us to dictate the difference between a - * URI that is just an Attribute on the subject vs. a URI that is another subject Node in the global graph. It does not - * guarantee that the subject exists, just that there is an Edge to it. - */ -public class Node extends URIImpl { -public Node() { -} - -public Node(String uriString) { -super(uriString); -} -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java deleted file mode 100644 index 67d5742..000 --- a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java +++ /dev/null @@ -1,52 +0,0 @@ -package mvm.rya.api.domain; - -/* - * 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 org.openrdf.model.URI; -import org.openrdf.model.Value; - -/** - * Created by IntelliJ IDEA. - * Date: 4/11/12 - * Time: 1:03 PM - * To change this template use File | Settings | File Templates. - */ -public class RangeURI extends RangeValue implements URI { - -public RangeURI(URI start, URI end) { -super(start, end); -} - -public RangeURI(RangeValue rangeValue) { -super((URI) rangeValue.getStart(), (URI) rangeValue.getEnd()); -} - -@Override -public String getNamespace() { -throw new UnsupportedOperationException("Ranges do not have a namespace"); -} - -@Override -public String getLocalName() { -throw new UnsupportedOperationException("Ranges do not have a localname"); -} -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java -- diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java deleted file mode 100644 index c27edfd..000 --- a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java +++ /dev/null @@ -1,72 +0,0 @@ -package mvm.rya.api.domain; - -/* - * 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
[34/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java -- diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java new file mode 100644 index 000..ba3ffd2 --- /dev/null +++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java @@ -0,0 +1,410 @@ +package mvm.rya.accumulo.query; + +/* + * 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 mvm.rya.api.RdfCloudTripleStoreUtils.layoutToTable; +import info.aduna.iteration.CloseableIteration; + +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; + +import mvm.rya.accumulo.AccumuloRdfConfiguration; +import mvm.rya.api.RdfCloudTripleStoreConfiguration; +import mvm.rya.api.RdfCloudTripleStoreConstants; +import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import mvm.rya.api.RdfCloudTripleStoreUtils; +import mvm.rya.api.domain.RyaRange; +import mvm.rya.api.domain.RyaStatement; +import mvm.rya.api.domain.RyaType; +import mvm.rya.api.domain.RyaURI; +import mvm.rya.api.layout.TableLayoutStrategy; +import mvm.rya.api.persist.RyaDAOException; +import mvm.rya.api.persist.query.BatchRyaQuery; +import mvm.rya.api.persist.query.RyaQuery; +import mvm.rya.api.persist.query.RyaQueryEngine; +import mvm.rya.api.query.strategy.ByteRange; +import mvm.rya.api.query.strategy.TriplePatternStrategy; +import mvm.rya.api.resolver.RyaContext; +import mvm.rya.api.resolver.RyaTripleContext; +import mvm.rya.api.resolver.triple.TripleRowRegex; +import mvm.rya.api.utils.CloseableIterableIteration; + +import org.apache.accumulo.core.client.BatchScanner; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.ScannerBase; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.iterators.user.RegExFilter; +import org.apache.accumulo.core.iterators.user.TimestampFilter; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.hadoop.io.Text; +import org.calrissian.mango.collect.CloseableIterable; +import org.calrissian.mango.collect.CloseableIterables; +import org.calrissian.mango.collect.FluentCloseableIterable; +import org.openrdf.query.BindingSet; + +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.Iterators; + +/** + * Date: 7/17/12 + * Time: 9:28 AM + */ +public class AccumuloRyaQueryEngine implements RyaQueryEngine { + +private AccumuloRdfConfiguration configuration; +private Connector connector; +private RyaTripleContext ryaContext; +private final MapkeyValueToRyaStatementFunctionMap = new HashMap (); + +public AccumuloRyaQueryEngine(Connector connector) { +this(connector, new AccumuloRdfConfiguration()); +} + +public AccumuloRyaQueryEngine(Connector connector, AccumuloRdfConfiguration conf) { +this.connector = connector; +this.configuration = conf; +ryaContext = RyaTripleContext.getInstance(conf); +keyValueToRyaStatementFunctionMap.put(TABLE_LAYOUT.SPO, new KeyValueToRyaStatementFunction(TABLE_LAYOUT.SPO, ryaContext)); +keyValueToRyaStatementFunctionMap.put(TABLE_LAYOUT.PO, new KeyValueToRyaStatementFunction(TABLE_LAYOUT.PO, ryaContext)); +keyValueToRyaStatementFunctionMap.put(TABLE_LAYOUT.OSP, new KeyValueToRyaStatementFunction(TABLE_LAYOUT.OSP, ryaContext)); +} + +@Override +public CloseableIteration query(RyaStatement stmt,
[37/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/TriplestoreProvenanceCollectorTest.java -- diff --git a/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/TriplestoreProvenanceCollectorTest.java b/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/TriplestoreProvenanceCollectorTest.java deleted file mode 100644 index c431468..000 --- a/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/TriplestoreProvenanceCollectorTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package mvm.rya.rdftriplestore.provenance; - -/* - * 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 org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.sail.Sail; -import org.openrdf.sail.memory.MemoryStore; - -public class TriplestoreProvenanceCollectorTest { - - @Test - public void testCollect() throws ProvenanceCollectionException, RepositoryException, MalformedQueryException, QueryEvaluationException { - Sail ms = new MemoryStore(); - SailRepository repo = new SailRepository(ms); - repo.initialize(); - TriplestoreProvenanceCollector coll = new TriplestoreProvenanceCollector(repo, "fakeUser", "SPARQL"); - coll.recordQuery("fakeQuery"); - String queryString = "SELECT ?x ?y WHERE { ?x ?p ?y } "; - TupleQuery tupleQuery = repo.getConnection().prepareTupleQuery(QueryLanguage.SPARQL, queryString); - TupleQueryResult result = tupleQuery.evaluate(); - // TODO not asserting on the results. - assertTrue(result.hasNext()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/rdf/BaseProvenanceModelTest.java -- diff --git a/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/rdf/BaseProvenanceModelTest.java b/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/rdf/BaseProvenanceModelTest.java deleted file mode 100644 index 99875e2..000 --- a/common/rya.provenance/src/test/java/mvm/rya/rdftriplestore/provenance/rdf/BaseProvenanceModelTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package mvm.rya.rdftriplestore.provenance.rdf; - -/* - * 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 org.junit.Assert.assertTrue; - -import java.util.List; - -import org.junit.Test; -import org.openrdf.model.Statement; - -public class BaseProvenanceModelTest { - - @Test - public void testCreateTriples() { - BaseProvenanceModel model = new BaseProvenanceModel(); - List statements = model.getStatementsForQuery("SELECT ?query where { ?query rdf:type . }", "fakeuser", "SPARQL"); - assertTrue(!statements.isEmpty()); - } -}
[26/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/extras/indexing/src/main/java/mvm/rya/indexing/IndexPlanValidator/TupleReArranger.java -- diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/IndexPlanValidator/TupleReArranger.java b/extras/indexing/src/main/java/mvm/rya/indexing/IndexPlanValidator/TupleReArranger.java deleted file mode 100644 index 089ef5d..000 --- a/extras/indexing/src/main/java/mvm/rya/indexing/IndexPlanValidator/TupleReArranger.java +++ /dev/null @@ -1,348 +0,0 @@ -package mvm.rya.indexing.IndexPlanValidator; - -/* - * 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 java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; - -import mvm.rya.indexing.external.tupleSet.ExternalTupleSet; -import mvm.rya.rdftriplestore.inference.DoNotExpandSP; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; - -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; - -import com.beust.jcommander.internal.Lists; -import com.google.common.collect.Collections2; -import com.google.common.collect.Maps; - - -//A given TupleExpr can be broken up into "join segments", which are sections of the TupleExpr where nodes can -//be freely exchanged. This class creates a list of permuted TupleExpr from a specified TupleExpr by permuting the nodes -//in each join segment. -public class TupleReArranger { - -private static Map> joinArgs; -private static Map filterArgs; - - -public static Iterator getPlans(Iterator indexPlans) { - -final Iterator iter = indexPlans; - -return new Iterator() { - -private TupleExpr next = null; -private boolean hasNextCalled = false; -private boolean isEmpty = false; -Iterator tuples = null; - -@Override -public boolean hasNext() { - -if (!hasNextCalled && !isEmpty) { -if (tuples != null && tuples.hasNext()) { -next = tuples.next(); -hasNextCalled = true; -return true; -} else { -while (iter.hasNext()) { -tuples = getTupleReOrderings(iter.next()).iterator(); -if (tuples == null) { -throw new IllegalStateException("Plans cannot be null!"); -} -next = tuples.next(); -hasNextCalled = true; -return true; -} -isEmpty = true; -return false; -} -} else if (isEmpty) { -return false; -} else { -return true; -} -} - -@Override -public TupleExpr next() { - -if (hasNextCalled) { -hasNextCalled = false; -return next; -} else if (isEmpty) { -throw new NoSuchElementException(); -} else { -if (this.hasNext()) { -hasNextCalled = false; -return next; -} else { -throw new NoSuchElementException(); -} -} -} - -@Override -public void remove() { -throw new UnsupportedOperationException("Cannot delete from iterator!"); -} -}; -} - - -//Give a TupleExpr, return list of join segment permuted TupleExpr -public static List getTupleReOrderings(TupleExpr te) { - -joinArgs = Maps.newHashMap(); -filterArgs = Maps.newHashMap(); - -NodeCollector
[28/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/extras/indexing/src/main/java/mvm/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java -- diff --git a/extras/indexing/src/main/java/mvm/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java b/extras/indexing/src/main/java/mvm/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java deleted file mode 100644 index 0c7369c..000 --- a/extras/indexing/src/main/java/mvm/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java +++ /dev/null @@ -1,267 +0,0 @@ -package mvm.rya.accumulo.pcj.iterators; - -/* - * 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 info.aduna.iteration.CloseableIteration; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; - -import mvm.rya.indexing.external.tupleSet.ExternalTupleSet; - -import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.data.Key; -import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; -import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; -import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; - -import com.google.common.collect.HashBiMap; - -/** - * This class takes in a {@link Scanner} and a Collection of BindingSets, - * deserializes each {@link Map.Entry} taken from the Scanner into - * a {@link BindingSet}, and performs a cross product on the BindingSet with - * each BindingSet in the provided Collection. The user can also specify a - * {@link Map } of constant constraints that can be used to filter. - * - */ -public class PCJKeyToCrossProductBindingSetIterator implements - CloseableIteration { - - //BindingSets passed to PCJ used to form cross product - private List crossProductBs; - //Scanner over PCJ table - private Scanner scanner; - //Iterator over PCJ scanner - private Iterator > iterator; - //Map of PCJ variables in table to variable in query - private Map pcjVarMap; - //if PCJ contains LeftJoin, this is a set of variables that only appear in - //LeftJoin. Used when performing the cross product. - private Set unAssuredVariables; - private final AccumuloPcjSerializer converter = new AccumuloPcjSerializer(); - private final BindingSet EMPTY_BINDINGSET = new QueryBindingSet(); - private Iterator crossProductIter = Collections.emptyIterator(); - private Map constantConstraints; - private BindingSet next; - private boolean hasNextCalled = false; - private boolean isEmpty = false; - private boolean crossProductBsExist = false; - private boolean constantConstraintsExist = false; - - public PCJKeyToCrossProductBindingSetIterator(Scanner scanner, - List crossProductBs, - Map constantConstraints, Set unAssuredVariables, - Map pcjVarMap) { - this.crossProductBs = crossProductBs; - this.scanner = scanner; - this.iterator = scanner.iterator(); - this.pcjVarMap = HashBiMap.create(pcjVarMap).inverse(); - this.constantConstraints = constantConstraints; - this.crossProductBsExist = crossProductBs.size() > 0; - this.constantConstraintsExist = constantConstraints.size() > 0; - this.unAssuredVariables = unAssuredVariables; - } - - @Override - public boolean hasNext() throws QueryEvaluationException { - if (!hasNextCalled && !isEmpty) { -
[25/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstant.java -- diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstant.java b/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstant.java deleted file mode 100644 index f4e6d95..000 --- a/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstant.java +++ /dev/null @@ -1,83 +0,0 @@ -package mvm.rya.indexing; - -/* - * 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 java.io.Serializable; - -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; - -/** - * Time and date interface for building intervals. - * - *Implementations: - * Implementation should have a factory method for TemporalInterval since TemporalIntervals reference only this - * interface for begin & end, so it injects an implementation. - * public static TemporalInterval parseInterval(String dateTimeInterval) - * - * The following are notes and may not have been implemented. - * - * = rfc3339 - *https://www.ietf.org/rfc/rfc3339.txt - * a subset of ISO-8601 - * -MM-DDThh:mm:ss.fffZ - * Limits: - *All dates and times are assumed to be in the "current era", - somewhere between AD and AD. - * resolution: to the second, or millisecond if the optional fraction is used. - * - * = epoch - * 32bit or 64bit integer specifying the number of seconds since a standard date-time (1970) - * 32bit is good until 2038. - * 64bit is good until after the heat death of our universe - * - */ -public interface TemporalInstant extends Comparable, Serializable { -@Override - public boolean equals(Object obj) ; - - @Override - public int compareTo(TemporalInstant o) ; - - @Override - public int hashCode() ; - /** -* Get the date as a byte array. -*/ - public byte[] getAsKeyBytes(); - /** -* Get the date as a String. -*/ - public String getAsKeyString(); - /** -* Get the date as a human readable for reporting with timeZone. -*/ - public String getAsReadable(DateTimeZone tz); -/** - * Get the date as a human readable for reporting, timeZone is implementation specific. - */ -public String getAsReadable(); - /** -* Get the date as a Joda/Java v8 DateTime. -*/ - public DateTime getAsDateTime(); - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstantRfc3339.java -- diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstantRfc3339.java b/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstantRfc3339.java deleted file mode 100644 index f47bb92..000 --- a/extras/indexing/src/main/java/mvm/rya/indexing/TemporalInstantRfc3339.java +++ /dev/null @@ -1,219 +0,0 @@ -/** - * - */ -package mvm.rya.indexing; - -/* - * 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 java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.codec.binary.StringUtils; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.joda.time.format.DateTimeFormatter; -import
[67/69] [abbrv] incubator-rya git commit: RYA-179 fixed license
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/1d33b435/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java -- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java index 8bf36ed..e702e64 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java @@ -1,24 +1,22 @@ -package org.apache.rya.accumulo.mr.merge.util; - /* - * #%L - * org.apache.rya.accumulo.mr.merge - * %% - * Copyright (C) 2014 Rya - * %% - * 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 + * 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. - * #L% + * 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. */ +package org.apache.rya.accumulo.mr.merge.util; import java.io.IOException; import java.text.ParseException; @@ -45,6 +43,7 @@ import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.iterators.Filter; import org.apache.accumulo.core.iterators.user.RegExFilter; import org.apache.accumulo.core.security.Authorizations; import org.apache.commons.lang.StringUtils; @@ -112,7 +111,7 @@ public final class AccumuloRyaUtils { * @param localName the URI's local name. * @return the {@link RyraURI}. */ -public static RyaURI createRyaUri(String localName) { +public static RyaURI createRyaUri(final String localName) { return createRyaUri(NAMESPACE, localName); } @@ -122,7 +121,7 @@ public final class AccumuloRyaUtils { * @param localName the URI's local name. * @return the {@link RyraURI}. */ -public static RyaURI createRyaUri(String namespace, String localName) { +public static RyaURI createRyaUri(final String namespace, final String localName) { return RdfToRyaConversions.convertURI(VALUE_FACTORY.createURI(namespace, localName)); } @@ -131,9 +130,9 @@ public final class AccumuloRyaUtils { * @param date the copy tool run time {@link Date}. * @return the {@link RyaStatement} for the copy tool run time. */ -public static RyaStatement createCopyToolRunTimeRyaStatement(Date date) { -Literal literal = VALUE_FACTORY.createLiteral(date != null ? date : DEFAULT_DATE); -RyaType timeObject = new RyaType(literal.getDatatype(), literal.stringValue()); +public static RyaStatement createCopyToolRunTimeRyaStatement(final Date date) { +final Literal literal = VALUE_FACTORY.createLiteral(date != null ? date : DEFAULT_DATE); +final RyaType timeObject = new RyaType(literal.getDatatype(), literal.stringValue()); return new RyaStatement(RTS_SUBJECT_RYA, RTS_COPY_TOOL_RUN_TIME_PREDICATE_RYA, timeObject); } @@ -142,9 +141,9 @@ public final class AccumuloRyaUtils { * @param date the copy tool split time {@link Date}. * @return the {@link RyaStatement} for the copy tool split time. */ -public static RyaStatement createCopyToolSplitTimeRyaStatement(Date date) { -Literal literal = VALUE_FACTORY.createLiteral(date != null ? date : DEFAULT_DATE); -RyaType timeObject = new RyaType(literal.getDatatype(), literal.stringValue()); +public static RyaStatement createCopyToolSplitTimeRyaStatement(final Date date) { +final Literal literal = VALUE_FACTORY.createLiteral(date !=
[54/69] [abbrv] incubator-rya git commit: RYA-198 Fixing Source Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java -- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java index 90461d1..63929bb 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/AccumuloHDFSFileInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java -- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java index 409c978..e985563 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/MRUtils.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,7 +31,7 @@ import org.openrdf.model.ValueFactory; import org.openrdf.model.impl.ValueFactoryImpl; import org.openrdf.rio.RDFFormat; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; /** * Contains constants and static methods for interacting with a http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java -- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java index 208045e..27e38f2 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RdfFileInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -46,9 +46,9 @@ import org.openrdf.rio.RDFParseException; import org.openrdf.rio.RDFParser; import org.openrdf.rio.Rio; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTripleContext; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTripleContext; /** * {@link FileInputFormat} that can read multiple RDF files and convert into http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java -- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java index b6545b6..baa7033 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaInputFormat.java @@ -1,4 +1,4 @@ -package mvm.rya.accumulo.mr; +package org.apache.rya.accumulo.mr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,12 +33,12 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Subclass of {@link AbstractInputFormat} for reading http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java -- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java
[07/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/extras/indexing/src/main/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPruner.java -- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPruner.java b/extras/indexing/src/main/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPruner.java new file mode 100644 index 000..577663b --- /dev/null +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPruner.java @@ -0,0 +1,174 @@ +package mvm.rya.indexing.IndexPlanValidator; + +/* + * 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 java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import mvm.rya.indexing.external.tupleSet.ExternalTupleSet; + +import org.openrdf.query.algebra.Filter; +import org.openrdf.query.algebra.StatementPattern; +import org.openrdf.query.algebra.TupleExpr; +import org.openrdf.query.algebra.ValueConstant; +import org.openrdf.query.algebra.Var; +import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + + + + +public class VarConstantIndexListPruner implements IndexListPruner { + +private MapqueryConstantMap; +private int querySpCount; +private int queryFilterCount; + +public VarConstantIndexListPruner(TupleExpr te) { + +ConstantCollector cc = new ConstantCollector(); +te.visit(cc); +this.queryConstantMap = cc.getConstantMap(); +querySpCount = cc.getSpCount(); +queryFilterCount = cc.getFilterCount(); +} + +@Override + public List getRelevantIndices(List indexList) { + +List relIndexSet = new ArrayList<>(); + +for (ExternalTupleSet e : indexList) { + +if (isRelevant(e.getTupleExpr())) { +relIndexSet.add(e); +} + +} + +return relIndexSet; +} + +private boolean isRelevant(TupleExpr index) { + +ConstantCollector cc = new ConstantCollector(); +index.visit(cc); + +Map indexConstantMap = cc.getConstantMap(); +int indexSpCount = cc.getSpCount(); +int indexFilterCount = cc.getFilterCount(); +Set indexConstants = indexConstantMap.keySet(); + +if (indexSpCount > querySpCount || indexFilterCount > queryFilterCount +|| !Sets.intersection(indexConstants, queryConstantMap.keySet()).equals(indexConstants)) { +return false; +} + +for (String s : indexConstants) { +if (indexConstantMap.get(s) > queryConstantMap.get(s)) { +return false; +} +} + +return true; +} + + +private static class ConstantCollector extends QueryModelVisitorBase { + +private Map constantMap = Maps.newHashMap(); +private int spCount = 0; +private int filterCount = 0; + + +@Override +public void meet(StatementPattern node) throws RuntimeException { + + spCount++; + super.meet(node); + +} + + +@Override +public void meet(Filter node) throws RuntimeException { + + filterCount++; + super.meet(node); + +} + + + + +@Override +public void meet(Var node) throws RuntimeException { + +if (node.isConstant()) { +String key = node.getValue().toString(); +if(constantMap.containsKey(key)){ +int count = constantMap.get(key); +count += 1; +constantMap.put(key, count); +} else { +constantMap.put(key, 1); +} +} + +} + + +@Override + public void meet(ValueConstant node) throws RuntimeException { + +String key = node.getValue().toString(); + +if(constantMap.containsKey(key)) { +int count = constantMap.get(key); +
[32/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java -- diff --git a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java new file mode 100644 index 000..7c3331d --- /dev/null +++ b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java @@ -0,0 +1,265 @@ +/* + * 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. + */ + +//package mvm.rya.accumulo; + +// +//import junit.framework.TestCase; +//import mvm.rya.accumulo.AccumuloRdfConfiguration; +//import mvm.rya.accumulo.DefineTripleQueryRangeFactory; +//import mvm.rya.accumulo.AccumuloRdfConfiguration; +//import mvm.rya.accumulo.DefineTripleQueryRangeFactory; +//import mvm.rya.api.domain.RangeValue; +//import org.apache.accumulo.core.data.Range; +//import org.openrdf.model.URI; +//import org.openrdf.model.Value; +//import org.openrdf.model.ValueFactory; +//import org.openrdf.model.impl.ValueFactoryImpl; +// +//import java.util.Map; +// +//import static mvm.rya.api.RdfCloudTripleStoreConstants.*; +// +///** +// */ +//public class DefineTripleQueryRangeFactoryTest extends TestCase { +// +//public static final String DELIM_BYTES_STR = new String(DELIM_BYTES); +//public static final String URI_MARKER_STR = "\u0007"; +//public static final String RANGE_ENDKEY_SUFFIX = "\u"; +//DefineTripleQueryRangeFactory factory = new DefineTripleQueryRangeFactory(); +//ValueFactory vf = ValueFactoryImpl.getInstance(); +//static String litdupsNS = "urn:test:litdups#"; +// +//private AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); +// +//public void testSPOCases() throws Exception { +//URI cpu = vf.createURI(litdupsNS, "cpu"); +//URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); +//URI obj = vf.createURI(litdupsNS, "uri1"); +// +////spo +//Map.Entryentry = +//factory.defineRange(cpu, loadPerc, obj, conf); +//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); +//String expected_start = URI_MARKER_STR + cpu.stringValue() + DELIM_BYTES_STR + +//URI_MARKER_STR + loadPerc.stringValue() + DELIM_BYTES_STR + +//URI_MARKER_STR + obj.stringValue(); +//assertEquals(expected_start, +//entry.getValue().getStartKey().getRow().toString()); +//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, +//entry.getValue().getEndKey().getRow().toString()); +// +// +////sp +//entry = factory.defineRange(cpu, loadPerc, null, conf); +//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); +//expected_start = URI_MARKER_STR + cpu.stringValue() + DELIM_BYTES_STR + +//URI_MARKER_STR + loadPerc.stringValue(); +//assertEquals(expected_start, +//entry.getValue().getStartKey().getRow().toString()); +//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, +//entry.getValue().getEndKey().getRow().toString()); +// +////s +//entry = factory.defineRange(cpu, null, null, conf); +//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); +//expected_start = URI_MARKER_STR + cpu.stringValue(); +//assertEquals(expected_start, +//entry.getValue().getStartKey().getRow().toString()); +//assertEquals(expected_start + DELIM_STOP + RANGE_ENDKEY_SUFFIX, +//entry.getValue().getEndKey().getRow().toString()); +// +////all +//entry = factory.defineRange(null, null, null, conf); +//assertEquals(TABLE_LAYOUT.SPO, entry.getKey()); +//assertEquals("", +//entry.getValue().getStartKey().getRow().toString()); +//assertEquals(new String(new byte[]{Byte.MAX_VALUE}) + DELIM_STOP + RANGE_ENDKEY_SUFFIX, +//entry.getValue().getEndKey().getRow().toString()); +//}
[61/69] [abbrv] incubator-rya git commit: RYA-198 Fixing Source Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolverTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolverTest.java index 0126414..9fd086b 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolverTest.java @@ -1,4 +1,4 @@ -package mvm.rya.api.resolver.impl; +package org.apache.rya.api.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package mvm.rya.api.resolver.impl; import junit.framework.TestCase; -import mvm.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaType; import org.openrdf.model.impl.URIImpl; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolverTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolverTest.java index 899bbcf..5f60f5a 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolverTest.java @@ -1,4 +1,4 @@ -package mvm.rya.api.resolver.impl; +package org.apache.rya.api.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,9 +29,9 @@ import java.util.GregorianCalendar; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTypeResolverException; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTypeResolverException; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolverTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolverTest.java index 2c5f43d..5e42369 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolverTest.java @@ -1,4 +1,4 @@ -package mvm.rya.api.resolver.impl; +package org.apache.rya.api.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package mvm.rya.api.resolver.impl; import junit.framework.TestCase; -import mvm.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaType; import org.openrdf.model.vocabulary.XMLSchema; import java.util.Random; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolverTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolverTest.java index 60cded0..199240d 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolverTest.java @@ -1,4 +1,4 @@ -package mvm.rya.api.resolver.impl; +package org.apache.rya.api.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package mvm.rya.api.resolver.impl; import junit.framework.TestCase; -import mvm.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaType; import org.openrdf.model.vocabulary.XMLSchema; import java.util.Random; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolverTest.java -- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolverTest.java index
[36/69] [abbrv] [partial] incubator-rya git commit: RYA-198 Renaming Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/experimental/AccumuloIndexer.java -- diff --git a/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/experimental/AccumuloIndexer.java b/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/experimental/AccumuloIndexer.java deleted file mode 100644 index 5581e08..000 --- a/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/experimental/AccumuloIndexer.java +++ /dev/null @@ -1,38 +0,0 @@ -package mvm.rya.accumulo.experimental; - -/* - * 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 java.io.IOException; - -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.MultiTableBatchWriter; - -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.index.RyaSecondaryIndexer; - -public interface AccumuloIndexer extends RyaSecondaryIndexer { -public void init(); -public void setMultiTableBatchWriter(MultiTableBatchWriter writer) throws IOException; -public void setConnector(Connector connector); -public void destroy(); -public void purge(RdfCloudTripleStoreConfiguration configuration); -public void dropAndDestroy(); -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/44a2dcf0/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java -- diff --git a/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java b/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java deleted file mode 100644 index 6e818b3..000 --- a/dao/accumulo.rya/src/main/java/mvm/rya/accumulo/instance/AccumuloRyaInstanceDetailsRepository.java +++ /dev/null @@ -1,229 +0,0 @@ -package mvm.rya.accumulo.instance; - -/* - * 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 java.util.Objects.requireNonNull; - -import java.util.Map.Entry; - -import javax.annotation.ParametersAreNonnullByDefault; - -import org.apache.accumulo.core.client.AccumuloException; -import org.apache.accumulo.core.client.AccumuloSecurityException; -import org.apache.accumulo.core.client.BatchWriter; -import org.apache.accumulo.core.client.BatchWriterConfig; -import org.apache.accumulo.core.client.ConditionalWriter; -import org.apache.accumulo.core.client.ConditionalWriter.Result; -import org.apache.accumulo.core.client.ConditionalWriterConfig; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.MutationsRejectedException; -import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.client.TableExistsException; -import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.admin.TableOperations; -import org.apache.accumulo.core.data.Condition; -import org.apache.accumulo.core.data.ConditionalMutation; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.security.Authorizations; -import org.apache.hadoop.io.Text; - -import mvm.rya.api.instance.RyaDetails; -import mvm.rya.api.instance.RyaDetailsRepository; - -/** - * An implementation of {@link
[60/69] [abbrv] incubator-rya git commit: RYA-198 Fixing Source Files
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterable.java -- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterable.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterable.java index 83bd2d4..f9d84b2 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterable.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterable.java @@ -1,4 +1,4 @@ -package mvm.rya.mongodb.iter; +package org.apache.rya.mongodb.iter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,9 +27,9 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; import org.calrissian.mango.collect.CloseableIterable; import org.calrissian.mango.collect.CloseableIterator; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java -- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java index 8df2c60..9bb5d38 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java @@ -1,4 +1,4 @@ -package mvm.rya.mongodb.iter; +package org.apache.rya.mongodb.iter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.mongodb.dao.MongoDBStorageStrategy; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.mongodb.dao.MongoDBStorageStrategy; import org.calrissian.mango.collect.CloseableIterable; import org.openrdf.query.BindingSet; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java -- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java index 870115c..ebfb1ff 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java @@ -1,4 +1,4 @@ -package mvm.rya.mongodb; +package org.apache.rya.mongodb; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,11 @@ import java.util.Map; import java.util.Map.Entry; import info.aduna.iteration.CloseableIteration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaStatement.RyaStatementBuilder; -import mvm.rya.api.domain.RyaURI; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; +import org.apache.rya.api.domain.RyaURI; import org.apache.hadoop.conf.Configuration; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java -- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java index 33531b5..59904db 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java @@ -1,4 +1,4 @@ -package mvm.rya.mongodb; +package org.apache.rya.mongodb; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,7 +18,7 @@ package mvm.rya.mongodb; * under the License.