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/12/10 14:15:45 UTC
[1/5] ignite git commit: OSGi Karaf features: ignite-all -=
ignite-hibernate to avoid possible licensing issues.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 445e2e6a9 -> 7d8cadecd
OSGi Karaf features: ignite-all -= ignite-hibernate to avoid possible licensing issues.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d466c7ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d466c7ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d466c7ab
Branch: refs/heads/ignite-1537
Commit: d466c7abc5401dc7744d6d72b328fa61b7f1d05a
Parents: 18fef56
Author: Raul Kripalani <ra...@apache.org>
Authored: Thu Dec 10 10:59:19 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Thu Dec 10 10:59:19 2015 +0000
----------------------------------------------------------------------
modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d466c7ab/modules/osgi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml
index 4dca39b..983aeed 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -22,10 +22,12 @@
<details>
<![CDATA[Aggregate feature for installing all Apache Ignite module + their dependencies.
- NOTE: Due to a bug in Apache Karaf (KARAF-4129), you must install the ignite-log4j feature explicitly and then either:
+ NOTE #1: Due to a bug in Apache Karaf (KARAF-4129), you must install the ignite-log4j feature explicitly and then either:
- manually refresh the pax-logging-api framework bundle - or -
- restart the Apache Karaf container.
- You may safely ignore the 'Resource has no uri' exception if you follow this method.]]>
+ You may safely ignore the 'Resource has no uri' exception if you follow this method.
+
+ NOTE #2: This feature *does not* include components that depend on LGPL software (e.g. ignite-hibernate).]]>
</details>
<feature>ignite-core</feature>
<feature>ignite-aop</feature>
@@ -33,7 +35,6 @@
<feature>ignite-camel</feature>
<feature>ignite-flume</feature>
<feature>ignite-indexing</feature>
- <feature>ignite-hibernate</feature>
<feature>ignite-jcl</feature>
<feature>ignite-jms11</feature>
<feature>ignite-jta</feature>
@@ -104,7 +105,9 @@
<details>
<![CDATA[The Apache Ignite Hibernate module + dependencies.
- Installing this feature will trigger the installation of the 'hibernate' feature from the Apache Karaf distribution.]]>
+ Installing this feature will trigger the installation of the 'hibernate' feature from the Apache Karaf distribution.
+
+ NOTE: Take into account that certain parts of Hibernate are offered under the LGPL license.]]>
</details>
<feature>hibernate</feature>
<bundle start="true">mvn:org.apache.ignite/ignite-hibernate/${project.version}</bundle>
[5/5] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d8cadec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d8cadec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d8cadec
Branch: refs/heads/ignite-1537
Commit: 7d8cadecd13537763d4477343588550220d43d57
Parents: 445e2e6 2e68a87
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 10 16:15:03 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 10 16:15:03 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheTransactionExample.java | 4 ++--
.../apache/ignite/internal/util/nio/GridNioServer.java | 11 +++++------
modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++----
3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[3/5] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5_
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9012b39d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9012b39d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9012b39d
Branch: refs/heads/ignite-1537
Commit: 9012b39d2f06cd124ff3830167af8b0953df7f64
Parents: 67f4afa d466c7a
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 10 14:01:41 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 10 14:01:41 2015 +0300
----------------------------------------------------------------------
modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/5] ignite git commit: fixed
https://issues.apache.org/jira/browse/IGNITE-2119
Posted by sb...@apache.org.
fixed https://issues.apache.org/jira/browse/IGNITE-2119
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e68a878
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e68a878
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e68a878
Branch: refs/heads/ignite-1537
Commit: 2e68a87869bd9d854c3efbbb20a72aef7b44fd2a
Parents: 9012b39
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 10 16:00:35 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 10 16:00:35 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/util/nio/GridNioServer.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e68a878/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index c0f5cfc..53cec84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -876,24 +876,23 @@ public class GridNioServer<T> {
return;
}
- else if (cnt == 0 && !readBuf.hasRemaining())
- return;
if (log.isTraceEnabled())
log.trace("Bytes received [sockCh=" + sockCh + ", cnt=" + cnt + ']');
+ if (cnt == 0)
+ return;
+
if (metricsLsnr != null)
metricsLsnr.onBytesReceived(cnt);
ses.bytesReceived(cnt);
- // Sets limit to current position and
- // resets position to 0.
readBuf.flip();
- try {
- assert readBuf.hasRemaining();
+ assert readBuf.hasRemaining();
+ try {
filterChain.onMessageReceived(ses, readBuf);
if (readBuf.hasRemaining())
[2/5] ignite git commit: ignite-1.5 - removed near cache
Posted by sb...@apache.org.
ignite-1.5 - removed near cache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67f4afa2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67f4afa2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67f4afa2
Branch: refs/heads/ignite-1537
Commit: 67f4afa2313af750a933b81b912c9ba504d8ec4e
Parents: 18fef56
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 10 14:01:32 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 10 14:01:32 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/examples/datagrid/CacheTransactionExample.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/67f4afa2/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index 93e51c1..eced5f2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -59,7 +59,7 @@ public class CacheTransactionExample {
cfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- try (IgniteCache<Integer, Account> cache = ignite.getOrCreateCache(cfg, new NearCacheConfiguration<Integer, Account>())) {
+ try (IgniteCache<Integer, Account> cache = ignite.getOrCreateCache(cfg)) {
// Initialize.
cache.put(1, new Account(1, 100));
cache.put(2, new Account(1, 200));
@@ -142,4 +142,4 @@ public class CacheTransactionExample {
return "Account [id=" + id + ", balance=$" + balance + ']';
}
}
-}
\ No newline at end of file
+}