[seam-commits] Seam SVN: r7193 - in trunk: build and 1 other directory.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-01-22 13:35:27 -0500 (Tue, 22 Jan 2008)
New Revision: 7193

Modified:
   trunk/build.xml
   trunk/build/classpath.tmpl
   trunk/build/ioc.pom.xml
   trunk/build/root.pom.xml
Log:
Exclude ioc microcontainer from builds, Ales tells me it isn't finished and needs redoing

Modified: trunk/build/classpath.tmpl
===================================================================
(Binary files differ)

Modified: trunk/build/ioc.pom.xml
===================================================================
--- trunk/build/ioc.pom.xml	2008-01-22 18:34:37 UTC (rev 7192)
+++ trunk/build/ioc.pom.xml	2008-01-22 18:35:27 UTC (rev 7193)
@@ -51,7 +51,9 @@
       <artifactId>javassist</artifactId>
     </dependency>
 
-    <dependency>
+   <!-- Microcontainer stuff isn't done -->
+
+    <!-- <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-jmx</artifactId>
       <optional>true</optional>
@@ -64,16 +66,18 @@
     </dependency>
 
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
       <optional>true</optional>
     </dependency>
-
+    
     <dependency>
-      <groupId>jboss.jboss-aop</groupId>
-      <artifactId>jboss-aop</artifactId>
+      <groupId>jboss</groupId>
+      <artifactId>jbossxb</artifactId>
       <optional>true</optional>
     </dependency>
+    
+    -->
 
     <dependency>
       <groupId>javax.persistence</groupId>
@@ -94,12 +98,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbossxb</artifactId>
-      <optional>true</optional>
-    </dependency>
-
   </dependencies>
 
 </project>
\ No newline at end of file

Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml	2008-01-22 18:34:37 UTC (rev 7192)
+++ trunk/build/root.pom.xml	2008-01-22 18:35:27 UTC (rev 7193)
@@ -690,9 +690,9 @@
       </dependency>
 
       <dependency>
-        <groupId>jboss</groupId>
+        <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-kernel</artifactId>
-        <version>2.0.0.Beta</version>
+        <version>2.0.0.Beta9</version>
         <exclusions>
           <exclusion>
             <groupId>apache-httpclient</groupId>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-01-22 18:34:37 UTC (rev 7192)
+++ trunk/build.xml	2008-01-22 18:35:27 UTC (rev 7193)
@@ -206,7 +206,12 @@
 	</target>
 
 	<target name="compileioc" depends="initioc, select-compiler">
-		<compile classesdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" classpath="compile.ioc.path" />
+		<javac source="1.5" target="1.5" destdir="${classes.ioc.dir}" srcdir="${src.ioc.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
+			<classpath>
+				<path refid="compile.ioc.path" />
+			</classpath>
+			<exclude name="org/jboss/seam/ioc/microcontainer/**/*" />
+		</javac>
 	</target>
 
 	<target name="jarioc" depends="compileioc" description="Build the distribution .jar file for the IOC package">