You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/11/18 20:19:45 UTC
svn commit: r1203793 - in /incubator/accumulo/branches/1.4: ./ contrib/
src/core/src/main/java/org/apache/accumulo/core/client/mock/
src/core/src/main/java/org/apache/accumulo/core/util/
src/core/src/main/java/org/apache/accumulo/core/zookeeper/ src/co...
Author: billie
Date: Fri Nov 18 19:19:44 2011
New Revision: 1203793
URL: http://svn.apache.org/viewvc?rev=1203793&view=rev
Log:
ACCUMULO-157 merged license additions to 1.4
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/NOTICE
incubator/accumulo/branches/1.4/contrib/Eclipse-Accumulo-Codestyle.xml
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchDeleter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java
incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java
incubator/accumulo/branches/1.4/src/server/src/main/resources/randomwalk/module.xsd
incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java
incubator/accumulo/branches/1.4/src/start/src/test/java/test/TestTemplate
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 19:19:44 2011
@@ -1 +1 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683
Modified: incubator/accumulo/branches/1.4/NOTICE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/NOTICE?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/NOTICE (original)
+++ incubator/accumulo/branches/1.4/NOTICE Fri Nov 18 19:19:44 2011
@@ -4,8 +4,11 @@ Copyright 2011 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes Flot (http://http://code.google.com/p/flot/), its licensed under the MIT license
+This product includes Flot (http://http://code.google.com/p/flot/), which is
+licensed under the MIT license.
Copyright (c) 2007-2009 IOLA and Ole Laursen
-This product includes JLine (http://jline.sourceforge.net/), its licensed under the BSD License.
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>, All rights reserved.
\ No newline at end of file
+This product includes JLine (http://jline.sourceforge.net/), which is licensed
+under the BSD License.
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>, All rights
+reserved.
Modified: incubator/accumulo/branches/1.4/contrib/Eclipse-Accumulo-Codestyle.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/contrib/Eclipse-Accumulo-Codestyle.xml (original)
+++ incubator/accumulo/branches/1.4/contrib/Eclipse-Accumulo-Codestyle.xml Fri Nov 18 19:19:44 2011
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<profiles version="12">
<profile kind="CodeFormatterProfile" name="Accumulo" version="12">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchDeleter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchDeleter.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchDeleter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchDeleter.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.core.client.mock;
import java.util.Iterator;
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.core.util;
import java.util.ArrayList;
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.core.zookeeper;
import java.util.List;
Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.core.security;
import static org.junit.Assert.assertArrayEquals;
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.server.constraints;
import java.io.IOException;
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.server.zookeeper;
import java.util.List;
Modified: incubator/accumulo/branches/1.4/src/server/src/main/resources/randomwalk/module.xsd
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/resources/randomwalk/module.xsd?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/resources/randomwalk/module.xsd (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/resources/randomwalk/module.xsd Fri Nov 18 19:19:44 2011
@@ -1,4 +1,20 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--
+ 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.
+-->
<xsd:element name="module" type="ModuleType"/>
Modified: incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.accumulo.server.test.iterator;
import java.util.ArrayList;
Modified: incubator/accumulo/branches/1.4/src/start/src/test/java/test/TestTemplate
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/start/src/test/java/test/TestTemplate?rev=1203793&r1=1203792&r2=1203793&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/start/src/test/java/test/TestTemplate (original)
+++ incubator/accumulo/branches/1.4/src/start/src/test/java/test/TestTemplate Fri Nov 18 19:19:44 2011
@@ -1,3 +1,19 @@
+/*
+ * 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 test;
public class TestObject implements Test {