Update run.sh to use mvn exec

diff --git a/acid/pom.xml b/acid/pom.xml
index 1ff37be61b287a063dbe52f275c7d5dd6f256218..77748e57754ca30feea1d6544884b7af9f3e4d76 100644 (file)
--- a/acid/pom.xml
+++ b/acid/pom.xml
@@ -163,4 +163,34 @@
                        </plugin>
                </plugins>
        </build>
+
+       <profiles>
+               <profile>
+                       <activation>
+                               <os>
+                                       <family>!windows</family>
+                               </os>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>exec-maven-plugin</artifactId>
+                                               <version>1.4.0</version>
+                                               <configuration>
+                                                       <arguments>
+                                                               <argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
+                                                               <argument>-Xmx256M</argument>
+                                                               <argument>-classpath</argument>
+                                                               <classpath/>
+                                                               <argument>net.rizon.acid.core.Acidictive</argument>
+                                                       </arguments>
+                                                       <workingDirectory>${project.basedir}/..</workingDirectory>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+
 </project>

diff --git a/acid/src/main/resources/run.sh b/acid/src/main/resources/run.sh
new file mode 100755 (executable)
index 0000000..9cb9ca7
--- /dev/null
+++ b/acid/src/main/resources/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java $* >>acid.log 2>&1 &

diff --git a/run.sh b/run.sh
index 066390079234dae1c3ae10a12d417fb7828518c6..36e059fc470af8c4c5cddcc140d749c06ef07157 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-JAR=acid/target/acid-acid-4.0-SNAPSHOT-jar-with-dependencies.jar
-# TODO: LD_PRELOAD configurable here?
-java -XX:+HeapDumpOnOutOfMemoryError -Xms64m -Xmx256m -jar $JAR >geoserv.log 2>&1 &
-echo "Acidictive started"
+mvn exec:exec -pl acid -Dexec.executable=acid/src/main/resources/run.sh