- Switched the m2 builds to use maven-one-plugin so that the activeio jars can be used in the maven 1 build activemq is using.
- the m2 build now uses the same groupId that our m1 activemq build is using. I know it's not the m2 way to name groups, we I'm willing to live with this until we are out of the incubator and using m2 to do builds by default.
- Ported activemq to use activeio 3.0-SNAPSHOT from activeio 2.1, since the 3.x stuff is in a new package space, it should not conflict with previous version (for example the version used in Geronimo).
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk/activeio@388677 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/activeio-aio/pom.xml b/activeio-aio/pom.xml
index f0b6ce1..6d94564 100644
--- a/activeio-aio/pom.xml
+++ b/activeio-aio/pom.xml
@@ -18,7 +18,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -29,12 +29,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/activeio-core/pom.xml b/activeio-core/pom.xml
index 4036e0d..3b622b0 100644
--- a/activeio-core/pom.xml
+++ b/activeio-core/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -27,6 +27,24 @@
<name>ActiveIO :: Core</name>
<description>A high performance IO abstraction framework</description>
+ <build>
+ <plugins>
+
+ <!-- generate the attached tests jar -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
<dependencies>
<!-- Required Dependencies -->
<dependency>
diff --git a/activeio-core/src/main/java/org/apache/activeio/Disposable.java b/activeio-core/src/main/java/org/apache/activeio/Disposable.java
new file mode 100644
index 0000000..27ea03f
--- /dev/null
+++ b/activeio-core/src/main/java/org/apache/activeio/Disposable.java
@@ -0,0 +1,28 @@
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activeio;
+
+
+/**
+ * @version $Revision$
+ */
+public interface Disposable {
+
+ /**
+ */
+ void dispose();
+}
diff --git a/activeio-jxta/pom.xml b/activeio-jxta/pom.xml
index 8b86c9f..dc39ccb 100644
--- a/activeio-jxta/pom.xml
+++ b/activeio-jxta/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -30,12 +30,12 @@
<dependencies>
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/activeio-oneport-jetty/pom.xml b/activeio-oneport-jetty/pom.xml
index 53e0f15..a168513 100644
--- a/activeio-oneport-jetty/pom.xml
+++ b/activeio-oneport-jetty/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -30,12 +30,12 @@
<dependencies>
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/activeio-oneport-openorb/pom.xml b/activeio-oneport-openorb/pom.xml
index 3788226..45bedeb 100644
--- a/activeio-oneport-openorb/pom.xml
+++ b/activeio-oneport-openorb/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -31,12 +31,12 @@
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq.activeio</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/pom.xml b/pom.xml
index ae2adeb..f6498cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.activemq.activeio</groupId>
+
+ <groupId>incubator-activemq</groupId>
<artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
