[jboss-svn-commits] JBL Code SVN: r26786 - in labs/jbossbuild/buildmagic/tags: buildmagic-2.1.1/build and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri May 29 15:38:23 EDT 2009


Author: pgier
Date: 2009-05-29 15:38:22 -0400 (Fri, 29 May 2009)
New Revision: 26786

Added:
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf
Removed:
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf
Modified:
   labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tools/etc/buildmagic/defaults.ent
Log:
Create tag for buildmagic 2.1.1 release

Copied: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1 (from rev 26570, labs/jbossbuild/buildmagic/trunk)

Deleted: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/build/build.xml	2009-05-15 18:46:31 UTC (rev 26570)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml	2009-05-29 19:38:22 UTC (rev 26786)
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
-  <!ENTITY tools      SYSTEM "../tools/etc/buildmagic/tools.ent">
-  <!ENTITY modules    SYSTEM "../tools/etc/buildmagic/modules.ent">
-  <!ENTITY defaults   SYSTEM "../tools/etc/buildmagic/defaults.ent">
-]>
-
-<!-- $Id$ -->
-
-<!--+======================================================================+-->
-<!--| JBoss (The OpenSource J2EE WebOS) Build File                         |-->
-<!--|                                                                      |-->
-<!--| Distributable under LGPL license.                                    |-->
-<!--| See terms of license at http://www.gnu.org.                          |-->
-<!--|                                                                      |-->
-<!--| This file has been designed to work with the 'tools' module and      |-->
-<!--| Buildmagic extentions.                                               |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Buildmagic">
-
-  <!--+====================================================================+-->
-  <!--| Setup                                                              |-->
-  <!--|                                                                    |-->
-  <!--| Include the common build elements.                                 |-->
-  <!--|                                                                    |-->
-  <!--| This defines several different targets, properties and paths.      |-->
-  <!--| It also sets up the basic extention tasks amoung other things.     |-->
-  <!--+====================================================================+-->
-
-  &buildmagic;
-  &defaults;
-  &tools;
-
-
-  <!--+====================================================================+-->
-  <!--| Initialization                                                     |-->
-  <!--|                                                                    |-->
-  <!--| Initialize the build system.  Other targets should depend on       |-->
-  <!--| 'init'.                                                            |-->
-  <!--+====================================================================+-->
-
-  <target name="init" depends="_buildmagic:init">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <!-- fake, to keep tests target happy -->
-  <target name="compile" depends="init"/>
-
-
-  <!--+====================================================================+-->
-  <!--| Configuration                                                      |-->
-  <!--|                                                                    |-->
-  <!--| This target is invoked by the Buildmagic initialization logic      |-->
-  <!--| and should contain module specific configuration elements.         |-->
-  <!--+====================================================================+-->
-
-  <target name="configure" unless="configure.disable">
-
-    <!--+==============================+-->
-    <!--| Project version information. |-->
-    <!--+==============================+-->
-
-    <!-- Version identifiers for the server. -->
-    <property name="version.major" value="2"/>
-    <property name="version.minor" value="1"/>
-    <property name="version.revision" value="0"/>
-    <property name="version.tag" value="ga"/>
-    <property name="version.name" value="supyo"/>
-
-    <!-- Module name(s) & version -->
-    <!-- =================== -->
-    <!-- Basic Configuration -->
-    <!-- =================== -->
-
-    <!-- Module name(s) & version -->
-    <property name="module.name" value="buildmagic"/>
-    <property name="module.Name" value="Buildmagic Build"/>
-    <property name="module.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
-
-    <!--+================================+-->
-    <!--| Library & Module Dependencies. |-->
-    <!--+================================+-->
-
-    <!-- Configure thirdparty libraries -->
-    <!--<call target="configure-libraries"/>-->
-    <path id="library.classpath">
-       <!-- Add thirdparty library elements here. -->
-    </path>
-
-    <!-- Configure modules -->
-    <!--<call target="configure-modules"/>-->
-    <path id="dependentmodule.classpath">
-       <!-- Add dependent module classpath elements here. -->
-    </path>
-
-    <!--+=======================================+-->
-    <!--| Override any default properties here. |-->
-    <!--+=======================================+-->
-
-    <!-- Configure defaults & build tools --> 
-    <call target="configure-defaults"/>
-    <call target="configure-tools"/>
-
-    <!--+=======================================+-->
-    <!--| Define module specific elements here. |-->
-    <!--+=======================================+-->
-
-    <!--+================================+-->
-    <!--| Define project structure here. |-->
-    <!--+================================+-->
-
-    <!-- The group to use by default -->
-    <property name="groups" value="default"/>
-
-    <!-- Sets up the module configuration. -->
-    <moduleconfig property="modules" selected="${groups}">
-
-      <!-- Modules -->
-
-      <!--<module name="common"/>-->
-      <module name="tasks"/>
-
-      <!-- Module groups -->
-
-      <group name="core">
-        <include modules="tasks"/>
-      </group>
-
-      <group name="default">
-        <include groups="core"/>
-      </group>
-
-    </moduleconfig>
-
-    <!-- Configure project defaults -->
-    <!--<call target="configure-project"/>-->
-    
-    <!-- ===== -->
-    <!-- Tasks -->
-    <!-- ===== -->
-
-    <!-- Skip any missing modules and issue a warning -->
-    <property name="executemodules.skipmissing" value="true"/>
-
-    <!-- The header and footer displayed during each module execution -->
-    <property name="executemodules.header"><![CDATA[
-    ======================================================================
-    ==  Header Executing '${target}' in module '${module}'...
-    ==]]></property>
-
-    <property name="executemodules.footer"><![CDATA[
-    ==
-    ==  Footer Finished with '${target}' in module '${module}'.
-    ======================================================================
-    ]]></property>
-
-    <property name="executemodules.exportproperties">
-       version.major,
-       version.minor,
-       version.revision,
-       version.tag,
-       version.name,
-       version.svntag,
-
-       specification.title,
-       specification.version,
-       specification.vendor,
-
-       implementation.title,
-       implementation.version,
-       implementation.vendor,
-       implementation.vendor.id,
-       implementation.url
-    </property>
-
-
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Module Pass-through Targets                                        -->
-  <!-- ================================================================== -->
-
-  <!--
-     | These targets will execute all configured modules with the specified
-     | target.
-   -->
-  <target name="modules-all" depends="_buildmagic:modules:all" />
-  <target name="modules-most" depends="_buildmagic:modules:most" />
-  <target name="modules-main" depends="_buildmagic:modules:main"/>
-  <target name="modules-release" depends="_buildmagic:modules:release"/>
-  <target name="modules-tests" depends="_buildmagic:modules:tests"/>
-  <target name="modules-clean" depends="_buildmagic:modules:clean"/>
-  <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
-  <target name="modules-docs" depends="_buildmagic:modules:docs"/>
-
-  <!--+====================================================================+-->
-  <!--| Module Pass-through Hooks                                          |-->
-  <!--|                                                                    |-->
-  <!--| These hooks are executed after the above pass-through targets have |-->
-  <!--| finished with a given module.                                      |-->
-  <!--+====================================================================+-->
-
-  <!-- ====== -->
-  <!-- Common -->
-  <!-- ====== -->
-
-  <target name="_module-common-most">
-    <property name="_module.name" value="common" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- ??? -->
-
-  </target>
-
-  <target name="_module-common-all" depends="_module-common-most">
-
-    <!-- ??? -->
-
-  </target>
-
-  <!-- ===== -->
-  <!-- Tasks -->
-  <!-- ===== -->
-
-  <target name="_module-tasks-most">
-    <property name="_module.name" value="tasks" override="true"/>
-    <property name="_module.output" override="true"
-	      value="${project.root}/${_module.name}/output"/>
-
-    <!-- ??? -->
-
-  </target>
-
-  <target name="_module-tasks-all" depends="_module-tasks-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-         <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Generate Output                                                    |-->
-  <!--|                                                                    |-->
-  <!--| Generates the target output for this module. Target output is      |-->
-  <!--| the output which is ment to be released or used by external        |-->
-  <!--| modules.                                                           |-->
-  <!--+====================================================================+-->
-
-  <target name="output"
-	  description="Generate all target output."
-	  depends="init">
-    <!-- Add module specific elements here. -->
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Documents                                                          |-->
-  <!--|                                                                    |-->
-  <!--| Generate all documentation for this module.                        |-->
-  <!--+====================================================================+-->
-
-  <target name="docs">
-    <!-- Add module specific elements here. -->
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Install & Release                                                  |-->
-  <!--+====================================================================+-->
-
-  <target name="release"
-	  description="Builds the default release structure."
-	  depends="modules-most, output"/>
-
-  <target name="release-full" 
-	  description="Builds the full release structure."
-	  depends="modules-most, release"/>
-
-
-  <!--+====================================================================+-->
-  <!--| Misc.                                                              |-->
-  <!--|                                                                    |-->
-  <!--| Standard targets and psuedo-targets.                               |-->
-  <!--+====================================================================+-->
-
-  <target name="clean" depends="init, modules-clean, _buildmagic:clean"
-	  description="Cleans up most generated files.">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
-	  description="Cleans up all generated files.">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <target name="main" depends="most"
-	  description="Executes the default target (most)."/>
-    
-  <target name="all" depends="modules-all"
-	  description="Executes all modules and builds everything."/>
-
-  <target name="most" depends="modules-most"
-	  description="Executes all modules and builds most everything."/>
-
-  <target name="help" depends="_buildmagic:help:build"
-          description="Show this help message."/>
-
-</project>

