You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2016/08/10 18:20:45 UTC
[1/2] incubator-mnemonic git commit: MNEMONIC-89: Add commented
plugins to the build of example for repo. managed artifacts
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master e65c540f7 -> 2d22b745c
MNEMONIC-89: Add commented plugins to the build of example for repo. managed artifacts
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/a78716d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/a78716d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/a78716d0
Branch: refs/heads/master
Commit: a78716d08e70b2411b6113d5480043be45efed48
Parents: e65c540
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Mon Aug 8 11:35:16 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Mon Aug 8 11:35:16 2016 -0700
----------------------------------------------------------------------
mnemonic-examples/pom.xml | 108 ++++++++++++++++++++++++++++++-----------
1 file changed, 81 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/a78716d0/mnemonic-examples/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-examples/pom.xml b/mnemonic-examples/pom.xml
index 2bf273d..f29d1cc 100644
--- a/mnemonic-examples/pom.xml
+++ b/mnemonic-examples/pom.xml
@@ -19,7 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.mnemonic</groupId>
@@ -41,6 +42,13 @@
</dependencies>
<build>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>1.4.0.Final</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -70,6 +78,51 @@
</execution>
</executions>
</plugin>
+ <!-- enable the following plugin in client POM
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mnemonic-nvml-vmem-service</artifactId>
+ <version>${project.version}</version>
+ <classifier>${os.detected.classifier}</classifier>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mnemonic-pmalloc-service</artifactId>
+ <version>${project.version}</version>
+ <classifier>${os.detected.classifier}</classifier>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mnemonic-utilities-service</artifactId>
+ <version>${project.version}</version>
+ <classifier>${os.detected.classifier}</classifier>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/service-dist</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
</plugins>
</build>
@@ -99,34 +152,35 @@
<profile>
<id>example</id>
<activation>
- <property>
- <name>example</name>
- </property>
+ <property>
+ <name>example</name>
+ </property>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <arguments>
- <argument>-Djava.ext.dirs=${memory.service.dist.dir}</argument>
- <argument>-ea</argument>
- <argument>-classpath</argument>
- <classpath />
- <argument>${project.groupId}.examples.Main</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <!-- replace it with ${project.build.directory}/service-dist in client POM -->
+ <argument>-Djava.ext.dirs=${memory.service.dist.dir}</argument>
+ <argument>-ea</argument>
+ <argument>-classpath</argument>
+ <classpath />
+ <argument>${project.groupId}.examples.Main</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</profile>
[2/2] incubator-mnemonic git commit: MNEMONIC-90: String.join() is
only supported in Java 8 MNEMONIC-91: Missing the implementation of
Iterator.remove()
Posted by ga...@apache.org.
MNEMONIC-90: String.join() is only supported in Java 8
MNEMONIC-91: Missing the implementation of Iterator.remove()
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/2d22b745
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/2d22b745
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/2d22b745
Branch: refs/heads/master
Commit: 2d22b745c1f81e8d65ad2dcbf5ee50fb29804323
Parents: a78716d
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Wed Aug 10 11:15:12 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Wed Aug 10 11:15:52 2016 -0700
----------------------------------------------------------------------
.../org/apache/mnemonic/collections/DurableNodeValue.java | 8 ++++++++
mnemonic-core/pom.xml | 5 +++++
mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java | 3 ++-
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/2d22b745/mnemonic-collections/src/main/java/org/apache/mnemonic/collections/DurableNodeValue.java
----------------------------------------------------------------------
diff --git a/mnemonic-collections/src/main/java/org/apache/mnemonic/collections/DurableNodeValue.java b/mnemonic-collections/src/main/java/org/apache/mnemonic/collections/DurableNodeValue.java
index 996fbe0..ed5b83b 100644
--- a/mnemonic-collections/src/main/java/org/apache/mnemonic/collections/DurableNodeValue.java
+++ b/mnemonic-collections/src/main/java/org/apache/mnemonic/collections/DurableNodeValue.java
@@ -168,5 +168,13 @@ public abstract class DurableNodeValue<E> implements Durable, Iterable<E> {
next = next.getNext();
return ret;
}
+
+ /**
+ * override remove()
+ */
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/2d22b745/mnemonic-core/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-core/pom.xml b/mnemonic-core/pom.xml
index 123c7c4..4055a8c 100644
--- a/mnemonic-core/pom.xml
+++ b/mnemonic-core/pom.xml
@@ -33,6 +33,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/2d22b745/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java
----------------------------------------------------------------------
diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java b/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java
index 2e97a1a..6fa7f3b 100644
--- a/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java
+++ b/mnemonic-core/src/main/java/org/apache/mnemonic/Utils.java
@@ -30,6 +30,7 @@ import sun.misc.Unsafe;
import java.util.Iterator;
import java.util.List;
import java.util.ServiceLoader;
+import org.apache.commons.lang3.StringUtils;
import org.apache.mnemonic.service.allocatorservice.VolatileMemoryAllocatorService;
import org.apache.mnemonic.service.computingservice.GeneralComputingService;
import org.apache.mnemonic.service.allocatorservice.NonVolatileMemoryAllocatorService;
@@ -349,7 +350,7 @@ public class Utils {
for (long[] larr : llarr) {
slist.add(toInitLiteral(larr));
}
- return "{" + String.join(",", slist) + "}";
+ return "{" + StringUtils.join(slist, ",") + "}";
}
/**