You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/11/13 07:18:06 UTC
svn commit: r835751 - in /activemq/sandbox/activemq-apollo/activemq-syscall:
activemq-syscall-all/ activemq-syscall-lib/ activemq-syscall/pom.xml
activemq-syscall/src/ pom.xml src/
Author: chirino
Date: Fri Nov 13 06:18:05 2009
New Revision: 835751
URL: http://svn.apache.org/viewvc?rev=835751&view=rev
Log:
simplifying build setup.
Added:
activemq/sandbox/activemq-apollo/activemq-syscall/src/
- copied from r835750, activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/src/
Removed:
activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall-all/
activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall-lib/
activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/src/
Modified:
activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/pom.xml
activemq/sandbox/activemq-apollo/activemq-syscall/pom.xml
Modified: activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/pom.xml?rev=835751&r1=835750&r2=835751&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-syscall/activemq-syscall/pom.xml Fri Nov 13 06:18:05 2009
@@ -28,8 +28,8 @@
<artifactId>activemq-syscall</artifactId>
<version>6.0-SNAPSHOT</version>
- <name>ActiveMQ :: Syscall :: No Arch</name>
- <description>Architecture independent module</description>
+ <name>ActiveMQ :: Syscall</name>
+ <description>ActiveMQ's interface to native system calls</description>
<dependencies>
<dependency>
@@ -42,7 +42,6 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
@@ -55,11 +54,15 @@
<execution>
<id>generate</id>
<goals>
- <goal>source-generate</goal>
- <goal>build-generate</goal>
- <goal>build-make</goal>
- <goal>build-package</goal>
+ <goal>generate</goal>
+ <goal>build</goal>
+ <goal>package-jar</goal>
+ <goal>package-source</goal>
</goals>
+ <configuration>
+ <copyright><![CDATA[
+ ]]></copyright>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -70,7 +73,7 @@
<configuration>
<searchPaths>
<searchPath>META-INF</searchPath>
- <searchPath>${project.artifactId}-${project.version}-native-src</searchPath>
+ <searchPath>${project.artifactId}-${project.version}-native-src${test}</searchPath>
</searchPaths>
</configuration>
</plugin>
@@ -78,4 +81,5 @@
</plugins>
</build>
+
</project>
Modified: activemq/sandbox/activemq-apollo/activemq-syscall/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-syscall/pom.xml?rev=835751&r1=835750&r2=835751&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-syscall/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-syscall/pom.xml Fri Nov 13 06:18:05 2009
@@ -26,14 +26,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-syscall-pom</artifactId>
+ <artifactId>activemq-syscall</artifactId>
<version>6.0-SNAPSHOT</version>
- <packaging>pom</packaging>
<name>ActiveMQ :: Syscall</name>
<description>ActiveMQ's interface to native system calls</description>
<repositories>
+ <!-- to pickup the hawtjni dependency -->
<repository>
<id>mvnplugins.snapshot.m2</id>
<name>mvnplugins snapshot repository</name>
@@ -61,10 +61,61 @@
<artifactId>hawtjni-runtime</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- </dependencies>
-
- <modules>
- <module>activemq-syscall</module>
- </modules>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.fusesource.hawtjni</groupId>
+ <artifactId>maven-hawtjni-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>generate</goal>
+ <goal>build</goal>
+ <goal>package-jar</goal>
+ <goal>package-source</goal>
+ </goals>
+ <configuration>
+ <copyright><![CDATA[
+ ]]></copyright>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- older plugin versions has trouble deleting directories with symlinks in them -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <configuration>
+ <searchPaths>
+ <searchPath>META-INF</searchPath>
+ <searchPath>${project.artifactId}-${project.version}-native-src${test}</searchPath>
+ </searchPaths>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>