Copied: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml (from rev 26785, labs/jbossbuild/buildmagic/trunk/build/build.xml)
===================================================================
--- labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml	                        (rev 0)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/build/build.xml	2009-05-29 19:38:22 UTC (rev 26786)
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+  <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+  <!ENTITY tools      SYSTEM "../tools/etc/buildmagic/tools.ent">
+  <!ENTITY defaults   SYSTEM "../tools/etc/buildmagic/defaults.ent">
+]>
+
+<!-- $Id$ -->
+
+<!--+======================================================================+-->
+<!--| JBoss (The OpenSource J2EE WebOS) Build File                         |-->
+<!--|                                                                      |-->
+<!--| Distributable under LGPL license.                                    |-->
+<!--| See terms of license at http://www.gnu.org.                          |-->
+<!--|                                                                      |-->
+<!--| This file has been designed to work with the 'tools' module and      |-->
+<!--| Buildmagic extentions.                                               |-->
+<!--+======================================================================+-->
+
+<project default="main" name="JBoss Buildmagic">
+
+  <!--+====================================================================+-->
+  <!--| Setup                                                              |-->
+  <!--|                                                                    |-->
+  <!--| Include the common build elements.                                 |-->
+  <!--|                                                                    |-->
+  <!--| This defines several different targets, properties and paths.      |-->
+  <!--| It also sets up the basic extention tasks amoung other things.     |-->
+  <!--+====================================================================+-->
+
+  &buildmagic;
+  &defaults;
+  &tools;
+
+
+  <!--+====================================================================+-->
+  <!--| Initialization                                                     |-->
+  <!--|                                                                    |-->
+  <!--| Initialize the build system.  Other targets should depend on       |-->
+  <!--| 'init'.                                                            |-->
+  <!--+====================================================================+-->
+
+  <target name="init" depends="_buildmagic:init">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <!-- fake, to keep tests target happy -->
+  <target name="compile" depends="init"/>
+
+
+  <!--+====================================================================+-->
+  <!--| Configuration                                                      |-->
+  <!--|                                                                    |-->
+  <!--| This target is invoked by the Buildmagic initialization logic      |-->
+  <!--| and should contain module specific configuration elements.         |-->
+  <!--+====================================================================+-->
+
+  <target name="configure" unless="configure.disable">
+
+    <!-- Module name(s) & version -->
+    <!-- =================== -->
+    <!-- Basic Configuration -->
+    <!-- =================== -->
+
+    <!-- Module name(s) & version -->
+    <property name="module.name" value="buildmagic"/>
+    <property name="module.Name" value="Buildmagic Build"/>
+
+    <!--+================================+-->
+    <!--| Library & Module Dependencies. |-->
+    <!--+================================+-->
+
+    <!-- Configure thirdparty libraries -->
+    <!--<call target="configure-libraries"/>-->
+    <path id="library.classpath">
+       <!-- Add thirdparty library elements here. -->
+    </path>
+
+    <!-- Configure modules -->
+    <!--<call target="configure-modules"/>-->
+    <path id="dependentmodule.classpath">
+       <!-- Add dependent module classpath elements here. -->
+    </path>
+
+    <!--+=======================================+-->
+    <!--| Override any default properties here. |-->
+    <!--+=======================================+-->
+
+    <!-- Configure defaults & build tools --> 
+    <call target="configure-defaults"/>
+    <call target="configure-tools"/>
+
+    <!--+=======================================+-->
+    <!--| Define module specific elements here. |-->
+    <!--+=======================================+-->
+
+    <!--+================================+-->
+    <!--| Define project structure here. |-->
+    <!--+================================+-->
+
+    <!-- The group to use by default -->
+    <property name="groups" value="default"/>
+
+    <!-- Sets up the module configuration. -->
+    <moduleconfig property="modules" selected="${groups}">
+
+      <!-- Modules -->
+
+      <!--<module name="common"/>-->
+      <module name="tasks"/>
+
+      <!-- Module groups -->
+
+      <group name="core">
+        <include modules="tasks"/>
+      </group>
+
+      <group name="default">
+        <include groups="core"/>
+      </group>
+
+    </moduleconfig>
+
+    <!-- Configure project defaults -->
+    <!--<call target="configure-project"/>-->
+    
+    <!-- ===== -->
+    <!-- Tasks -->
+    <!-- ===== -->
+
+    <!-- Skip any missing modules and issue a warning -->
+    <property name="executemodules.skipmissing" value="true"/>
+
+    <!-- The header and footer displayed during each module execution -->
+    <property name="executemodules.header"><![CDATA[
+    ======================================================================
+    ==  Header Executing '${target}' in module '${module}'...
+    ==]]></property>
+
+    <property name="executemodules.footer"><![CDATA[
+    ==
+    ==  Footer Finished with '${target}' in module '${module}'.
+    ======================================================================
+    ]]></property>
+
+    <property name="executemodules.exportproperties">
+       version.major,
+       version.minor,
+       version.revision,
+       version.tag,
+       version.name,
+       version.svntag,
+
+       specification.title,
+       specification.version,
+       specification.vendor,
+
+       implementation.title,
+       implementation.version,
+       implementation.vendor,
+       implementation.vendor.id,
+       implementation.url
+    </property>
+
+
+  </target>
+
+
+  <!-- ================================================================== -->
+  <!-- Module Pass-through Targets                                        -->
+  <!-- ================================================================== -->
+
+  <!--
+     | These targets will execute all configured modules with the specified
+     | target.
+   -->
+  <target name="modules-all" depends="_buildmagic:modules:all" />
+  <target name="modules-most" depends="_buildmagic:modules:most" />
+  <target name="modules-main" depends="_buildmagic:modules:main"/>
+  <target name="modules-release" depends="_buildmagic:modules:release"/>
+  <target name="modules-tests" depends="_buildmagic:modules:tests"/>
+  <target name="modules-clean" depends="_buildmagic:modules:clean"/>
+  <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
+  <target name="modules-docs" depends="_buildmagic:modules:docs"/>
+
+  <!--+====================================================================+-->
+  <!--| Module Pass-through Hooks                                          |-->
+  <!--|                                                                    |-->
+  <!--| These hooks are executed after the above pass-through targets have |-->
+  <!--| finished with a given module.                                      |-->
+  <!--+====================================================================+-->
+
+  <!-- ====== -->
+  <!-- Common -->
+  <!-- ====== -->
+
+  <target name="_module-common-most">
+    <property name="_module.name" value="common" override="true"/>
+    <property name="_module.output" override="true"
+	      value="${project.root}/${_module.name}/output"/>
+
+    <!-- ??? -->
+
+  </target>
+
+  <target name="_module-common-all" depends="_module-common-most">
+
+    <!-- ??? -->
+
+  </target>
+
+  <!-- ===== -->
+  <!-- Tasks -->
+  <!-- ===== -->
+
+  <target name="_module-tasks-most">
+    <property name="_module.name" value="tasks" override="true"/>
+    <property name="_module.output" override="true"
+	      value="${project.root}/${_module.name}/output"/>
+
+    <!-- ??? -->
+
+  </target>
+
+  <target name="_module-tasks-all" depends="_module-tasks-most">
+    <!-- Copy the generated javadocs -->
+    <mkdir dir="${install.api}/${_module.name}"/>
+    <copy todir="${install.api}/${_module.name}" filtering="no">
+      <fileset dir="${_module.output}/api">
+         <include name="**/*"/>
+      </fileset>
+    </copy>
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Generate Output                                                    |-->
+  <!--|                                                                    |-->
+  <!--| Generates the target output for this module. Target output is      |-->
+  <!--| the output which is ment to be released or used by external        |-->
+  <!--| modules.                                                           |-->
+  <!--+====================================================================+-->
+
+  <target name="output"
+	  description="Generate all target output."
+	  depends="init">
+    <!-- Add module specific elements here. -->
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Documents                                                          |-->
+  <!--|                                                                    |-->
+  <!--| Generate all documentation for this module.                        |-->
+  <!--+====================================================================+-->
+
+  <target name="docs">
+    <!-- Add module specific elements here. -->
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Install & Release                                                  |-->
+  <!--+====================================================================+-->
+
+  <target name="release"
+	  description="Builds the default release structure."
+	  depends="modules-most, output, sources"/>
+
+  <target name="release-full" 
+	  description="Builds the full release structure."
+	  depends="modules-most, release"/>
+
+  <target name="sources" depends="init"
+      description="Generate source dist zip">
+  
+      <mkdir dir="${module.output}"/>
+      <zip destfile="${module.output}/buildmagic-${version.major}.${version.minor}.${version.revision}.${version.tag}-src.zip">
+        <fileset dir="${project.root}">
+          <exclude name="**/output/*"/>
+          <include name="**/build.xml"/>
+          <include name="**/ivy.xml"/>
+          <include name="**/build.bat"/>
+          <include name="**/build.sh"/>
+          <include name="*/src/**"/>
+          <include name="*/etc/**"/>
+          <include name="tools/**"/>
+        </fileset>
+      </zip>
+  </target>
+
+  <!--+====================================================================+-->
+  <!--| Misc.                                                              |-->
+  <!--|                                                                    |-->
+  <!--| Standard targets and psuedo-targets.                               |-->
+  <!--+====================================================================+-->
+
+  <target name="clean" depends="init, modules-clean, _buildmagic:clean"
+	  description="Cleans up most generated files.">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
+	  description="Cleans up all generated files.">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <target name="main" depends="most"
+	  description="Executes the default target (most)."/>
+    
+  <target name="all" depends="modules-all"
+	  description="Executes all modules and builds everything."/>
+
+  <target name="most" depends="modules-most"
+	  description="Executes all modules and builds most everything."/>
+
+  <target name="help" depends="_buildmagic:help:build"
+          description="Show this help message."/>
+
+</project>

