Diff of /pom-mhive.xml [1312d5] .. [7375ab] Maximize Restore

  Switch to side-by-side view

--- a/pom-mhive.xml
+++ b/pom-mhive.xml
@@ -1,320 +1,321 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <profiles>
-    <profile>
-      <id>win32</id>
-      <activation>
-        <os>
-          <family>windows</family>
-          <arch>x86</arch>
-        </os>
-      </activation>
-      <properties>
-        <win32/>
-        <my.family>win32</my.family>
-        <exe>.exe</exe>
-        <GCC_VERSION>-vc90</GCC_VERSION>
-        <MAKE_EXECUTABLE>nmake</MAKE_EXECUTABLE>
-        <CMAKE_MAKE_PROGRAM>"NMake Makefiles"</CMAKE_MAKE_PROGRAM>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <name>Linux</name>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <my.family>linux</my.family>
-        <exe></exe>
-        <GCC_VERSION>-gcc41</GCC_VERSION>
-        <MAKE_EXECUTABLE>make</MAKE_EXECUTABLE>
-        <CMAKE_MAKE_PROGRAM>'Unix Makefiles'</CMAKE_MAKE_PROGRAM>
-      </properties>
-    </profile>
-    <profile>
-      <id>macosx</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <properties>
-        <my.family>mac</my.family>
-        <exe></exe>
-        <MAKE_EXECUTABLE>make</MAKE_EXECUTABLE>
-        <GCC_VERSION>-xgcc40</GCC_VERSION>
-        <CMAKE_MAKE_PROGRAM>"Unix Makefiles"</CMAKE_MAKE_PROGRAM>
-      </properties>
-    </profile>
-    <profile>
-      <id>solaris</id>
-      <activation>
-        <os>
-          <name>Solaris</name>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <my.family>solaris</my.family>
-        <CMAKE_MAKE_PROGRAM>"Unix Makefiles"</CMAKE_MAKE_PROGRAM>
-      </properties>
-    </profile>
-  </profiles>
-  <!--
-  <parent>
-    <artifactId>JHive</artifactId>
-    <groupId>org.esb.jhive</groupId>
-    <version>0.1.0</version>
-  </parent>-->
-  <groupId>org.esb.mhive</groupId>
-  <artifactId>mhive</artifactId>
-  <version>0.4.8</version>
-  <name>mhive</name>
-  <url>http://maven.apache.org</url>
-  <distributionManagement>
-    <repository>
-      <id>ftp-repository</id>
-      <url>ftp://codergrid.de</url>
-    </repository>
-  </distributionManagement>
-  <repositories>
-    <repository>
-      <id>esb-repo</id>
-      <url>http://codergrid.de/repository</url>
-    </repository>
-  </repositories>
-                        
-  <build>
-    <extensions>
-      <!-- Enabling the use of FTP -->
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ftp</artifactId>
-        <version>1.0-beta-6</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-dependencies</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeTypes>zip</includeTypes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-junit</artifactId>
-            <version>1.8.1</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <phase>clean</phase>
-            <id>clean</id>
-            <configuration>
-              <tasks>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="no">
-                  <arg line="clean"/>
-                </exec>
-                <exec executable="rm" dir="${project.basedir}" failonerror="no">
-                  <arg line=" -rf build"/>
-                </exec>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <phase>compile</phase>
-            <id>dowload-support</id>
-            <configuration>
-              <tasks if="win32">
-                <get src="http://codergrid.de/repository/inttypes/inttypes.h" dest="${project.build.directory}/dependency/include" verbose="true" usetimestamp="true"/>
-                <get src="http://codergrid.de/repository/inttypes/stdint.h" dest="${project.build.directory}/dependency/include" verbose="true" usetimestamp="true"/>
-                <copy file="${project.build.directory}/dependency/lib/libcurl.dll.a" tofile="${project.build.directory}/dependency/lib/libcurl.dll.lib"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <phase>compile</phase>
-            <id>compile</id>
-            <configuration>
-              <tasks>
-                <mkdir dir="build"/>
-                
-                
-                <exec executable="cmake" dir="${project.basedir}/build" failonerror="yes">
-                  <arg line="
-                    -G ${CMAKE_MAKE_PROGRAM}
-                    -DCMAKE_INSTALL_PREFIX=${project.basedir}/install
-                    -DCMAKE_BUILD_TYPE=${build_type}
-                    -DSHARED_LIBS=Off
-                    -DBOOST_DIR=${project.build.directory}/dependency
-                    -DBOOST_COMPILER=${GCC_VERSION}
-                    -DFFMPEG_DIR=${project.build.directory}/dependency
-                    -DLOG4CPLUS_DIR=${project.build.directory}/dependency
-                    -DSQLITE_DIR=${project.build.directory}/dependency
-                    -DWT_DIR=${project.build.directory}/dependency
-                    -DBUILD_TESTING=On
-                    -DBREAKPAD_DIR=${project.build.directory}/dependency
-                    -DCURL_DIR=${project.build.directory}/dependency
-                    -DINSTALLBUILDER_EXE=${env.INSTALLBUILDER_EXE}
-                    .."/>
-                </exec>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
-                  <arg line="all"/>
-                </exec>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <phase>test</phase>
-            <id>test</id>
-            <configuration>
-              <tasks>
-                <copy file="${project.basedir}/target/dependency/share/english/errmsg.sys" todir="res"/>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build/test" failonerror="yes">
-                  <env key="MYSQLD_BIN" path="${project.basedir}/target/dependency/bin/mysqld${exe}"/>
-                  <env key="MYSQL_DATA" path="${project.basedir}"/>
-                  <env key="MYSQL_LANG" path="${project.basedir}/res"/>
-                  <env key="MYSQL_BOOT" path="${project.basedir}/sql/CreateDatabase.sql"/>
-                  <env key="PATH" path="${env.PATH}:${project.basedir}/target/dependency/lib:${project.basedir}/target/dependency/bin"/>
-                  <env key="DYLD_LIBRARY_PATH" path="${project.basedir}/target/dependency/lib;${project.basedir}/target/dependency/bin"/>
-                  <arg line="test"/>
-                </exec>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <phase>prepare-package</phase>
-            <id>install</id>
-            <configuration>
-              <tasks>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
-                  <arg line="install"/>
-                </exec>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <phase>package</phase>
-            <id>package</id>
-            <configuration>
-              <tasks>
-                <chmod file="${project.build.directory}/dependency/bin/dump_syms" perm="ugo+rx"/>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
-                  <arg line="uploadsymbols"/>
-                </exec>
-                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
-                  <arg line="release"/>
-                </exec>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.esb.boost</groupId>
-      <artifactId>boost</artifactId>
-      <version>1.44.0</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.wt</groupId>
-      <artifactId>wt</artifactId>
-      <version>3.1.4</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.breakpad</groupId>
-      <artifactId>breakpad</artifactId>
-      <version>1.5</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.ffmpeg</groupId>
-      <artifactId>ffmpeg</artifactId>
-      <version>0.0</version>
-      <type>zip</type>
-      <classifier>${my.family}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.log4cplus</groupId>
-      <artifactId>log4cplus</artifactId>
-      <version>1.0.4-rc9</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.litesql</groupId>
-      <artifactId>litesql</artifactId>
-      <version>0.3.8-beta-patch-2</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.libcurl</groupId>
-      <artifactId>libcurl</artifactId>
-      <version>7.21.1-1</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.safmq</groupId>
-      <artifactId>safmq</artifactId>
-      <version>0.8.3-3</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.esb.sqlite</groupId>
-      <artifactId>sqlite</artifactId>
-      <version>3.7.2</version>
-      <type>zip</type>
-      <classifier>${my.family}-${build_type}</classifier>
-    </dependency>
-  </dependencies>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <profiles>
+    <profile>
+      <id>win32</id>
+      <activation>
+        <os>
+          <family>windows</family>
+          <arch>x86</arch>
+        </os>
+      </activation>
+      <properties>
+        <win32/>
+        <my.family>win32</my.family>
+        <exe>.exe</exe>
+        <GCC_VERSION>-vc90</GCC_VERSION>
+        <MAKE_EXECUTABLE>nmake</MAKE_EXECUTABLE>
+        <CMAKE_MAKE_PROGRAM>"NMake Makefiles"</CMAKE_MAKE_PROGRAM>
+      </properties>
+    </profile>
+    <profile>
+      <id>linux</id>
+      <activation>
+        <os>
+          <name>Linux</name>
+          <family>unix</family>
+        </os>
+      </activation>
+      <properties>
+        <my.family>linux</my.family>
+        <exe></exe>
+        <GCC_VERSION>-gcc41</GCC_VERSION>
+        <MAKE_EXECUTABLE>make</MAKE_EXECUTABLE>
+        <CMAKE_MAKE_PROGRAM>'Unix Makefiles'</CMAKE_MAKE_PROGRAM>
+      </properties>
+    </profile>
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <my.family>mac</my.family>
+        <exe></exe>
+        <MAKE_EXECUTABLE>make</MAKE_EXECUTABLE>
+        <GCC_VERSION>-xgcc40</GCC_VERSION>
+        <CMAKE_MAKE_PROGRAM>"Unix Makefiles"</CMAKE_MAKE_PROGRAM>
+      </properties>
+    </profile>
+    <profile>
+      <id>solaris</id>
+      <activation>
+        <os>
+          <name>Solaris</name>
+          <family>unix</family>
+        </os>
+      </activation>
+      <properties>
+        <my.family>solaris</my.family>
+        <CMAKE_MAKE_PROGRAM>"Unix Makefiles"</CMAKE_MAKE_PROGRAM>
+      </properties>
+    </profile>
+  </profiles>
+  <!--
+  <parent>
+    <artifactId>JHive</artifactId>
+    <groupId>org.esb.jhive</groupId>
+    <version>0.1.0</version>
+  </parent>-->
+  <groupId>org.esb.mhive</groupId>
+  <artifactId>mhive</artifactId>
+  <version>0.4.8</version>
+  <name>mhive</name>
+  <url>http://maven.apache.org</url>
+  <distributionManagement>
+    <repository>
+      <id>ftp-repository</id>
+      <url>ftp://codergrid.de</url>
+    </repository>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>esb-repo</id>
+      <url>http://codergrid.de/repository</url>
+    </repository>
+  </repositories>
+                        
+  <build>
+    <extensions>
+      <!-- Enabling the use of FTP -->
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ftp</artifactId>
+        <version>1.0-beta-6</version>
+      </extension>
+    </extensions>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-dependencies</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeTypes>zip</includeTypes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-junit</artifactId>
+            <version>1.8.1</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <phase>clean</phase>
+            <id>clean</id>
+            <configuration>
+              <tasks>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="no">
+                  <arg line="clean"/>
+                </exec>
+                <exec executable="rm" dir="${project.basedir}" failonerror="no">
+                  <arg line=" -rf build"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>compile</phase>
+            <id>dowload-support</id>
+            <configuration>
+              <tasks if="win32">
+                <get src="http://codergrid.de/repository/inttypes/inttypes.h" dest="${project.build.directory}/dependency/include" verbose="true" usetimestamp="true"/>
+                <get src="http://codergrid.de/repository/inttypes/stdint.h" dest="${project.build.directory}/dependency/include" verbose="true" usetimestamp="true"/>
+                <copy file="${project.build.directory}/dependency/lib/libcurl.dll.a" tofile="${project.build.directory}/dependency/lib/libcurl.dll.lib"/>
+                <copy file="${project.build.directory}/dependency/lib/libsqlite3.a" tofile="${project.build.directory}/dependency/lib/libsqlite3.lib"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>compile</phase>
+            <id>compile</id>
+            <configuration>
+              <tasks>
+                <mkdir dir="build"/>
+                
+                
+                <exec executable="cmake" dir="${project.basedir}/build" failonerror="yes">
+                  <arg line="
+                    -G ${CMAKE_MAKE_PROGRAM}
+                    -DCMAKE_INSTALL_PREFIX=${project.basedir}/install
+                    -DCMAKE_BUILD_TYPE=${build_type}
+                    -DSHARED_LIBS=Off
+                    -DBOOST_DIR=${project.build.directory}/dependency
+                    -DBOOST_COMPILER=${GCC_VERSION}
+                    -DFFMPEG_DIR=${project.build.directory}/dependency
+                    -DLOG4CPLUS_DIR=${project.build.directory}/dependency
+                    -DSQLITE_DIR=${project.build.directory}/dependency
+                    -DWT_DIR=${project.build.directory}/dependency
+                    -DBUILD_TESTING=On
+                    -DBREAKPAD_DIR=${project.build.directory}/dependency
+                    -DCURL_DIR=${project.build.directory}/dependency
+                    -DINSTALLBUILDER_EXE=${env.INSTALLBUILDER_EXE}
+                    .."/>
+                </exec>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
+                  <arg line="all"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>test</phase>
+            <id>test</id>
+            <configuration>
+              <tasks>
+                <copy file="${project.basedir}/target/dependency/share/english/errmsg.sys" todir="res"/>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build/test" failonerror="yes">
+                  <env key="MYSQLD_BIN" path="${project.basedir}/target/dependency/bin/mysqld${exe}"/>
+                  <env key="MYSQL_DATA" path="${project.basedir}"/>
+                  <env key="MYSQL_LANG" path="${project.basedir}/res"/>
+                  <env key="MYSQL_BOOT" path="${project.basedir}/sql/CreateDatabase.sql"/>
+                  <env key="PATH" path="${env.PATH}:${project.basedir}/target/dependency/lib:${project.basedir}/target/dependency/bin"/>
+                  <env key="DYLD_LIBRARY_PATH" path="${project.basedir}/target/dependency/lib;${project.basedir}/target/dependency/bin"/>
+                  <arg line="test"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>prepare-package</phase>
+            <id>install</id>
+            <configuration>
+              <tasks>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
+                  <arg line="install"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <phase>package</phase>
+            <id>package</id>
+            <configuration>
+              <tasks>
+                <chmod file="${project.build.directory}/dependency/bin/dump_syms" perm="ugo+rx"/>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
+                  <arg line="uploadsymbols"/>
+                </exec>
+                <exec executable="${MAKE_EXECUTABLE}" dir="${project.basedir}/build" failonerror="yes">
+                  <arg line="release"/>
+                </exec>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.esb.boost</groupId>
+      <artifactId>boost</artifactId>
+      <version>1.44.0</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.wt</groupId>
+      <artifactId>wt</artifactId>
+      <version>3.1.4</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.breakpad</groupId>
+      <artifactId>breakpad</artifactId>
+      <version>1.5</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.ffmpeg</groupId>
+      <artifactId>ffmpeg</artifactId>
+      <version>0.0</version>
+      <type>zip</type>
+      <classifier>${my.family}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.log4cplus</groupId>
+      <artifactId>log4cplus</artifactId>
+      <version>1.0.4-rc9</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.litesql</groupId>
+      <artifactId>litesql</artifactId>
+      <version>0.3.8-beta-patch-2</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.libcurl</groupId>
+      <artifactId>libcurl</artifactId>
+      <version>7.21.1-1</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.safmq</groupId>
+      <artifactId>safmq</artifactId>
+      <version>0.8.3-3</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.esb.sqlite</groupId>
+      <artifactId>sqlite</artifactId>
+      <version>3.7.2</version>
+      <type>zip</type>
+      <classifier>${my.family}-${build_type}</classifier>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>