ignite-111 minor fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7d123e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7d123e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7d123e5 Branch: refs/heads/sprint-1 Commit: b7d123e5986b4610a92e4e878944c8b31ce5f40d Parents: bb291b5 Author: avinogradov <[email protected]> Authored: Wed Feb 4 17:56:03 2015 +0300 Committer: avinogradov <[email protected]> Committed: Wed Feb 4 17:56:03 2015 +0300 ---------------------------------------------------------------------- .../util/snaptree/CopyOnWriteManager.java | 42 ++++++++++++++------ .../ignite/internal/util/snaptree/Epoch.java | 42 ++++++++++++++------ .../internal/util/snaptree/EpochNode.java | 42 ++++++++++++++------ pom.xml | 5 ++- 4 files changed, 94 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d123e5/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java index aa5d308..cadb45e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/CopyOnWriteManager.java @@ -1,18 +1,36 @@ /* - * 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 + * Copyright (c) 2009 Stanford University, unless otherwise specified. + * All rights reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This software was developed by the Pervasive Parallelism Laboratory of + * Stanford University, California, USA. * - * 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. + * Permission to use, copy, modify, and distribute this software in source + * or binary form for any purpose with or without fee is hereby granted, + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of Stanford University nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ package org.apache.ignite.internal.util.snaptree; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d123e5/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java index 67463aa..751ac4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/Epoch.java @@ -1,18 +1,36 @@ /* - * 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 + * Copyright (c) 2009 Stanford University, unless otherwise specified. + * All rights reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This software was developed by the Pervasive Parallelism Laboratory of + * Stanford University, California, USA. * - * 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. + * Permission to use, copy, modify, and distribute this software in source + * or binary form for any purpose with or without fee is hereby granted, + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of Stanford University nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ package org.apache.ignite.internal.util.snaptree; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d123e5/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java index d1897da..8bc4b39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/snaptree/EpochNode.java @@ -1,18 +1,36 @@ /* - * 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 + * Copyright (c) 2009 Stanford University, unless otherwise specified. + * All rights reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This software was developed by the Pervasive Parallelism Laboratory of + * Stanford University, California, USA. * - * 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. + * Permission to use, copy, modify, and distribute this software in source + * or binary form for any purpose with or without fee is hereby granted, + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of Stanford University nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ package org.apache.ignite.internal.util.snaptree; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d123e5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 34324d8..7bcdfa1 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,10 @@ <excludes> <exclude>**/com/romix/scala/**</exclude> <exclude>**/GridOffHeapSnapTreeMap.java</exclude> - <exclude>**/SnapTreeMap.java</exclude> + <exclude>**/internal/util/snaptree/SnapTreeMap.java</exclude> + <exclude>**/internal/util/snaptree/CopyOnWriteManager.java</exclude> + <exclude>**/internal/util/snaptree/Epoch.java</exclude> + <exclude>**/internal/util/snaptree/EpochNode.java</exclude> <exclude>**/org/jetbrains/annotations/**</exclude> <exclude>**/org/pcollections/**</exclude> <exclude>**/org/jdk8/backport/**</exclude>
