[jboss-cvs] JBossAS SVN: r64791 - in projects/microcontainer/trunk: container and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 22 19:38:15 EDT 2007


Author: pgier
Date: 2007-08-22 19:38:15 -0400 (Wed, 22 Aug 2007)
New Revision: 64791

Added:
   projects/microcontainer/trunk/deployers-client-spi/pom-jdk14.xml
   projects/microcontainer/trunk/deployers-client/pom-jdk14.xml
   projects/microcontainer/trunk/deployers-core-spi/pom-jdk14.xml
   projects/microcontainer/trunk/deployers-core/pom-jdk14.xml
   projects/microcontainer/trunk/managed/pom-jdk14.xml
Modified:
   projects/microcontainer/trunk/build/pom-jdk14.xml
   projects/microcontainer/trunk/container/pom-jdk14.xml
   projects/microcontainer/trunk/dependency/pom-jdk14.xml
   projects/microcontainer/trunk/kernel/pom-jdk14.xml
   projects/microcontainer/trunk/metatype/pom-jdk14.xml
Log:
[JBMICROCONT-93] Adding more poms for retro builds.

Modified: projects/microcontainer/trunk/build/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/build/pom-jdk14.xml	2007-08-22 22:32:04 UTC (rev 64790)
+++ projects/microcontainer/trunk/build/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -175,7 +175,7 @@
     <dependencies>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-aop-mc-int</artifactId>
+        <artifactId>jboss-aop-mc-int-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -202,80 +202,80 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers</artifactId>
+        <artifactId>jboss-deployers-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-core-spi</artifactId>
+        <artifactId>jboss-deployers-core-spi-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-core</artifactId>
+        <artifactId>jboss-deployers-core-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-core</artifactId>
+        <artifactId>jboss-deployers-core-jdk14</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-client-spi</artifactId>
+        <artifactId>jboss-deployers-client-spi-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-client</artifactId>
+        <artifactId>jboss-deployers-client-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-client</artifactId>
+        <artifactId>jboss-deployers-client-jdk14</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-structure-spi</artifactId>
+        <artifactId>jboss-deployers-structure-spi-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-structure-spi</artifactId>
+        <artifactId>jboss-deployers-structure-spi-jdk14</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-spi</artifactId>
+        <artifactId>jboss-deployers-spi-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-impl</artifactId>
+        <artifactId>jboss-deployers-impl-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-impl</artifactId>
+        <artifactId>jboss-deployers-impl-jdk14</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-vfs-spi</artifactId>
+        <artifactId>jboss-deployers-vfs-spi-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-deployers-vfs</artifactId>
+        <artifactId>jboss-deployers-vfs-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -292,27 +292,27 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-managed</artifactId>
+        <artifactId>jboss-managed-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-metatype</artifactId>
+        <artifactId>jboss-metatype-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-spring-int</artifactId>
+        <artifactId>jboss-spring-int-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-osgi-int</artifactId>
+        <artifactId>jboss-osgi-int-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer-jdk14</groupId>
-        <artifactId>jboss-osgi-repository-api</artifactId>
+        <artifactId>jboss-osgi-repository-api-jdk14</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -356,8 +356,8 @@
         <version>${version.jaxb.api}</version>
       </dependency>
       <dependency>
-        <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop</artifactId>
+        <groupId>org.jboss.aop-jdk14</groupId>
+        <artifactId>jboss-aop-jdk14</artifactId>
         <version>${version.jboss.aop}</version>
       </dependency>
       <dependency>

Modified: projects/microcontainer/trunk/container/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/container/pom-jdk14.xml	2007-08-22 22:32:04 UTC (rev 64790)
+++ projects/microcontainer/trunk/container/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -183,16 +183,17 @@
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
-      <artifactId>jboss-vfs</artifactId>
+      <artifactId>jbossxb</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbossxb</artifactId>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core-jdk14</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-logging-spi-jdk14</artifactId>
     </dependency>
+    
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss</groupId>
@@ -206,5 +207,23 @@
       <groupId>jboss.profiler.jvmti</groupId>
       <artifactId>jboss-profiler-jvmti</artifactId>
     </dependency>
+    
+    <!-- Runtime dependencies -->
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-backport-concurrent</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.management</groupId>
+      <artifactId>jmxri</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-retro</artifactId>
+      <classifier>rt</classifier>
+      <scope>runtime</scope>
+    </dependency>    
   </dependencies>
 </project>

Modified: projects/microcontainer/trunk/dependency/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom-jdk14.xml	2007-08-22 22:32:04 UTC (rev 64790)
+++ projects/microcontainer/trunk/dependency/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -23,10 +23,8 @@
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Dependency</description>
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency
-      </connection>
-    <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency
-      </developerConnection>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency</connection>
+    <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency</developerConnection>
     <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/trunk/dependency</url>
   </scm>
   <build>
@@ -151,6 +149,7 @@
       <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
 	  </dependency>
+    
     <!-- Runtime dependencies -->
     <dependency>
       <groupId>jboss</groupId>

Added: projects/microcontainer/trunk/deployers-client/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client/pom-jdk14.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-client/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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">
+  <parent>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+    <artifactId>jboss-microcontainer-jdk14</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jboss-deployers-client-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Deployers Client JDK 1.4</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>JBoss Deployers Client</description>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <classesDirectory>${project.build.directory}/test-classes-jdk14</classesDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to be run in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
+        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>  
+              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
+              <testFailureIgnore>true</testFailureIgnore>  
+              <useSystemClassLoader>true</useSystemClassLoader>    
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <includes>
+                <include>**/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
+  <dependencies>
+    <!-- Global dependencies -->
+    <dependency>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-deployers-client-spi-jdk14</artifactId>
+    </dependency>
+     <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test-jdk14</artifactId>
+    </dependency>
+    <dependency>
+	    <groupId>junit</groupId>
+	    <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-deployers-core-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>