Deleted: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/build.xml	2009-05-15 18:46:31 UTC (rev 26570)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml	2009-05-29 19:38:22 UTC (rev 26786)
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
-  <!ENTITY tools      SYSTEM "../tools/etc/buildmagic/tools.ent">
-  <!ENTITY modules    SYSTEM "../tools/etc/buildmagic/modules.ent">
-  <!ENTITY defaults   SYSTEM "../tools/etc/buildmagic/defaults.ent">
-]>
-
-<!-- $Id$ -->
-
-<!--+======================================================================+-->
-<!--| JBoss (The OpenSource J2EE WebOS) Build File                         |-->
-<!--|                                                                      |-->
-<!--| Distributable under LGPL license.                                    |-->
-<!--| See terms of license at http://www.gnu.org.                          |-->
-<!--|                                                                      |-->
-<!--| This file has been designed to work with the 'tools' module and      |-->
-<!--| Buildmagic extentions.                                               |-->
-<!--+======================================================================+-->
-
-<project name="Buildmagic/Tasks" default="main" xmlns:ivy="antlib:org.apache.ivy.ant">
-
-  <!--+====================================================================+-->
-  <!--| Setup                                                              |-->
-  <!--|                                                                    |-->
-  <!--| Include the common build elements.                                 |-->
-  <!--|                                                                    |-->
-  <!--| This defines several different targets, properties and paths.      |-->
-  <!--| It also sets up the basic extention tasks amoung other things.     |-->
-  <!--+====================================================================+-->
-
-  &buildmagic;
-  &defaults;
-  &tools;
-
-  <!-- Initialize Ivy Tasks -->
-  <path id="ivy.classpath" path="../tools/apache-ivy/ivy-2.0.0-rc2.jar" />
-  <typedef resource="org/apache/ivy/ant/antlib.xml"
-           uri="antlib:org.apache.ivy.ant"
-           classpathref="ivy.classpath" />
-  
-  <target name="resolve-compile-dependencies" description="Retreive dependencies with ivy">
-    <ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
-    <ivy:cachefileset setid="compile-dependencies" conf="compile"/>
-    <path id="library.classpath">
-      <fileset refid="compile-dependencies"/>
-    </path>
-  </target>
-  
-  <target name="resolve-test-dependencies" description="Retreive dependencies with ivy">
-    <ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
-    <ivy:cachefileset setid="test-dependencies" conf="test"/>
-    <path id="test.dependencies.classpath">
-      <fileset refid="test-dependencies"/>
-    </path>
-  </target>
-
-  <!--+====================================================================+-->
-  <!--| Initialization                                                     |-->
-  <!--|                                                                    |-->
-  <!--| Initialize the build system.  Other targets should depend on       |-->
-  <!--| 'init'.                                                            |-->
-  <!--+====================================================================+-->
-
-  <target name="init" depends="_buildmagic:init">
-    
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Configuration                                                      |-->
-  <!--|                                                                    |-->
-  <!--| This target is invoked by the Buildmagic initialization logic      |-->
-  <!--| and should contain module specific configuration elements.         |-->
-  <!--+====================================================================+-->
-
-  <target name="configure" unless="configure.disable">
-
-    <!-- Module name(s) & version -->
-    <property name="module.name" value="tasks"/>
-    <property name="module.Name" value="Buildmagic/Tasks"/>
-    
-    <!--+================================+-->
-    <!--| Library & Module Dependencies. |-->
-    <!--+================================+-->
-    
-    <!-- Configure modules -->
-    <!--<path id="jboss.common.root" path="../common"/>
-    <property name="jboss.common.root" value="../common"/>-->
-
-    
-    <!--<call target="configure-modules"/>
-    <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
-    </path>-->
-
-    <!--+=======================================+-->
-    <!--| Override any default properties here. |-->
-    <!--+=======================================+-->
-
-    <!-- We need the Ant RT classes -->
-    <property name="javac.include.ant.runtime" value="true"/>
-
-    <!-- Configure defaults & build tools -->
-    <call target="configure-defaults"/>
-    <call target="configure-tools"/>
-
-    <!--+=======================================+-->
-    <!--| Define module specific elements here. |-->
-    <!--+=======================================+-->
-
-    <!-- Get jboss.home from the environment -->
-    <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Compile                                                            |-->
-  <!--|                                                                    |-->
-  <!--| This target should depend on other compile-* targets for each      |-->
-  <!--| different type of compile that needs to be performed, short of     |-->
-  <!--| documentation compiles.                                            |-->
-  <!--+====================================================================+-->
-
-  <target name="compile"
-	  description="Compile all source files."
-	  depends="resolve-compile-dependencies,
-                   _default:compile-classes,
-                   _default:compile-etc,
-                   _default:compile-resources">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <!--+====================================================================+-->
-  <!--| Test                                                               |-->
-  <!--|                                                                    |-->
-  <!--| Run unit tests                                                     |-->
-  <!--+====================================================================+-->
-
-  <target name="test"
-	  description="Run junit tests."
-	  depends="compile, resolve-test-dependencies">
-    
-    <mkdir dir="${build.test}"/>
-    <mkdir dir="${build.reports}"/>
-    
-    <javac srcdir="${source.test}"
-         destdir="${build.test}"
-         debug="on">
-      <classpath>
-        <pathelement location="${build.classes}"/>
-        <path refid="test.dependencies.classpath"/>
-      </classpath>
-    </javac>
-    
-    <junit printsummary="yes" haltonfailure="yes">
-      <classpath>
-        <pathelement location="${build.test}"/>
-        <pathelement location="${build.classes}"/>
-        <path refid="test.dependencies.classpath"/>
-      </classpath>
-
-      <formatter type="plain"/>
-
-      <!--<test name="my.test.TestCase" haltonfailure="no" outfile="result">
-        <formatter type="xml"/>
-      </test>-->
-
-      <batchtest fork="yes" todir="${build.reports}">
-        <fileset dir="${source.test}">
-          <include name="**/*Test*.java"/>
-          <exclude name="**/AllTests.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Generate Output                                                    |-->
-  <!--|                                                                    |-->
-  <!--| Generates the target output for this module. Target output is      |-->
-  <!--| the output which is ment to be released or used by external        |-->
-  <!--| modules.                                                           |-->
-  <!--+====================================================================+-->
-
-  <target name="output"
-	  description="Generate all target output."
-	  depends="compile, test">
-
-    <mkdir dir="${build.lib}"/>
-
-    <!-- buildmagic-tasks.jar -->
-    <jar jarfile="${build.lib}/buildmagic-tasks.jar" manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="**"/>
-      </fileset>
-      <fileset dir="${build.resources}">
-        <include name="**/antlib.xml"/>
-      </fileset>
-
-    </jar>
-    
-    <property name="dist.root" location="output/buildmagic"/>
-    <mkdir dir="${dist.root}/lib"/>
-    <copy file="${build.lib}/buildmagic-tasks.jar" tofile="${dist.root}/lib/buildmagic-tasks.jar"/>
-    
-    <ivy:retrieve pattern="${dist.root}/lib/[artifact]-[revision].[ext]" conf="compile"/>
-    
-    <mkdir dir="${dist.root}/etc"/>
-    <copy todir="${dist.root}/etc">
-      <fileset dir="${source.resources}"/>
-    </copy>
-    
-  </target>
-
-  <!--+====================================================================+-->
-  <!--| Integration Tests                                                  |-->
-  <!--|                                                                    |-->
-  <!--| Test build magic against some sample projects.                     |-->
-  <!--+====================================================================+-->
-
-  <target name="integration-tests" depends="output"
-	  description="Run the integration tests.">
-    
-    <echo>
-      Running Integration Tests
-    </echo>
-    <property name="output.it" location="output/it"/>
-    
-    <mkdir dir="${output.it}"/>
-    <copy todir="${output.it}">
-      <fileset dir="src/it"/>
-    </copy>
-    
-    <run-it dir="simple-build">
-      <failure-conditions>
-        <not>
-          <available file="${output.it}/simple-build/module2/output"/>
-        </not>
-      </failure-conditions>
-    </run-it>
-    
-    <run-it dir="simple-external-build">
-      <failure-conditions>
-        <available file="${output.it}/simple-external-build/module1/output"/>
-        <not>
-          <available file="${output.it}/simple-external-build/module2/output"/>
-        </not>
-      </failure-conditions>
-    </run-it>
-    
-    <echo>
-      End Integration Tests
-    </echo>
-    
-  </target>
-
-
-  <!--+====================================================================+-->
-  <!--| Misc.                                                              |-->
-  <!--|                                                                    |-->
-  <!--| Standard targets and psuedo-targets.                               |-->
-  <!--+====================================================================+-->
-
-  <target name="clean" depends="_buildmagic:clean">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <target name="clobber" depends="_buildmagic:clobber">
-    <!-- Add module specific elements here. -->
-  </target>
-
-  <!-- main, all, most and help are primary psuedo-targets -->
-  <target name="main" depends="most"/>
-  <target name="all"/>
-  <target name="most" depends="output"/>
-  <target name="help"/>
-
-  <!--+====================================================================+-->
-  <!--| Macro Definitions                                                  |-->
-  <!--|                                                                    |-->
-  <!--| Some useful macros.                                                |-->
-  <!--+====================================================================+-->
-
-  <macrodef name="run-it">
-    <attribute name="dir"/>
-    <element name="failure-conditions" optional="yes"/>
-    <sequential>
-      <mkdir dir="${output.it}/@{dir}/tools/buildmagic"/>
-      <copy todir="${output.it}/@{dir}/tools/buildmagic">
-        <fileset dir="${dist.root}"/>
-      </copy>
-      
-      <!-- Clean the IT project -->
-      <exec executable="ant" dir="${output.it}/@{dir}/build/"
-        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-clean-result">
-        <arg line="clean"/>
-      </exec>
-      
-      <property name="test.deps.classpath" refid="test.dependencies.classpath"/>
-      <!-- Run the IT project -->
-      <exec executable="ant" dir="${output.it}/@{dir}/build/"
-        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-build-result">
-        <arg line="-lib ${test.deps.classpath}"/>
-      </exec>
-      
-      <fail message="Test @{dir} failed.  For more information, see ${output.it}/@{dir}/buildlog.txt">
-        <condition>
-          <or>
-            <not>
-              <equals arg1="${@{dir}-clean-result}" arg2="0" trim="true"/>
-            </not>
-            <not>
-              <equals arg1="${@{dir}-build-result}" arg2="0" trim="true"/>
-            </not>
-            <failure-conditions/>
-          </or>
-        </condition>
-      </fail>
-      <echo message="Successful completion of test: @{dir}"/>
-    </sequential>
-  </macrodef>
-  
-</project>

