ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [46/50] [abbrv] ignite git commit: IGNITE-1282: Fixes after merge from master.
Date Thu, 29 Oct 2015 11:12:57 GMT
IGNITE-1282: Fixes after merge from master.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5338eb8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5338eb8d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5338eb8d

Branch: refs/heads/ignite-1753-1282
Commit: 5338eb8d8d2dd4782427541a5a397e047ff57ed0
Parents: e4c6a90
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Oct 29 11:58:50 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Oct 29 11:58:50 2015 +0300

----------------------------------------------------------------------
 assembly/release-fabric-base.xml                | 94 ++++++++++++++++++++
 .../internal/portable/PortableContext.java      | 42 ++++-----
 .../GridDiscoveryManagerAttributesSelfTest.java |  1 +
 3 files changed, 117 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5338eb8d/assembly/release-fabric-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 944e8ce..d3e75ba 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -22,6 +22,33 @@
            xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
            http://maven.apache.org/xsd/component-1.1.2.xsd">
     <files>
+        <!-- Copy CPP files. -->
+        <file>
+            <source>modules/platforms/cpp/project/vs/ignite.slnrel</source>
+            <outputDirectory>/platforms/cpp/project/vs</outputDirectory>
+            <destName>ignite.sln</destName>
+        </file>
+
+        <file>
+            <source>modules/platforms/cpp/project/vs/ignite_x86.slnrel</source>
+            <outputDirectory>/platforms/cpp/project/vs</outputDirectory>
+            <destName>ignite_x86.sln</destName>
+        </file>
+
+        <!-- Copy .Net files. -->
+        <file>
+            <source>modules/platforms/dotnet/Apache.Ignite.slnrel</source>
+            <outputDirectory>/platforms/dotnet</outputDirectory>
+            <destName>Apache.Ignite.sln</destName>
+        </file>
+
+        <file>
+            <source>modules/platforms/dotnet/Apache.Ignite_x86.slnrel</source>
+            <outputDirectory>/platforms/dotnet</outputDirectory>
+            <destName>Apache.Ignite_x86.sln</destName>
+        </file>
+
+        <!-- Other files. -->
         <file>
             <source>assembly/LICENSE_FABRIC</source>
             <destName>LICENSE</destName>
@@ -42,6 +69,73 @@
     </files>
 
     <fileSets>
+        <!-- Move .Net readme. -->
+        <fileSet>
+            <directory>modules/platforms/dotnet</directory>
+            <outputDirectory>/platforms/dotnet</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- Move .Net "core" module. -->
+        <fileSet>
+            <directory>modules/platforms/dotnet/Apache.Ignite.Core</directory>
+            <outputDirectory>/platforms/dotnet/Apache.Ignite.Core</outputDirectory>
+        </fileSet>
+
+        <!-- Move .Net executable module. -->
+        <fileSet>
+            <directory>modules/platforms/dotnet/Apache.Ignite</directory>
+            <outputDirectory>/platforms/dotnet/Apache.Ignite</outputDirectory>
+        </fileSet>
+
+        <!-- Move .Net examples. -->
+        <fileSet>
+            <directory>modules/platforms/dotnet/examples</directory>
+            <outputDirectory>/platforms/dotnet/examples</outputDirectory>
+        </fileSet>
+
+        <!-- Move .Net licenses. -->
+        <fileSet>
+            <directory>modules/platforms/licenses</directory>
+            <outputDirectory>/platforms/dotnet/licenses</outputDirectory>
+        </fileSet>
+
+        <!-- Move CPP readme. -->
+        <fileSet>
+            <directory>modules/platforms/cpp</directory>
+            <outputDirectory>/platforms/cpp</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- Move CPP "common" module. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/common</directory>
+            <outputDirectory>/platforms/cpp/common</outputDirectory>
+        </fileSet>
+
+        <!-- Move CPP "core" module. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/core</directory>
+            <outputDirectory>/platforms/cpp/core</outputDirectory>
+        </fileSet>
+
+        <!-- Move CPP examples. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/examples</directory>
+            <outputDirectory>/platforms/cpp/examples</outputDirectory>
+        </fileSet>
+
+        <!-- Move CPP licenses. -->
+        <fileSet>
+            <directory>modules/platforms/licenses</directory>
+            <outputDirectory>/platforms/cpp/licenses</outputDirectory>
+        </fileSet>
+
+        <!-- Other files. -->
         <fileSet>
             <directory>bin</directory>
             <outputDirectory>/bin</outputDirectory>

http://git-wip-us.apache.org/repos/asf/ignite/blob/5338eb8d/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 880bf11..26e098f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -17,6 +17,28 @@
 
 package org.apache.ignite.internal.portable;
 
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.MarshallerContext;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableException;
+import org.apache.ignite.portable.PortableIdMapper;
+import org.apache.ignite.portable.PortableInvalidClassException;
+import org.apache.ignite.portable.PortableMetadata;
+import org.apache.ignite.portable.PortableSerializer;
+import org.apache.ignite.portable.PortableTypeConfiguration;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+
 import java.io.Externalizable;
 import java.io.File;
 import java.io.IOException;
@@ -49,26 +71,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.IgnitionEx;
-import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.lang.GridMapEntry;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.marshaller.MarshallerContext;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.marshaller.portable.PortableMarshaller;
-import org.apache.ignite.portable.PortableException;
-import org.apache.ignite.portable.PortableIdMapper;
-import org.apache.ignite.portable.PortableInvalidClassException;
-import org.apache.ignite.portable.PortableMetadata;
-import org.apache.ignite.portable.PortableSerializer;
-import org.apache.ignite.portable.PortableTypeConfiguration;
-import org.jetbrains.annotations.Nullable;
-import org.jsr166.ConcurrentHashMap8;
 
 /**
  * Portable context.

http://git-wip-us.apache.org/repos/asf/ignite/blob/5338eb8d/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index fc02a43..3a2f3ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;


Mime
View raw message