[jboss-cvs] JBossAS SVN: r61637 - in projects/microcontainer/trunk: aop-mc-int and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2007-03-23 09:29:21 -0400 (Fri, 23 Mar 2007)
New Revision: 61637

Modified:
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/container/pom.xml
   projects/microcontainer/trunk/deployers/pom.xml
   projects/microcontainer/trunk/kernel/pom.xml
   projects/microcontainer/trunk/pom.xml
Log:
JBMICROCONT-117; Changed some of the resource includes to fix some of the tests.

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-03-23 11:46:35 UTC (rev 61636)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-03-23 13:29:21 UTC (rev 61637)
@@ -16,13 +16,13 @@
       <resource>
         <directory>src/resources</directory>
         <includes>
-          <include>schema/**</include>
+          <include>schema</include>
         </includes>
       </resource>
     </resources>
     <testResources>
       <testResource>
-        <directory>src/resources/test</directory>
+        <directory>src/resources/tests</directory>
       </testResource>
     </testResources>
     <plugins>

Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml	2007-03-23 11:46:35 UTC (rev 61636)
+++ projects/microcontainer/trunk/container/pom.xml	2007-03-23 13:29:21 UTC (rev 61637)
@@ -13,8 +13,36 @@
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Container</description>
   <build>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+        <includes>
+          <include>schema</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/resources</directory>
+        <includes>
+          <include>org</include>
+        </includes>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>org/jboss/test/**/*TestCase.java</include>
+          </includes>
+          <!--<excludes>
+            <exclude>org/jboss/test/**/NoJavassistAnnotationCreatorTestCase.java</exclude>
+          </excludes>-->
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>

Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml	2007-03-23 11:46:35 UTC (rev 61636)
+++ projects/microcontainer/trunk/deployers/pom.xml	2007-03-23 13:29:21 UTC (rev 61637)
@@ -12,6 +12,11 @@
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Deployers</description>
   <build>
+    <testResources>
+      <testResource>
+        <directory>src/resources/tests</directory>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>

Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml	2007-03-23 11:46:35 UTC (rev 61636)
+++ projects/microcontainer/trunk/kernel/pom.xml	2007-03-23 13:29:21 UTC (rev 61637)
@@ -16,7 +16,7 @@
       <resource>
         <directory>src/resources</directory>
         <includes>
-          <include>schema/**</include>
+          <include>schema</include>
         </includes>
       </resource>
     </resources>
@@ -25,6 +25,7 @@
         <directory>src/resources</directory>
         <includes>
           <include>org</include>
+          <include>xml-test</include>
         </includes>
       </testResource>
     </testResources>

Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml	2007-03-23 11:46:35 UTC (rev 61636)
+++ projects/microcontainer/trunk/pom.xml	2007-03-23 13:29:21 UTC (rev 61637)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>jboss</groupId>
     <artifactId>jboss-parent</artifactId>
-    <version>1</version>
+    <version>2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-microcontainer</artifactId>
@@ -60,8 +60,11 @@
         <configuration>
           <testFailureIgnore>true</testFailureIgnore>
           <includes>
-            <include>**/*TestCase.java</include>
+            <include>org/jboss/test/**/*TestCase.java</include>
           </includes>
+          <!--<excludes>
+            <exclude>org/jboss/test/**/NoJavassistAnnotationCreatorTestCase.java</exclude>
+          </excludes>-->
         </configuration>
       </plugin>
       <plugin>
@@ -85,7 +88,7 @@
       <plugin>
         <groupId>jboss.maven-plugins</groupId>
         <artifactId>jboss-deploy-maven-plugin</artifactId>
-        <version>1.1-beta</version>
+        <version>1.1</version>
         <executions>
           <execution>
             <goals>