You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 10:50:11 UTC
[26/50] [abbrv] incubator-ignite git commit: # ignite-325: revert
license from some files and fix serialVersionUID at 2 files
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index f83765a..fcf10e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -25,6 +25,9 @@ import java.util.*;
*/
public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage {
/** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
private Serializable msg;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/winservice/IgniteService.sln
----------------------------------------------------------------------
diff --git a/modules/winservice/IgniteService.sln b/modules/winservice/IgniteService.sln
index e8ba1ec..7658fb1 100644
--- a/modules/winservice/IgniteService.sln
+++ b/modules/winservice/IgniteService.sln
@@ -1,17 +1,3 @@
-# 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.
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/winservice/IgniteService/IgniteService.csproj
----------------------------------------------------------------------
diff --git a/modules/winservice/IgniteService/IgniteService.csproj b/modules/winservice/IgniteService/IgniteService.csproj
index 6c4f87e..6f41039 100644
--- a/modules/winservice/IgniteService/IgniteService.csproj
+++ b/modules/winservice/IgniteService/IgniteService.csproj
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bd5f2d3..98f649d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,6 +543,8 @@
<exclude>src/test/java/org/apache/ignite/internal/processors/hadoop/books/*.txt</exclude><!--books examples-->
<exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
<exclude>src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
+ <exclude>modules/winservice/IgniteService.sln</exclude>
+ <exclude>modules/winservice/IgniteService/IgniteService.csproj</exclude>
<!--shmem-->
<exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
<exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
@@ -551,8 +553,6 @@
<exclude>ipc/shmem/config.sub</exclude><!--own license-->
<exclude>ipc/shmem/configure</exclude><!--own license-->
<exclude>ipc/shmem/configure.ac</exclude><!---->
- <exclude>ipc/shmem/igniteshmem/.libs/*</exclude><!--tmp files-->
- <exclude>ipc/shmem/igniteshmem/.deps/*</exclude><!--tmp files-->
<exclude>ipc/shmem/ltmain.sh</exclude><!--own license-->
<exclude>ipc/shmem/install-sh</exclude><!--own license-->
<exclude>ipc/shmem/depcomp</exclude><!--own license-->
@@ -560,6 +560,10 @@
<exclude>ipc/shmem/libtool</exclude><!--own license-->
<exclude>ipc/shmem/missing</exclude><!--own license-->
<exclude>ipc/shmem/stamp-h1</exclude><!--tmp timestamp-->
+ <exclude>ipc/shmem/ltmain.sh</exclude><!--tmp (not under VCS)-->
+ <exclude>ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h</exclude><!--auto generated files-->
+ <exclude>ipc/shmem/igniteshmem/.libs/*</exclude><!--tmp files-->
+ <exclude>ipc/shmem/igniteshmem/.deps/*</exclude><!--tmp files-->
<exclude>ipc/shmem/igniteshmem/libigniteshmem.la</exclude><!--tmp (not under VCS)-->
<exclude>ipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo</exclude><!--tmp (not under VCS)-->
</excludes>