activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r358446 - in /incubator/activemq/trunk: activeio/BUILD.txt activeio/activeio-aio/pom.xml activeio/activeio-core/pom.xml activeio/pom.xml activemq-core/pom.xml activemq-core/src/test/resources/log4j.properties pom.xml
Date Thu, 22 Dec 2005 02:47:44 GMT
Author: chirino
Date: Wed Dec 21 18:47:39 2005
New Revision: 358446

URL: http://svn.apache.org/viewcvs?rev=358446&view=rev
Log:
tweeking the m2 build

Added:
    incubator/activemq/trunk/activeio/BUILD.txt
Modified:
    incubator/activemq/trunk/activeio/activeio-aio/pom.xml
    incubator/activemq/trunk/activeio/activeio-core/pom.xml
    incubator/activemq/trunk/activeio/pom.xml
    incubator/activemq/trunk/activemq-core/pom.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/log4j.properties
    incubator/activemq/trunk/pom.xml

Added: incubator/activemq/trunk/activeio/BUILD.txt
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/BUILD.txt?rev=358446&view=auto
==============================================================================
--- incubator/activemq/trunk/activeio/BUILD.txt (added)
+++ incubator/activemq/trunk/activeio/BUILD.txt Wed Dec 21 18:47:39 2005
@@ -0,0 +1,15 @@
+====================================================================
+Building with Maven 2
+====================================================================
+
+This module require you to manually install the ibmaio jar into your local maven 2 repository.
+
+download the package from ibm here; 
+https://www7b.software.ibm.com/dl/AW-0H8/AW-0H8-p 
+
+unpack the zip and install the file like this; 
+mvn install:install-file -Dfile=./ibmaio.jar -DartifactId=ibmaio -DgroupId=ibmaio -Dversion=1.0
-Dpackaging=jar 
+
+You should now be able to build this module with maven using:
+
+mvn install

Modified: incubator/activemq/trunk/activeio/activeio-aio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/pom.xml?rev=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/pom.xml Wed Dec 21 18:47:39 2005
@@ -12,12 +12,12 @@
   <packaging>jar</packaging>
   <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>
@@ -29,13 +29,19 @@
     <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>
+
+    <dependency>
+      <groupId>ibmaio</groupId>
+      <artifactId>ibmaio</artifactId>
+      <version>1.0</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=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Wed Dec 21 18:47:39 2005
@@ -120,12 +120,6 @@
       <version>2.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>ibmaio</groupId>
-      <artifactId>ibmaio</artifactId>
-      <version>1.0</version>
-    </dependency>
-
     <!-- For Jetty integration -->
     <dependency>
       <groupId>jetty</groupId>

Modified: incubator/activemq/trunk/activeio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Wed Dec 21 18:47:39 2005
@@ -1,12 +1,32 @@
 <project>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.activeio</groupId>
-    <artifactId>activeio</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>ActiveIO</name>
-
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.activeio</groupId>
+  <artifactId>activeio</artifactId>
+  <version>3.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>ActiveIO</name>
+  <description>A high performance IO abstraction framework</description>
+
+  <mailingLists>
+    <mailingList>
+      <name>Development List</name>
+      <subscribe>activemq-dev@geronimo.apache.org</subscribe>
+      <unsubscribe>activemq-dev@geronimo.apache.org</unsubscribe>
+      <post>activemq-dev@geronimo.apache.org</post>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk/activeio</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk/activeio</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/activeio</url>
+  </scm>
+
+  <organization>
+    <name>The ActiveIO Project</name>
+    <url>http://activeio.org</url>
+  </organization>
     <repositories>
         <repository>
             <id>openejb</id>
@@ -15,12 +35,19 @@
             <layout>legacy</layout>
         </repository>
     </repositories>
+
     <modules>
         <module>activeio-core</module>
+<!-- 
+    Disable this optional module from the default build since this contains a dependency
that cannot 
+    be automatically downloaded from a maven repository
         <module>activeio-aio</module>
+-->
+
     </modules>
     <dependencyManagement>
         <dependencies>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -40,12 +67,6 @@
                 <version>2.0_01_pd</version>
             </dependency>
 
-           <dependency>
-             <groupId>ibmaio</groupId>
-             <artifactId>ibmaio</artifactId>
-             <version>1.0</version>
-           </dependency>
-
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging-api</artifactId>
@@ -58,8 +79,10 @@
               <artifactId>log4j</artifactId>
               <version>1.2.8</version>
             </dependency>
+
        </dependencies>
     </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Wed Dec 21 18:47:39 2005
@@ -18,7 +18,6 @@
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.1-SNAPSHOT</version>
         <configuration>
           <excludes>
             <!-- These tests run too slow to execute as part of the unit tests -->
@@ -30,16 +29,13 @@
           <includes>
             <include implementation="java.lang.String">**/*Test.*</include>
           </includes>
-          <forkMode>pertest</forkMode>
         </configuration>
       </plugin>
 
       <!-- generate the attached tests jar -->
-      <!--
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-         <executions>
+        <executions>
           <execution>
             <goals>
               <goal>test-jar</goal>
@@ -47,7 +43,6 @@
           </execution>
         </executions>
       </plugin>
-      -->
 
 <!--
       <plugin>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/resources/log4j.properties?rev=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/log4j.properties (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/log4j.properties Wed Dec 21
18:47:39 2005
@@ -14,5 +14,5 @@
 log4j.appender.out=org.apache.log4j.FileAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
 log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/test-reports/activemq-test.log
+log4j.appender.out.file=target/activemq-test.log
 log4j.appender.out.append=true

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=358446&r1=358445&r2=358446&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Wed Dec 21 18:47:39 2005
@@ -63,24 +63,26 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.4</source>
-            <target>1.4</target>
-          </configuration>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-          <configuration>
-            <outputDirectory>bin</outputDirectory>
-          </configuration>
+        <configuration>
+          <outputDirectory>bin</outputDirectory>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-             <forkMode>pertest</forkMode>
-          </configuration>
+        <version>2.1.1</version>
+        <configuration>
+          <!-- <forkMode>pertest</forkMode> -->
+          <forkMode>none</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>



Mime
View raw message