Copied: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml (from rev 26784, labs/jbossbuild/buildmagic/trunk/tasks/build.xml)
===================================================================
--- labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml	                        (rev 0)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/build.xml	2009-05-29 19:38:22 UTC (rev 26786)
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+  <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+  <!ENTITY tools      SYSTEM "../tools/etc/buildmagic/tools.ent">
+  <!ENTITY defaults   SYSTEM "../tools/etc/buildmagic/defaults.ent">
+]>
+
+<!-- $Id$ -->
+
+<!--+======================================================================+-->
+<!--| JBoss (The OpenSource J2EE WebOS) Build File                         |-->
+<!--|                                                                      |-->
+<!--| Distributable under LGPL license.                                    |-->
+<!--| See terms of license at http://www.gnu.org.                          |-->
+<!--|                                                                      |-->
+<!--| This file has been designed to work with the 'tools' module and      |-->
+<!--| Buildmagic extentions.                                               |-->
+<!--+======================================================================+-->
+
+<project name="Buildmagic/Tasks" default="main" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+  <!--+====================================================================+-->
+  <!--| Setup                                                              |-->
+  <!--|                                                                    |-->
+  <!--| Include the common build elements.                                 |-->
+  <!--|                                                                    |-->
+  <!--| This defines several different targets, properties and paths.      |-->
+  <!--| It also sets up the basic extention tasks amoung other things.     |-->
+  <!--+====================================================================+-->
+
+  &buildmagic;
+  &defaults;
+  &tools;
+
+  <!-- Initialize Ivy Tasks -->
+  <path id="ivy.classpath" path="../tools/apache-ivy/ivy-2.0.0-rc2.jar" />
+  <typedef resource="org/apache/ivy/ant/antlib.xml"
+           uri="antlib:org.apache.ivy.ant"
+           classpathref="ivy.classpath" />
+  
+  <target name="resolve-compile-dependencies" description="Retreive dependencies with ivy">
+    <ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
+    <ivy:cachefileset setid="compile-dependencies" conf="compile"/>
+    <path id="library.classpath">
+      <fileset refid="compile-dependencies"/>
+    </path>
+  </target>
+  
+  <target name="resolve-test-dependencies" description="Retreive dependencies with ivy">
+    <ivy:settings file="../tools/etc/ivy/ivysettings.xml"></ivy:settings>
+    <ivy:cachefileset setid="test-dependencies" conf="test"/>
+    <path id="test.dependencies.classpath">
+      <fileset refid="test-dependencies"/>
+    </path>
+  </target>
+
+  <!--+====================================================================+-->
+  <!--| Initialization                                                     |-->
+  <!--|                                                                    |-->
+  <!--| Initialize the build system.  Other targets should depend on       |-->
+  <!--| 'init'.                                                            |-->
+  <!--+====================================================================+-->
+
+  <target name="init" depends="_buildmagic:init">
+    
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Configuration                                                      |-->
+  <!--|                                                                    |-->
+  <!--| This target is invoked by the Buildmagic initialization logic      |-->
+  <!--| and should contain module specific configuration elements.         |-->
+  <!--+====================================================================+-->
+
+  <target name="configure" unless="configure.disable">
+
+    <!-- Module name(s) & version -->
+    <property name="module.name" value="tasks"/>
+    <property name="module.Name" value="Buildmagic/Tasks"/>
+    
+    <!--+================================+-->
+    <!--| Library & Module Dependencies. |-->
+    <!--+================================+-->
+    
+    <!-- Configure modules -->
+    <!--<path id="jboss.common.root" path="../common"/>
+    <property name="jboss.common.root" value="../common"/>-->
+
+    
+    <!--<call target="configure-modules"/>
+    <path id="dependentmodule.classpath">
+      <path refid="jboss.common.classpath"/>
+    </path>-->
+
+    <!--+=======================================+-->
+    <!--| Override any default properties here. |-->
+    <!--+=======================================+-->
+
+    <!-- We need the Ant RT classes -->
+    <property name="javac.include.ant.runtime" value="true"/>
+
+    <!-- Configure defaults & build tools -->
+    <call target="configure-defaults"/>
+    <call target="configure-tools"/>
+
+    <!--+=======================================+-->
+    <!--| Define module specific elements here. |-->
+    <!--+=======================================+-->
+
+    <!-- Get jboss.home from the environment -->
+    <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Compile                                                            |-->
+  <!--|                                                                    |-->
+  <!--| This target should depend on other compile-* targets for each      |-->
+  <!--| different type of compile that needs to be performed, short of     |-->
+  <!--| documentation compiles.                                            |-->
+  <!--+====================================================================+-->
+
+  <target name="compile"
+	  description="Compile all source files."
+	  depends="resolve-compile-dependencies,
+                   _default:compile-classes,
+                   _default:compile-etc,
+                   _default:compile-resources">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <!--+====================================================================+-->
+  <!--| Test                                                               |-->
+  <!--|                                                                    |-->
+  <!--| Run unit tests                                                     |-->
+  <!--+====================================================================+-->
+
+  <target name="test"
+	  description="Run junit tests."
+	  depends="compile, resolve-test-dependencies">
+    
+    <mkdir dir="${build.test}"/>
+    <mkdir dir="${build.reports}"/>
+    
+    <javac srcdir="${source.test}"
+         destdir="${build.test}"
+         debug="on">
+      <classpath>
+        <pathelement location="${build.classes}"/>
+        <path refid="test.dependencies.classpath"/>
+      </classpath>
+    </javac>
+    
+    <junit printsummary="yes" haltonfailure="yes">
+      <classpath>
+        <pathelement location="${build.test}"/>
+        <pathelement location="${build.classes}"/>
+        <path refid="test.dependencies.classpath"/>
+      </classpath>
+
+      <formatter type="plain"/>
+
+      <!--<test name="my.test.TestCase" haltonfailure="no" outfile="result">
+        <formatter type="xml"/>
+      </test>-->
+
+      <batchtest fork="yes" todir="${build.reports}">
+        <fileset dir="${source.test}">
+          <include name="**/*Test*.java"/>
+          <exclude name="**/AllTests.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Generate Output                                                    |-->
+  <!--|                                                                    |-->
+  <!--| Generates the target output for this module. Target output is      |-->
+  <!--| the output which is ment to be released or used by external        |-->
+  <!--| modules.                                                           |-->
+  <!--+====================================================================+-->
+
+  <target name="output"
+	  description="Generate all target output."
+	  depends="compile, test">
+
+    <mkdir dir="${build.lib}"/>
+
+    <!-- buildmagic-tasks.jar -->
+    <jar jarfile="${build.lib}/buildmagic-tasks.jar" manifest="${build.etc}/default.mf">
+      <fileset dir="${build.classes}">
+        <include name="**"/>
+      </fileset>
+      <fileset dir="${build.resources}">
+        <include name="**/antlib.xml"/>
+      </fileset>
+
+    </jar>
+    
+    <property name="dist.root" location="output/buildmagic"/>
+    <mkdir dir="${dist.root}/lib"/>
+    <copy file="${build.lib}/buildmagic-tasks.jar" tofile="${dist.root}/lib/buildmagic-tasks.jar"/>
+    
+    <ivy:retrieve pattern="${dist.root}/lib/[artifact]-[revision].[ext]" conf="compile"/>
+    
+    <mkdir dir="${dist.root}/etc"/>
+    <copy todir="${dist.root}/etc">
+      <fileset dir="${source.resources}"/>
+    </copy>
+    
+  </target>
+
+  <!--+====================================================================+-->
+  <!--| Integration Tests                                                  |-->
+  <!--|                                                                    |-->
+  <!--| Test build magic against some sample projects.                     |-->
+  <!--+====================================================================+-->
+
+  <target name="integration-tests" depends="output"
+	  description="Run the integration tests.">
+    
+    <echo>
+      Running Integration Tests
+    </echo>
+    <property name="output.it" location="output/it"/>
+    
+    <mkdir dir="${output.it}"/>
+    <copy todir="${output.it}">
+      <fileset dir="src/it"/>
+    </copy>
+    
+    <run-it dir="simple-build">
+      <failure-conditions>
+        <not>
+          <available file="${output.it}/simple-build/module2/output"/>
+        </not>
+      </failure-conditions>
+    </run-it>
+    
+    <run-it dir="simple-external-build">
+      <failure-conditions>
+        <available file="${output.it}/simple-external-build/module1/output"/>
+        <not>
+          <available file="${output.it}/simple-external-build/module2/output"/>
+        </not>
+      </failure-conditions>
+    </run-it>
+    
+    <echo>
+      End Integration Tests
+    </echo>
+    
+  </target>
+
+
+  <!--+====================================================================+-->
+  <!--| Misc.                                                              |-->
+  <!--|                                                                    |-->
+  <!--| Standard targets and psuedo-targets.                               |-->
+  <!--+====================================================================+-->
+
+  <target name="clean" depends="_buildmagic:clean">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <target name="clobber" depends="_buildmagic:clobber">
+    <!-- Add module specific elements here. -->
+  </target>
+
+  <!-- main, all, most and help are primary psuedo-targets -->
+  <target name="main" depends="most"/>
+  <target name="all"/>
+  <target name="most" depends="output"/>
+  <target name="help"/>
+
+  <!--+====================================================================+-->
+  <!--| Macro Definitions                                                  |-->
+  <!--|                                                                    |-->
+  <!--| Some useful macros.                                                |-->
+  <!--+====================================================================+-->
+
+  <macrodef name="run-it">
+    <attribute name="dir"/>
+    <element name="failure-conditions" optional="yes"/>
+    <sequential>
+      <mkdir dir="${output.it}/@{dir}/tools/buildmagic"/>
+      <copy todir="${output.it}/@{dir}/tools/buildmagic">
+        <fileset dir="${dist.root}"/>
+      </copy>
+      
+      <!-- Clean the IT project -->
+      <exec executable="ant" dir="${output.it}/@{dir}/build/"
+        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-clean-result">
+        <arg line="clean"/>
+      </exec>
+      
+      <property name="test.deps.classpath" refid="test.dependencies.classpath"/>
+      <!-- Run the IT project -->
+      <exec executable="ant" dir="${output.it}/@{dir}/build/"
+        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-build-result">
+        <arg line="-lib ${test.deps.classpath}"/>
+      </exec>
+      
+      <fail message="Test @{dir} failed.  For more information, see ${output.it}/@{dir}/buildlog.txt">
+        <condition>
+          <or>
+            <not>
+              <equals arg1="${@{dir}-clean-result}" arg2="0" trim="true"/>
+            </not>
+            <not>
+              <equals arg1="${@{dir}-build-result}" arg2="0" trim="true"/>
+            </not>
+            <failure-conditions/>
+          </or>
+        </condition>
+      </fail>
+      <echo message="Successful completion of test: @{dir}"/>
+    </sequential>
+  </macrodef>
+  
+</project>

