[jboss-cvs] JBossAS SVN: r78796 - in projects/aop/trunk: build and 1 other directory.

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

Author: pgier
Date: 2008-09-23 16:04:15 -0400 (Tue, 23 Sep 2008)
New Revision: 78796

Modified:
   projects/aop/trunk/build/build.xml
   projects/aop/trunk/pom.xml
Log:
[JBBUILD-493] Switch the aspects and asintegration modules over to maven.

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-09-23 20:01:47 UTC (rev 78795)
+++ projects/aop/trunk/build/build.xml	2008-09-23 20:04:15 UTC (rev 78796)
@@ -40,7 +40,6 @@
    -->
 
   <target name="init" unless="init.disable" depends="_buildmagic:init">
-    <property file="local.properties"/>
   </target>
 
 
@@ -76,47 +75,6 @@
     <!-- The group to use by default -->
     <property name="groups" value="default"/>
 
-    <!-- Sets up the module configuration. -->
-    <moduleconfig property="modules" selected="${groups}">
-
-      <!-- Modules -->
-      <!--<module name="aop"/>-->
-      <module name="asintegration"/>
-      <module name="aspects"/>
-
-      <!-- Module groups -->
-
-      <!--this lets you recompile a single module using a command line like
-./build.sh -emacs -Dgroups=single -Dsingle-module=server
-      -->
-      <group name="single">
-        <include modules="${single-module}"/>
-      </group>
-
-      <group name="core">
-         <!--<include modules="aop"/>-->
-         <include modules="asintegration"/>
-         <include modules="aspects"/>
-      </group>
-
-      <group name="default">
-        <include groups="core"/>
-      </group>
-
-      <group name="most">
-        <include groups="core"/>
-      </group>
-
-    </moduleconfig>
-
-    <!-- Show the module configuration -->
-    <echo>groups:  ${groups}</echo>
-    <echo>modules: ${modules}</echo>
-
-    <!-- The combined dependent module classpath -->
-    <path id="dependentmodule.classpath">
-    </path>
-
     <!-- ===== -->
     <!-- Tasks -->
     <!-- ===== -->
@@ -216,7 +174,7 @@
 
    <target name="release"
       description="Builds the default release structure."
-      depends="init, clean, maven-build-install, modules-release, aop.reference.docs"
+      depends="init, clean, maven-build-install, aop.reference.docs"
       >
       <ant antfile="build-release.xml" target="release-no-reference-docs"/>
       <ant antfile="build-release.xml" target="release-reference-docs"/>
@@ -251,7 +209,7 @@
   <!-- ================================================================== -->
 
   <!-- Clean up all build output -->
-  <target name="clean" depends="createthirdparty,maven-build-clean,_buildmagic:clean, modules-clean"
+  <target name="clean" depends="createthirdparty,maven-build-clean"
 	  description="Cleans up most generated files.">
      <delete dir="output"/>
   </target>
@@ -270,7 +228,7 @@
   <target name="main" depends="most"
 	  description="Executes the default target (most)."/>
 
-  <target name="most" depends="init, createthirdparty, maven-build-install, modules-most, install"
+  <target name="most" depends="createthirdparty, maven-build-install, install"
 	  description="Executes all modules and builds most everything."/>
 
   <target name="help" depends="_buildmagic:help:build"

Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml	2008-09-23 20:01:47 UTC (rev 78795)
+++ projects/aop/trunk/pom.xml	2008-09-23 20:04:15 UTC (rev 78796)
@@ -64,6 +64,13 @@
     </plugins>
   </build>
   
+  <modules>
+    <module>pluggable-instrumentor</module>
+    <module>aop</module>
+    <module>aspects</module>
+    <module>asintegration</module>
+  </modules>
+  
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -518,27 +525,5 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
-  <profiles>
-    <profile>
-      <id>default-build</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>pluggable-instrumentor</module>
-        <module>aop</module>
-        <module>aspects</module>
-        <module>asintegration</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>ant-integration-build</id>
-      <modules>
-        <module>pluggable-instrumentor</module>
-        <module>aop</module>
-      </modules>
-    </profile>
-  </profiles>
-  
+    
 </project>