Author: lewismc
Date: Fri Apr 6 19:47:58 2012
New Revision: 1310562
URL: http://svn.apache.org/viewvc?rev=1310562&view=rev
Log:
Commit to update CHANGES.txt for GORA-76 commit, also add missing license
headers.
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-accumulo/pom.xml
gora/trunk/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml
gora/trunk/gora-accumulo/src/test/resources/gora.properties
gora/trunk/pom.xml
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1310562&r1=1310561&r2=1310562&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Fri Apr 6 19:47:58 2012
@@ -6,6 +6,8 @@ Gora Change Log
Trunk (unreleased changes):
+* GORA-76 Upgrade to Hadoop 1.0.1 (ferdy & lewismc)
+
* GORA-65 Initial checkin of gora accumulo datastore (kturner)
* GORA-108 Change CassandraClient#init() to CassandraClient#initialize() for
consistency with other Datastores. (lewismc)
@@ -33,7 +35,7 @@ write operations. (lewismc)
* GORA-90 Create DOAP for Gora (lewismc)
-* GORA-79 Block keyspace creation until the whole cassandra cluster converges
to the new keyspace. (Patricio Echagüe vis lewismc)
+* GORA-79 Block keyspace creation until the whole cassandra cluster converges
to the new keyspace. (Patricio Echagüe via lewismc)
* GORA-83 add 'target' dirs to svn ignore (ferdy)
Modified: gora/trunk/gora-accumulo/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/pom.xml?rev=1310562&r1=1310561&r2=1310562&view=diff
==============================================================================
--- gora/trunk/gora-accumulo/pom.xml (original)
+++ gora/trunk/gora-accumulo/pom.xml Fri Apr 6 19:47:58 2012
@@ -1,5 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <!--
+ 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.
+ -->
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -33,9 +51,7 @@
<version>1.4.0</version>
</dependency>
-
<!-- Hadoop Dependencies -->
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
@@ -44,13 +60,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
+ <exclusions>
+ <exclusion>
<groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
+ <artifactId>jms</artifactId>
+ </exclusion>
</exclusions>
-
</dependency>
<!-- Testing Dependencies -->
Modified: gora/trunk/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml?rev=1310562&r1=1310561&r2=1310562&view=diff
==============================================================================
--- gora/trunk/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml
(original)
+++ gora/trunk/gora-accumulo/src/test/resources/gora-accumulo-mapping.xml Fri
Apr 6 19:47:58 2012
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <!--
+ 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.
+ -->
+
<gora-orm>
<table name="AccessLog">
<config key="table.file.compress.blocksize" value="32K"/>
Modified: gora/trunk/gora-accumulo/src/test/resources/gora.properties
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/src/test/resources/gora.properties?rev=1310562&r1=1310561&r2=1310562&view=diff
==============================================================================
--- gora/trunk/gora-accumulo/src/test/resources/gora.properties (original)
+++ gora/trunk/gora-accumulo/src/test/resources/gora.properties Fri Apr 6
19:47:58 2012
@@ -1,3 +1,18 @@
+# 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.
+
gora.datastore.default=org.apache.gora.accumulo.store.AccumuloStore
gora.datastore.accumulo.mock=true
gora.datastore.accumulo.instance=a14
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1310562&r1=1310561&r2=1310562&view=diff
==============================================================================
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Fri Apr 6 19:47:58 2012
@@ -35,6 +35,18 @@
<url>http://gora.apache.org</url>
<inceptionYear>2010</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
<developers>
<developer>
<id>ab</id>