Added: projects/microcontainer/trunk/deployers-client-spi/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom-jdk14.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-client-spi/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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">
+  <parent>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+    <artifactId>jboss-microcontainer-jdk14</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jboss-deployers-client-spi-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Deployers Client SPI JDK 1.4</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>JBoss Deployers Client SPI</description>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to be run in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
+        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>  
+              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
+              <testFailureIgnore>true</testFailureIgnore>  
+              <useSystemClassLoader>true</useSystemClassLoader>    
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <includes>
+                <include>**/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
+  <dependencies>
+    <!-- Global dependencies -->
+    <dependency>
+      <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-deployers-core-spi-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-managed-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core-jdk14</artifactId>
+    </dependency>
+  </dependencies>  
+</project>

Added: projects/microcontainer/trunk/deployers-core/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core/pom-jdk14.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-core/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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">
+  <parent>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+    <artifactId>jboss-microcontainer-jdk14</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jboss-deployers-core-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Deployers Core JDK 1.4</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>JBoss Deployers Core</description>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <classesDirectory>${project.build.directory}/test-classes-jdk14</classesDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to be run in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
+        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>  
+              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
+              <testFailureIgnore>true</testFailureIgnore>  
+              <useSystemClassLoader>true</useSystemClassLoader>    
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <includes>
+                <include>**/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
+  <dependencies>
+    <!-- Global dependencies -->
+    <dependency>
+      <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-deployers-core-spi-jdk14</artifactId>
+    </dependency>
+    <dependency>
+	    <groupId>org.jboss</groupId>
+	    <artifactId>jboss-common-core-jdk14</artifactId>
+	  </dependency>
+	  <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test-jdk14</artifactId>
+    </dependency>
+    <dependency>
+	    <groupId>junit</groupId>
+	    <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>  
+</project>

Added: projects/microcontainer/trunk/deployers-core-spi/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/pom-jdk14.xml	                        (rev 0)
+++ projects/microcontainer/trunk/deployers-core-spi/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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">
+  <parent>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+    <artifactId>jboss-microcontainer-jdk14</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jboss-deployers-core-spi-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Deployers Core SPI JDK 1.4</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>JBoss Deployers Core SPI</description>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to be run in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
+        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>  
+              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
+              <testFailureIgnore>true</testFailureIgnore>  
+              <useSystemClassLoader>true</useSystemClassLoader>    
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <includes>
+                <include>**/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
+</project>

Modified: projects/microcontainer/trunk/kernel/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom-jdk14.xml	2007-08-22 22:32:04 UTC (rev 64790)
+++ projects/microcontainer/trunk/kernel/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-kernel-jdk14</artifactId>
   <packaging>jar</packaging>
-  <name>JBoss Microcontainer Kernel</name>
+  <name>JBoss Microcontainer Kernel JDK 1.4</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Kernel</description>  
   <build>
@@ -39,7 +39,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <showDeprecation>false</showDeprecation>
-          
         </configuration>
       </plugin>
       <plugin>
@@ -88,15 +87,6 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <id>jar</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-          		<classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
-            </configuration>
-          </execution>
-          <execution>
             <id>test-jar</id>
             <goals>
               <goal>test-jar</goal>
@@ -106,6 +96,9 @@
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
       </plugin>
       <plugin>
         <!-- Skip the tests here because the jdk14 tests have

Added: projects/microcontainer/trunk/managed/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom-jdk14.xml	                        (rev 0)
+++ projects/microcontainer/trunk/managed/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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">
+  <parent>
+    <groupId>org.jboss.microcontainer-jdk14</groupId>
+    <artifactId>jboss-microcontainer-jdk14</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jboss-managed-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Microcontainer Managed JDK 1.4</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>JBoss Microcontainer Managed</description>  
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to be run in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
+        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>  
+              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
+              <testFailureIgnore>true</testFailureIgnore>  
+              <useSystemClassLoader>true</useSystemClassLoader>    
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <includes>
+                <include>**/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
+  <dependencies>
+    <!-- Global dependencies -->
+    <dependency>
+      <groupId>org.jboss.aop-jdk14</groupId>
+      <artifactId>jboss-aop-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-container-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer-jdk14</groupId>
+      <artifactId>jboss-metatype-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+    </dependency>
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Modified: projects/microcontainer/trunk/metatype/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom-jdk14.xml	2007-08-22 22:32:04 UTC (rev 64790)
+++ projects/microcontainer/trunk/metatype/pom-jdk14.xml	2007-08-22 23:38:15 UTC (rev 64791)
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-metatype-jdk14</artifactId>
   <packaging>jar</packaging>
-  <name>JBoss Microcontainer Metatype</name>
+  <name>JBoss Microcontainer Metatype JDK 1.4</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Metatype</description>
   
@@ -56,6 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
           <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
         </configuration>
@@ -124,10 +125,6 @@
               <includes>
                 <include>**/*TestCase.java</include>
               </includes>
-              <excludes>
-                <exclude>**/IsolatedClassLoaderUnitTestCase.java</exclude>
-                <exclude>**/DelegateUnitTestCase.java</exclude>
-              </excludes>
             </configuration>
           </plugin>
         </plugins>




More information about the jboss-cvs-commits mailing list