Deleted: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/etc/default.mf	2009-05-15 18:46:31 UTC (rev 26570)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf	2009-05-29 19:38:22 UTC (rev 26786)
@@ -1,7 +0,0 @@
-Specification-Title: @specification.title@
-Specification-Version: @version.major at .@version.minor@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: Buildmagic (@version.name@)
-Implementation-Version: @version.major at .@version.minor at .@version.revision at .@version.tag@ (@build.id@)
-Implementation-Vendor: @implementation.vendor@
-Source-Repository-URL: @source.repository.url@

Copied: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf (from rev 26784, labs/jbossbuild/buildmagic/trunk/tasks/src/etc/default.mf)
===================================================================
--- labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf	                        (rev 0)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tasks/src/etc/default.mf	2009-05-29 19:38:22 UTC (rev 26786)
@@ -0,0 +1,7 @@
+Specification-Title: @specification.title@
+Specification-Version: @version.major at .@version.minor at .@version.revision@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: Buildmagic (@version.name@)
+Implementation-Version: @version.major at .@version.minor at .@version.revision at .@version.tag@ (@build.id@)
+Implementation-Vendor: @implementation.vendor@
+Source-Repository-URL: @source.repository.url@

Modified: labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tools/etc/buildmagic/defaults.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent	2009-05-15 18:46:31 UTC (rev 26570)
+++ labs/jbossbuild/buildmagic/tags/buildmagic-2.1.1/tools/etc/buildmagic/defaults.ent	2009-05-29 19:38:22 UTC (rev 26786)
@@ -13,7 +13,7 @@
   <property name="version.major" value="2"/>
   <property name="version.minor" value="1"/>
   <property name="version.revision" value="1"/>
-  <property name="version.tag" value="snapshot"/>
+  <property name="version.tag" value="GA"/>
   <property name="version.name" value=""/>
 
   <!-- This must be set to the svn tag for any release -->




More information about the jboss-svn-commits mailing list