Merge pull request #6 from judovana/javac-h

Replaced javah with javac -h

Author: chflood

JavaCriuJar/pom.xml

@@ -59,7 +59,25 @@
                     <source>8</source>
                     <target>8</target>
                 </configuration>
-            </plugin>
+                <executions>
+                    <execution>
+                        <id>header-generation</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                       <configuration>
+                            <compilerArgs>
+                                <arg>-h</arg>
+                                <arg>${project.build.directory}/native/javah</arg>
+                            </compilerArgs>
+                            <includes>
+                                 <include>org/checkpoint/CheckpointRestore.java</include>
+                            </includes>
+                      </configuration>
+                   </execution>
+               </executions>
+           </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M5</version>
@@ -68,27 +86,6 @@
                     <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>native-maven-plugin</artifactId>
-                <version>1.0-alpha-11</version>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>javah</goal>
-                        </goals>
-                        <configuration>
-                            <javahIncludes>
-                                <javahInclude>
-                                    <className>org.checkpoint.CheckpointRestore</className>
-                                    <headerName>org_checkpoint_CheckpointRestore.hpp</headerName>
-                                </javahInclude>
-                            </javahIncludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>

JavaCriuJar/src/main/cpp/org_checkpoint_CheckpointRestore.cpp

@@ -21,7 +21,7 @@
  */
 
 
-#include "org_checkpoint_CheckpointRestore.hpp"
+#include "org_checkpoint_CheckpointRestore.h"
 #include <criu.h>
 #include <dirent.h>
 #include <errno.h>