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

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

Author: adrian at jboss.org
Date: 2008-03-09 10:47:04 -0400 (Sun, 09 Mar 2008)
New Revision: 70590

Modified:
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/classloading-vfs/pom.xml
   projects/microcontainer/trunk/classloading/pom.xml
   projects/microcontainer/trunk/deployers-client-spi/pom.xml
   projects/microcontainer/trunk/guice-int/pom.xml
   projects/microcontainer/trunk/kernel/pom.xml
   projects/microcontainer/trunk/pom.xml
   projects/microcontainer/trunk/spring-int/pom.xml
Log:
[JBMAN-3] - Update to external jboss managed - currently snapshot

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -249,6 +249,11 @@
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>javassist</artifactId>
     </dependency>

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/build/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -32,6 +32,7 @@
   </scm>
 
   <properties>
+    <version.jboss.man>2.0.0-SNAPSHOT</version.jboss.man>
     <version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
     <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
     <version.jbossxb>2.0.0-SNAPSHOT</version.jbossxb>
@@ -290,14 +291,14 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.jboss.microcontainer</groupId>
+        <groupId>org.jboss.man</groupId>
         <artifactId>jboss-managed</artifactId>
-        <version>${project.version}</version>
+        <version>${version.jboss.man}</version>
       </dependency>
       <dependency>
-        <groupId>org.jboss.microcontainer</groupId>
+        <groupId>org.jboss.man</groupId>
         <artifactId>jboss-metatype</artifactId>
-        <version>${project.version}</version>
+        <version>${version.jboss.man}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>

Modified: projects/microcontainer/trunk/classloading/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloading/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/classloading/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -28,6 +28,11 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-classloader</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+    </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss</groupId>

Modified: projects/microcontainer/trunk/classloading-vfs/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/classloading-vfs/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -31,6 +31,11 @@
       <artifactId>jboss-classloading</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-vfs</artifactId>
       <exclusions>

Modified: projects/microcontainer/trunk/deployers-client-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/deployers-client-spi/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -18,7 +18,7 @@
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
     </dependency>
   </dependencies>  

Modified: projects/microcontainer/trunk/guice-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/guice-int/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/guice-int/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -33,6 +33,11 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>

Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/kernel/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -76,8 +76,9 @@
       <artifactId>jboss-dependency</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>

Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -32,8 +32,6 @@
   <modules>
     <module>build</module>
     <module>dependency</module>
-    <module>metatype</module>
-    <module>managed</module>
     <module>kernel</module>
     <module>aop-mc-int</module>
     <module>deployers-core-spi</module>

Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml	2008-03-09 14:30:16 UTC (rev 70589)
+++ projects/microcontainer/trunk/spring-int/pom.xml	2008-03-09 14:47:04 UTC (rev 70590)
@@ -29,6 +29,11 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss</groupId>