You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by dl...@apache.org on 2017/09/08 19:06:21 UTC
[2/3] incubator-rya git commit: RYA-360 Fixed licensing issues.
Closes #222
RYA-360 Fixed licensing issues. Closes #222
Corrected Copyright on the NOTICE file.
Fixed a license header.
Renamed some occurrences of Rya to Apache Rya in documentation.
Updated generated source headers to use the AL for the ASF.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/46245982
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/46245982
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/46245982
Branch: refs/heads/master
Commit: 46245982d63cec5cdb0a627ed2412518a4458590
Parents: 3aae325
Author: jdasch <hc...@gmail.com>
Authored: Wed Sep 6 13:56:59 2017 -0400
Committer: David Lotts <da...@parsons.com>
Committed: Fri Sep 8 15:03:48 2017 -0400
----------------------------------------------------------------------
NOTICE | 2 +-
README.md | 10 +--
extras/rya.benchmark/pom.xml | 23 ++---
extras/rya.benchmark/src/license/header.txt | 16 ++++
extras/rya.export/export.accumulo/pom.xml | 23 ++---
.../rya.export/export.accumulo/src/.gitignore | 1 -
.../export.accumulo/src/license/header.txt | 16 ++++
extras/rya.export/export.api/pom.xml | 24 +++---
extras/rya.export/export.api/src/gen/.gitignore | 1 -
.../export.api/src/license/header.txt | 16 ++++
.../rya/export/client/conf/TimeUtils.java | 32 ++++---
extras/rya.manual/src/site/markdown/_index.md | 91 ++++++++++----------
.../src/site/markdown/build-source.md | 2 +-
extras/rya.manual/src/site/markdown/eval.md | 2 +-
extras/rya.manual/src/site/markdown/index.md | 6 +-
.../src/site/markdown/loadPrecomputedJoin.md | 2 +-
.../rya.manual/src/site/markdown/mapreduce.md | 2 +-
extras/rya.manual/src/site/markdown/overview.md | 4 +-
.../rya.manual/src/site/markdown/querydata.md | 2 +-
.../rya.manual/src/site/markdown/quickstart.md | 4 +-
.../src/site/markdown/sm-firststeps.md | 2 +-
extras/rya.manual/src/site/markdown/sm-infer.md | 2 +-
.../src/site/markdown/sm-simpleaqr.md | 2 +-
pom.xml | 10 +--
24 files changed, 170 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9e44983..0f192f4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Rya (Incubating)
-Copyright 2016 The Apache Software Foundation
+Copyright 2015-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index deb1973..640d1b6 100644
--- a/README.md
+++ b/README.md
@@ -15,17 +15,17 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License. -->
-# RYA
+# Apache Rya
## Overview
-[RYA] is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc).
+[Apache Rya] is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc).
-RYA stands for RDF y(and) Accumulo.
+Rya stands for RDF y(and) Accumulo.
-## Rya Manual
+## Manual
-A copy of the Rya Manual is located [here](extras/rya.manual/src/site/markdown/index.md). The material in the manual and below may be out of sync.
+A copy of the Apache Rya Manual is located [here](extras/rya.manual/src/site/markdown/index.md). The material in the manual and below may be out of sync.
## Upgrade Path
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml
index 17640e4..a2b2d3b 100644
--- a/extras/rya.benchmark/pom.xml
+++ b/extras/rya.benchmark/pom.xml
@@ -108,23 +108,24 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
+ <configuration>
+ <header>${project.basedir}/src/license/header.txt</header>
+ </configuration>
<executions>
<execution>
<id>update-generated-source-headers</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <phase>process-sources</phase>
<configuration>
- <roots>
- <root>${project.build.directory}/generated-sources/jaxb</root>
- </roots>
- <extraFiles>
- <sun-jaxb.episode>xml</sun-jaxb.episode>
- </extraFiles>
+ <basedir>${project.build.directory}/generated-sources</basedir>
+ <mapping>
+ <sun-jaxb.episode>XML_STYLE</sun-jaxb.episode>
+ </mapping>
</configuration>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>format</goal>
+ </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.benchmark/src/license/header.txt
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/src/license/header.txt b/extras/rya.benchmark/src/license/header.txt
new file mode 100644
index 0000000..90705e0
--- /dev/null
+++ b/extras/rya.benchmark/src/license/header.txt
@@ -0,0 +1,16 @@
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.accumulo/pom.xml b/extras/rya.export/export.accumulo/pom.xml
index 19342d2..406c93d 100644
--- a/extras/rya.export/export.accumulo/pom.xml
+++ b/extras/rya.export/export.accumulo/pom.xml
@@ -100,23 +100,24 @@ under the License.
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
+ <configuration>
+ <header>${project.basedir}/src/license/header.txt</header>
+ </configuration>
<executions>
<execution>
<id>update-generated-source-headers</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <phase>process-sources</phase>
<configuration>
- <roots>
- <root>${project.build.directory}/generated-sources/jaxb</root>
- </roots>
- <extraFiles>
- <sun-jaxb.episode>xml</sun-jaxb.episode>
- </extraFiles>
+ <basedir>${project.build.directory}/generated-sources</basedir>
+ <mapping>
+ <sun-jaxb.episode>XML_STYLE</sun-jaxb.episode>
+ </mapping>
</configuration>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>format</goal>
+ </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.accumulo/src/.gitignore
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.accumulo/src/.gitignore b/extras/rya.export/export.accumulo/src/.gitignore
deleted file mode 100644
index e8e450b..0000000
--- a/extras/rya.export/export.accumulo/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gen/
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.accumulo/src/license/header.txt
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.accumulo/src/license/header.txt b/extras/rya.export/export.accumulo/src/license/header.txt
new file mode 100644
index 0000000..90705e0
--- /dev/null
+++ b/extras/rya.export/export.accumulo/src/license/header.txt
@@ -0,0 +1,16 @@
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.api/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.api/pom.xml b/extras/rya.export/export.api/pom.xml
index f699bec..b07a664 100644
--- a/extras/rya.export/export.api/pom.xml
+++ b/extras/rya.export/export.api/pom.xml
@@ -91,25 +91,25 @@ under the License.
<packageName>org.apache.rya.export</packageName>
</configuration>
</plugin>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
+ <configuration>
+ <header>${project.basedir}/src/license/header.txt</header>
+ </configuration>
<executions>
<execution>
<id>update-generated-source-headers</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <phase>process-sources</phase>
<configuration>
- <roots>
- <root>${project.build.directory}/generated-sources/jaxb</root>
- </roots>
- <extraFiles>
- <sun-jaxb.episode>xml</sun-jaxb.episode>
- </extraFiles>
+ <basedir>${project.build.directory}/generated-sources</basedir>
+ <mapping>
+ <sun-jaxb.episode>XML_STYLE</sun-jaxb.episode>
+ </mapping>
</configuration>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>format</goal>
+ </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.api/src/gen/.gitignore
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.api/src/gen/.gitignore b/extras/rya.export/export.api/src/gen/.gitignore
deleted file mode 100644
index 1e574a9..0000000
--- a/extras/rya.export/export.api/src/gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/java/
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.api/src/license/header.txt
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.api/src/license/header.txt b/extras/rya.export/export.api/src/license/header.txt
new file mode 100644
index 0000000..90705e0
--- /dev/null
+++ b/extras/rya.export/export.api/src/license/header.txt
@@ -0,0 +1,16 @@
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java
----------------------------------------------------------------------
diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java
index 596e98d..c7e2174 100644
--- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java
+++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java
@@ -1,24 +1,22 @@
-package org.apache.rya.export.client.conf;
-
/*
- * #%L
- * mvm.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.export.client.conf;
import java.io.IOException;
import java.net.HttpURLConnection;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/_index.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/_index.md b/extras/rya.manual/src/site/markdown/_index.md
index 6e45779..9e682a5 100644
--- a/extras/rya.manual/src/site/markdown/_index.md
+++ b/extras/rya.manual/src/site/markdown/_index.md
@@ -1,45 +1,48 @@
-
-<!--
-
-[comment]: # Licensed to the Apache Software Foundation (ASF) under one
-[comment]: # or more contributor license agreements. See the NOTICE file
-[comment]: # distributed with this work for additional information
-[comment]: # regarding copyright ownership. The ASF licenses this file
-[comment]: # to you under the Apache License, Version 2.0 (the
-[comment]: # "License"); you may not use this file except in compliance
-[comment]: # with the License. You may obtain a copy of the License at
-[comment]: #
-[comment]: # http://www.apache.org/licenses/LICENSE-2.0
-[comment]: #
-[comment]: # Unless required by applicable law or agreed to in writing,
-[comment]: # software distributed under the License is distributed on an
-[comment]: # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-[comment]: # KIND, either express or implied. See the License for the
-[comment]: # specific language governing permissions and limitations
-[comment]: # under the License.
-
--->
-
-# Rya
-- [Overview](overview.md)
-- [Quick Start](quickstart.md)
-- [Load Data](loaddata.md)
-- [Query Data](querydata.md)
-- [Evaluation Table](eval.md)
-- [Pre-computed Joins](loadPrecomputedJoin.md)
-- [Inferencing](infer.md)
+
+<!--
+
+[comment]: # Licensed to the Apache Software Foundation (ASF) under one
+[comment]: # or more contributor license agreements. See the NOTICE file
+[comment]: # distributed with this work for additional information
+[comment]: # regarding copyright ownership. The ASF licenses this file
+[comment]: # to you under the Apache License, Version 2.0 (the
+[comment]: # "License"); you may not use this file except in compliance
+[comment]: # with the License. You may obtain a copy of the License at
+[comment]: #
+[comment]: # http://www.apache.org/licenses/LICENSE-2.0
+[comment]: #
+[comment]: # Unless required by applicable law or agreed to in writing,
+[comment]: # software distributed under the License is distributed on an
+[comment]: # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+[comment]: # KIND, either express or implied. See the License for the
+[comment]: # specific language governing permissions and limitations
+[comment]: # under the License.
+
+-->
+
+# Apache Rya
+
+This project contains documentation about Apache Rya, a scalable RDF triple store on top of Accumulo.
+
+- [Overview](overview.md)
+- [Quick Start](quickstart.md)
+- [Load Data](loaddata.md)
+- [Query Data](querydata.md)
+- [Evaluation Table](eval.md)
+- [Pre-computed Joins](loadPrecomputedJoin.md)
+- [Inferencing](infer.md)
- [MapReduce Interface](mapreduce.md)
-
-# Samples
-- [Typical First Steps](sm-firststeps.md)
-- [Simple Add/Query/Remove Statements](sm-simpleaqr.md)
-- [Sparql query](sm-sparqlquery.md)
-- [Adding Authentication](sm-addauth.md)
-- [Inferencing](sm-infer.md)
-- [Named Graph](sm-namedgraph.md)
-- [Update data](sm-updatedata.md)
-- [Alx](alx.md)
-
-# Development
-- [Building From Source](build-source.md)
-- [LTS Maven Settings XML](maven-settings.md)
+
+# Samples
+- [Typical First Steps](sm-firststeps.md)
+- [Simple Add/Query/Remove Statements](sm-simpleaqr.md)
+- [Sparql query](sm-sparqlquery.md)
+- [Adding Authentication](sm-addauth.md)
+- [Inferencing](sm-infer.md)
+- [Named Graph](sm-namedgraph.md)
+- [Update data](sm-updatedata.md)
+- [Alx](alx.md)
+
+# Development
+- [Building From Source](build-source.md)
+- [LTS Maven Settings XML](maven-settings.md)
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/build-source.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/build-source.md b/extras/rya.manual/src/site/markdown/build-source.md
index 07f0cb5..91e0bda 100644
--- a/extras/rya.manual/src/site/markdown/build-source.md
+++ b/extras/rya.manual/src/site/markdown/build-source.md
@@ -23,7 +23,7 @@
## Prerequisites
-* Rya code
+* Apache Rya code
* Maven 2.2 +
## Building
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/eval.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/eval.md b/extras/rya.manual/src/site/markdown/eval.md
index ff894eb..ac75086 100644
--- a/extras/rya.manual/src/site/markdown/eval.md
+++ b/extras/rya.manual/src/site/markdown/eval.md
@@ -22,7 +22,7 @@
# Prospects Table
The Prospects Table provides statistics on the number of subject/predicate/object data found in the triple store. It is currently a
-Map Reduce job that will run against the Rya store and save all the statistics in the prosepcts table.
+Map Reduce job that will run against the Apache Rya store and save all the statistics in the prospects table.
## Build
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/index.md b/extras/rya.manual/src/site/markdown/index.md
index 2840d10..9e682a5 100644
--- a/extras/rya.manual/src/site/markdown/index.md
+++ b/extras/rya.manual/src/site/markdown/index.md
@@ -19,9 +19,10 @@
[comment]: # under the License.
-->
-# Rya
-This project contains documentation about the Rya, a scalable RDF triple store on top of Accumulo.
+# Apache Rya
+
+This project contains documentation about Apache Rya, a scalable RDF triple store on top of Accumulo.
- [Overview](overview.md)
- [Quick Start](quickstart.md)
@@ -44,3 +45,4 @@ This project contains documentation about the Rya, a scalable RDF triple store o
# Development
- [Building From Source](build-source.md)
+- [LTS Maven Settings XML](maven-settings.md)
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md b/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md
index 2616ab3..f0d1e02 100644
--- a/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md
+++ b/extras/rya.manual/src/site/markdown/loadPrecomputedJoin.md
@@ -21,7 +21,7 @@
-->
# Load Pre-computed Join
-A tool has been created to load a pre-computed join. This tool will generate an index to support a pre-computed join on a user provided SPARQL query, and then register that query within Rya.
+A tool has been created to load a pre-computed join. This tool will generate an index to support a pre-computed join on a user provided SPARQL query, and then register that query within Apache Rya.
## Registering a pre-computed join
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/mapreduce.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/mapreduce.md b/extras/rya.manual/src/site/markdown/mapreduce.md
index 2763307..f99a78f 100644
--- a/extras/rya.manual/src/site/markdown/mapreduce.md
+++ b/extras/rya.manual/src/site/markdown/mapreduce.md
@@ -20,7 +20,7 @@
-->
# MapReduce Interface
-The rya.mapreduce project contains a set of classes facilitating the use of
+The Apache Rya `rya.mapreduce` project contains a set of classes facilitating the use of
Accumulo-backed Rya as the input source or output destination of Hadoop
MapReduce jobs.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/overview.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/overview.md b/extras/rya.manual/src/site/markdown/overview.md
index 068bd57..46da734 100644
--- a/extras/rya.manual/src/site/markdown/overview.md
+++ b/extras/rya.manual/src/site/markdown/overview.md
@@ -21,6 +21,6 @@
-->
# Overview
-RYA is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc).
+Apache Rya is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc).
-RYA stands for RDF y(and) Accumulo.
+Rya stands for RDF y(and) Accumulo.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/querydata.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/querydata.md b/extras/rya.manual/src/site/markdown/querydata.md
index a7e2a6d..adc5d12 100644
--- a/extras/rya.manual/src/site/markdown/querydata.md
+++ b/extras/rya.manual/src/site/markdown/querydata.md
@@ -21,7 +21,7 @@
-->
# Query Data
-There are a few mechanisms to query data
+Apache Rya has a few mechanisms to query data
## Web JSP endpoint
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/quickstart.md b/extras/rya.manual/src/site/markdown/quickstart.md
index 4f0aa05..f0d76a8 100644
--- a/extras/rya.manual/src/site/markdown/quickstart.md
+++ b/extras/rya.manual/src/site/markdown/quickstart.md
@@ -21,12 +21,12 @@
-->
# Quick Start
-This tutorial will outline the steps needed to get quickly started with the Rya store using the web based endpoint.
+This tutorial will outline the steps needed to get quickly started with the Apache Rya store using the web based endpoint.
## Prerequisites
* Columnar Store (Accumulo)
-* Rya code (Git: git://git.apache.org/incubator-rya.git)
+* Apache Rya code (Git: git://git.apache.org/incubator-rya.git)
* Maven 3.0 +
## Building from Source
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/sm-firststeps.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/sm-firststeps.md b/extras/rya.manual/src/site/markdown/sm-firststeps.md
index 5f49b41..228bfb5 100644
--- a/extras/rya.manual/src/site/markdown/sm-firststeps.md
+++ b/extras/rya.manual/src/site/markdown/sm-firststeps.md
@@ -27,7 +27,7 @@ In this tutorial, I will give you a quick overview of some of the first steps I
We are assuming Accumulo 1.5+ usage here.
- * Rya Source Code `web.rya.war`)
+ * Apache Rya Source Code (`web.rya.war`)
* Accumulo on top of Hadoop 0.20+
* RDF Data (in N-Triples format, this format is the easiest to bulk load)
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/sm-infer.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/sm-infer.md b/extras/rya.manual/src/site/markdown/sm-infer.md
index a2b0b66..c2d112c 100644
--- a/extras/rya.manual/src/site/markdown/sm-infer.md
+++ b/extras/rya.manual/src/site/markdown/sm-infer.md
@@ -21,7 +21,7 @@
-->
# Inferencing
-Rya currently provides simple inferencing. The supported list of inferred relationships include:
+Apache Rya currently provides simple inferencing. The supported list of inferred relationships include:
- rdfs:subClassOf
- rdfs:subPropertyOf
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/extras/rya.manual/src/site/markdown/sm-simpleaqr.md
----------------------------------------------------------------------
diff --git a/extras/rya.manual/src/site/markdown/sm-simpleaqr.md b/extras/rya.manual/src/site/markdown/sm-simpleaqr.md
index cb8f068..9188c2a 100644
--- a/extras/rya.manual/src/site/markdown/sm-simpleaqr.md
+++ b/extras/rya.manual/src/site/markdown/sm-simpleaqr.md
@@ -21,7 +21,7 @@
-->
# Simple Add Query and Remove of Statements
-This quick tutorial will give a small example on how to add, query, and remove statements from Rya
+This quick tutorial will give a small example on how to add, query, and remove statements from Apache Rya
## Code
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/46245982/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51822be..7a0bf2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -940,15 +940,9 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>1.13</version>
- <configuration>
- <licenseName>apache_v2</licenseName>
- <processStartTag>========================LICENSE_START=================================</processStartTag>
- <processEndTag>=========================LICENSE_END==================================</processEndTag>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- </configuration>
+ <version>3.0</version>
</plugin>
</plugins>
</pluginManagement>