Author: jstrachan
Date: Tue Dec 20 06:51:33 2005
New Revision: 358012
URL: http://svn.apache.org/viewcvs?rev=358012&view=rev
Log:
Applied Bills patch for m2 build
Modified:
incubator/activemq/trunk/activeio/activeio-aio/pom.xml
incubator/activemq/trunk/activeio/activeio-core/pom.xml
Modified: incubator/activemq/trunk/activeio/activeio-aio/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/pom.xml?rev=358012&r1=358011&r2=358012&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/pom.xml Tue Dec 20 06:51:33
2005
@@ -1,18 +1,41 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>activemq</groupId>
+ <parent>
+ <groupId>org.apache.activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>activeio-aio</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
+ <name>ActiveIO :: AIO</name>
+ <url>http://activeio.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activeio</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
</dependency>
</dependencies>
</project>
Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=358012&r1=358011&r2=358012&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Tue Dec 20 06:51:33
2005
@@ -2,30 +2,113 @@
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>activeio-core</artifactId>
<name>ActiveIO :: Core</name>
- <version>3.0-SNAPSHOT</version>
<description></description>
<url>http://activeio.org/</url>
+ <mailingLists>
+ <mailingList>
+ <name>activeio dev</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>activeio users</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>activeio svn messages</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>chirino</id>
+ <name>Hiram Chirino</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <roles>
+ <role>Founder</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>adc</id>
+ <name>Alan D. Cabrera</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <roles>
+ <role>Founder</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>dblevins</id>
+ <name>David Blevins</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <roles>
+ <role>Founder</role>
+ </roles>
+ </developer>
+ </developers>
+ <scm>
+ <!-- TODO: Need to update SCM to apache -->
+
<connection>scm:svn:hvttps://svn.codehaus.org/activeio/trunk/activeio</connection>
+
<developerConnection>scm:svn:svn+ssh://svn.activeio.org/home/projects/activeio/scm/trunk/activeio</developerConnection>
+ <url>http://svn.activeio.org/viewcvs.cgi/activeio/</url>
+ </scm>
+ <organization>
+ <name>The ActiveIO Project</name>
+ <url>http://activeio.org</url>
+ </organization>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
+ <!-- Required Dependencies -->
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>2.0_01_pd</version>
</dependency>
+
+ <!-- Optional Dependencies -->
+
+ <!-- For HOWL integration -->
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>0.1.8</version>
</dependency>
+
+ <!-- For JXTA integration -->
<dependency>
<groupId>p2psockets</groupId>
<artifactId>p2psockets-core</artifactId>
@@ -36,19 +119,21 @@
<artifactId>jxta</artifactId>
<version>2.0</version>
</dependency>
-<!--
+
<dependency>
<groupId>ibmaio</groupId>
<artifactId>ibmaio</artifactId>
<version>1.0</version>
</dependency>
--->
+
+ <!-- For Jetty integration -->
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.2-SNAPSHOT</version>
+ <version>5.1.2</version>
</dependency>
-<!--
+
+ <!-- For OpenORB integration -->
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb</artifactId>
@@ -79,27 +164,35 @@
<artifactId>avalon-logkit</artifactId>
<version>1.2.2</version>
</dependency>
--->
+
+ <!-- Unit Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
</dependency>
+
+ <!-- Used by journal performance testing tools -->
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>1.4-rc4</version>
</dependency>
+
+ <!-- Used in testing -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -110,6 +203,8 @@
<artifactId>commons-collections</artifactId>
<version>2.1</version>
</dependency>
+
+ <!-- Used by xnet GBean code -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>