Updated Branches: refs/heads/develop c5cf84e71 -> 5efe5b0ad
dependency updates and cleanups Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5efe5b0a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5efe5b0a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5efe5b0a Branch: refs/heads/develop Commit: 5efe5b0ad1f43227b12d4424800d637b9da5c98f Parents: c5cf84e Author: Sebastian Schaffert <[email protected]> Authored: Wed Dec 18 17:05:23 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Dec 18 17:05:23 2013 +0100 ---------------------------------------------------------------------- .../marmotta/kiwi/caching/KiWiCacheManager.java | 10 ++++++---- .../kiwi/persistence/KiWiConnection.java | 10 +++++----- libraries/ldpath/ldpath-backend-jena/pom.xml | 7 +++++++ parent/pom.xml | 20 +++++++++++++++----- platform/marmotta-core/pom.xml | 1 - .../core/services/cache/CachingServiceImpl.java | 8 +++++--- platform/marmotta-zookeeper/pom.xml | 4 ++++ 7 files changed, 42 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/KiWiCacheManager.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/KiWiCacheManager.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/KiWiCacheManager.java index 400fa75..cac63ff 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/KiWiCacheManager.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/KiWiCacheManager.java @@ -93,18 +93,20 @@ public class KiWiCacheManager { .clustering() .cacheMode(CacheMode.DIST_ASYNC) .async() + .asyncMarshalling() + .useReplQueue(true) .l1() - .lifespan(25, TimeUnit.SECONDS) + .lifespan(5, TimeUnit.MINUTES) .hash() .numOwners(2) .numSegments(100) .consistentHashFactory(new SyncConsistentHashFactory()) .eviction() .strategy(EvictionStrategy.LIRS) - .maxEntries(1000) + .maxEntries(100000) .expiration() - .lifespan(5, TimeUnit.MINUTES) - .maxIdle(1, TimeUnit.MINUTES) + .lifespan(30, TimeUnit.MINUTES) + .maxIdle(10, TimeUnit.MINUTES) .build(); } else { globalConfiguration = new GlobalConfigurationBuilder() http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java index 778d8fe..0534bf0 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java @@ -1768,20 +1768,20 @@ public class KiWiConnection { private void cacheNode(KiWiNode node) { if(node.getId() >= 0) { - nodeCache.put(node.getId(), node); + nodeCache.putAsync(node.getId(), node); } if(node instanceof KiWiUriResource) { - uriCache.put(node.stringValue(), (KiWiUriResource) node); + uriCache.putAsync(node.stringValue(), (KiWiUriResource) node); } else if(node instanceof KiWiAnonResource) { - bnodeCache.put(node.stringValue(), (KiWiAnonResource) node); + bnodeCache.putAsync(node.stringValue(), (KiWiAnonResource) node); } else if(node instanceof KiWiLiteral) { - literalCache.put(LiteralCommons.createCacheKey((Literal) node), (KiWiLiteral) node); + literalCache.putAsync(LiteralCommons.createCacheKey((Literal) node), (KiWiLiteral) node); } } private void cacheTriple(KiWiTriple triple) { if(triple.getId() >= 0) { - tripleCache.put(triple.getId(),triple); + tripleCache.putAsync(triple.getId(),triple); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/libraries/ldpath/ldpath-backend-jena/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml index 0ddd621..ecce8d2 100644 --- a/libraries/ldpath/ldpath-backend-jena/pom.xml +++ b/libraries/ldpath/ldpath-backend-jena/pom.xml @@ -69,6 +69,13 @@ <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> <version>2.7.3</version> + + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8be8f54..5302f7c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -594,7 +594,7 @@ <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> - <version>3.2</version> + <version>3.3</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -893,6 +893,16 @@ <version>3.17.1-GA</version> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.1.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-core</artifactId> <version>2.0.0.Final</version> @@ -995,12 +1005,12 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jdbc</artifactId> - <version>7.0.42</version> + <version>7.0.47</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-juli</artifactId> - <version>7.0.42</version> + <version>7.0.47</version> </dependency> <!--Secure Unique IDs --> @@ -1309,7 +1319,7 @@ <!-- 1.0.4 breaks the tests, so stay at 1.0.3 --> <groupId>org.mnode.ical4j</groupId> <artifactId>ical4j</artifactId> - <version>1.0.3</version> + <version>1.0.5.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1320,7 +1330,7 @@ <dependency> <groupId>org.mnode.ical4j</groupId> <artifactId>ical4j-vcard</artifactId> - <version>0.9.5</version> + <version>0.9.6.2</version> </dependency> <dependency> <groupId>com.github.jsonld-java</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml index 3cad061..2f0ae17 100644 --- a/platform/marmotta-core/pom.xml +++ b/platform/marmotta-core/pom.xml @@ -260,7 +260,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.5</version> </dependency> <dependency> <groupId>commons-codec</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java index 9c30862..b52b6a5 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java @@ -96,8 +96,10 @@ public class CachingServiceImpl implements CachingService { .clustering() .cacheMode(CacheMode.DIST_ASYNC) .async() + .asyncMarshalling() + .useReplQueue(true) .l1() - .lifespan(25, TimeUnit.SECONDS) + .lifespan(5, TimeUnit.MINUTES) .hash() .numOwners(2) .numSegments(100) @@ -106,8 +108,8 @@ public class CachingServiceImpl implements CachingService { .strategy(EvictionStrategy.LIRS) .maxEntries(10000) .expiration() - .lifespan(5, TimeUnit.MINUTES) - .maxIdle(1, TimeUnit.MINUTES) + .lifespan(30, TimeUnit.MINUTES) + .maxIdle(10, TimeUnit.MINUTES) .build(); } else { globalConfiguration = new GlobalConfigurationBuilder() http://git-wip-us.apache.org/repos/asf/marmotta/blob/5efe5b0a/platform/marmotta-zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-zookeeper/pom.xml b/platform/marmotta-zookeeper/pom.xml index 03bc40e..b7b32fd 100644 --- a/platform/marmotta-zookeeper/pom.xml +++ b/platform/marmotta-zookeeper/pom.xml @@ -150,6 +150,10 @@ <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.fileinstall</artifactId> </exclusion>
