[CVS jcontainer] Plugins need to be built as part of the main build now

Peter Donald <pdonald-yCVjj/[email protected]> Tue, 20 Apr 2004 18:18:57 -0500
Newsgroups gmane.comp.java.jcontainer.cvs
Message-ID <[email protected]>
<html>
<head>
<style><!--
  body {background-color:#ffffff;}
  .file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
  .pathname {font-family:monospace; float:right;}
  .fileheader {margin-bottom:.5em;}
  .diff {margin:0;}
  .tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
  .tasklist ul {margin-top:0;margin-bottom:0;}
  tr.alt {background-color:#eeeeee}
  #added {background-color:#ddffdd;}
  #addedchars {background-color:#99ff99;font-weight:bolder;}
  tr.alt #added {background-color:#ccf7cc;}
  #removed {background-color:#ffdddd;}
  #removedchars {background-color:#ff9999;font-weight:bolder;}
  tr.alt #removed {background-color:#f7cccc;}
  #info {color:#888888;}
  #context {background-color:#eeeeee;}
  td {padding-left:.3em;padding-right:.3em;}
  tr.head {border-bottom-width:1px;border-bottom-style:solid;}
  tr.head td {padding:0;padding-top:.2em;}
  .task {background-color:#ffff00;}
  .comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
  .error {color:red;}
  hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>jcontainer/loom</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">maven.xml</a></tt></td><td align="right" id="added">+7</td><td align="right" id="removed">-66</td><td nowrap="nowrap" align="center"><a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml?rev=1.17&amp;content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml.diff?r1=1.17&amp;r2=1.18">-&gt;</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml?rev=1.18&amp;content-type=text/vnd.viewcvs-markup">1.18</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">project.properties</a></tt></td><td></td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center"><a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties?rev=1.8&amp;content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties.diff?r1=1.8&amp;r2=1.9">-&gt;</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties?rev=1.9&amp;content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-72</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Plugins need to be built as part of the main build now
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://xstream.cvs.codehaus.org/jcontainer">jcontainer</a>/<a href="http://xstream.cvs.codehaus.org/jcontainer/loom">loom</a><br /></span>
<div class="fileheader"><big><b>maven.xml</b></big> <small id="info"><a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml?rev=1.17&amp;content-type=text/vnd.viewcvs-markup">1.17</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml.diff?r1=1.17&amp;r2=1.18">-&gt;</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/maven.xml?rev=1.18&amp;content-type=text/vnd.viewcvs-markup">1.18</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.17 -r1.18
--- maven.xml	31 Mar 2004 03:39:03 -0000	1.17
+++ maven.xml	20 Apr 2004 23:18:57 -0000	1.18
@@ -1,86 +1,27 @@
</small></pre><pre class="diff" id="removed">-&lt;project default="main" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:util="jelly:util"&gt;
-
-    &lt;goal name="main"&gt;
-        &lt;attainGoal name="loom:build"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="loom:build"&gt;
-        &lt;util:tokenize var="items" delim="," trim="true"&gt;${loom.build.include}&lt;/util:tokenize&gt;
-        &lt;j:forEach var="item" items="${items}"&gt;
-            &lt;attainGoal name="build:${item}"/&gt;
-        &lt;/j:forEach&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="build:plugins"&gt;
-        &lt;echo message="Build plugins"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="plugins/project.xml" goals="loom:clean,loom:install" banner="Building Plugins" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
</pre><pre class="diff" id="added">+&lt;project default="build:components" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:util="jelly:util"&gt;
</pre><pre class="diff" id="context"> 
     &lt;goal name="build:components"&gt;
         &lt;echo message="Build components"/&gt;
</pre><pre class="diff" id="removed">-        &lt;maven:reactor basedir="${basedir}" includes="<span id="removedchars">engine</span>/project.xml,support/*/project.xml,launcher/project.xml" goals="clean:clean,build" banner="Building" ignoreFailures="false"/&gt;
</pre><pre class="diff" id="added">+        &lt;maven:reactor basedir="${basedir}" includes="<span id="addedchars">plugins/maven-loom/project.xml,engine/project.xml,distribution</span>/project.xml,support/*/project.xml,launcher/project.xml" goals="clean:clean,build" banner="Building" ignoreFailures="false"/&gt;
</pre><pre class="diff" id="context">     &lt;/goal&gt;
 
</pre><pre class="diff" id="removed">-    &lt;goal name="build:demos"&gt;
</pre><pre class="diff" id="added">+    &lt;goal name="build:demos" prereqs="build:components"&gt;
</pre><pre class="diff" id="context">         &lt;echo message="Build demos"/&gt;
         &lt;maven:reactor basedir="${basedir}" includes="demos/*/project.xml" goals="clean:clean,build" banner="Building" ignoreFailures="false"/&gt;
     &lt;/goal&gt;
 
</pre><pre class="diff" id="removed">-    &lt;goal name="build:distribution"&gt;
-        &lt;echo message="Build distribution"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="distribution/project.xml" goals="clean:clean,build" banner="Building" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
</pre><pre class="diff" id="context">     &lt;goal name="loom:clean"&gt;
</pre><pre class="diff" id="removed">-        &lt;util:tokenize var="items" delim="," trim="true"&gt;${loom.clean.include}&lt;/util:tokenize&gt;
-        &lt;j:forEach var="item" items="${items}"&gt;
-            &lt;attainGoal name="clean:${item}"/&gt;
-        &lt;/j:forEach&gt;
</pre><pre class="diff" id="added">+        &lt;maven:reactor basedir="${basedir}" includes="distribution/project.xml,plugins/maven-loom/project.xml,engine/project.xml,support/*/project.xml,launcher/project.xml,demos/*/project.xml," goals="clean:clean" banner="Building" ignoreFailures="false"/&gt;
</pre><pre class="diff" id="context">     &lt;/goal&gt;
 
</pre><pre class="diff" id="removed">-    &lt;goal name="clean:plugins"&gt;
-        &lt;echo message="Clean plugins"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="plugins/project.xml" goals="loom:clean" banner="Cleaning" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="clean:components"&gt;
-        &lt;echo message="Clean components"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="*/project.xml" excludes="demos/*/project.xml,support/*/project.xml,distribution/project.xml,plugins/project.xml,site/project.xml" goals="clean:clean" banner="Cleaning" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="clean:distribution"&gt;
-        &lt;echo message="Clean distribution"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="distribution/project.xml" goals="clean:clean" banner="Cleaning" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="clean:demos"&gt;
-        &lt;echo message="Clean demos"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="demos/*/project.xml" goals="clean:clean" banner="Cleaning" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="loom:deploy"&gt;
-        &lt;util:tokenize var="items" delim="," trim="true"&gt;${loom.deploy.include}&lt;/util:tokenize&gt;
-        &lt;j:forEach var="item" items="${items}"&gt;
-            &lt;attainGoal name="deploy:${item}"/&gt;
-        &lt;/j:forEach&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="deploy:plugins"&gt;
-        &lt;echo message="Deploying all plugins"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="plugins/project.xml" goals="loom:clean,loom:deploy" banner="Deploying" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
</pre><pre class="diff" id="added">+    &lt;goal name="loom:deploy" prereqs="deploy:components"/&gt;
</pre><pre class="diff" id="context"> 
     &lt;goal name="deploy:components"&gt;
         &lt;echo message="Deploying all components"/&gt;
</pre><pre class="diff" id="removed">-        &lt;maven:reactor basedir="${basedir}" includes="*/project.xml" excludes="demos/*/project.xml,support/*/project.xml,distribution/project.xml,plugins/project.xml,site/project.xml" goals="clean:clean,deploy" banner="Deploying" ignoreFailures="false"/&gt;
-    &lt;/goal&gt;
-
-    &lt;goal name="deploy:distribution"&gt;
-        &lt;echo message="Deploy distribution"/&gt;
-        &lt;maven:reactor basedir="${basedir}" includes="distribution/project.xml" goals="clean:clean,deploy" banner="Deploying" ignoreFailures="false"/&gt;
</pre><pre class="diff" id="added">+        &lt;maven:reactor basedir="${basedir}" includes="*/project.xml" excludes="demos/*/project.xml,site/project.xml" goals="clean:clean,deploy" banner="Deploying" ignoreFailures="false"/&gt;
</pre><pre class="diff" id="context">     &lt;/goal&gt;
 
</pre><pre class="diff" id="removed">-    &lt;goal name="deploy:demos"&gt;
</pre><pre class="diff" id="added">+    &lt;goal name="deploy:demos" prereqs="build:components"&gt;
</pre><pre class="diff" id="context">         &lt;echo message="Deploy demos"/&gt;
         &lt;maven:reactor basedir="${basedir}" includes="demos/*/project.xml" goals="clean:clean,deploy" banner="Deploying" ignoreFailures="false"/&gt;
     &lt;/goal&gt;
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://xstream.cvs.codehaus.org/jcontainer">jcontainer</a>/<a href="http://xstream.cvs.codehaus.org/jcontainer/loom">loom</a><br /></span>
<div class="fileheader"><big><b>project.properties</b></big> <small id="info"><a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties?rev=1.8&amp;content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties.diff?r1=1.8&amp;r2=1.9">-&gt;</a> <a href="http://xstream.cvs.codehaus.org/jcontainer/loom/project.properties?rev=1.9&amp;content-type=text/vnd.viewcvs-markup">1.9</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.8 -r1.9
--- project.properties	18 Apr 2004 18:53:01 -0000	1.8
+++ project.properties	20 Apr 2004 23:18:57 -0000	1.9
@@ -1,8 +1,2 @@
</small></pre><pre class="diff" id="context"> maven.remote.group=jcontainer
 maven.repo.remote = http://ibiblio.org/maven/,http://dist.codehaus.org,http://spice.codehaus.org/maven/,http://spice.sf.net/maven/
</pre><pre class="diff" id="removed">-# Loom include items are: components, plugins, distribution, demos
-loom.build.include=plugins,components,distribution
-#,demos 
-# demos do not build with new metaclass
-loom.clean.include=components,distribution,demos,plugins
-loom.deploy.include=plugins,components,distribution
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -&gt; email">CVSspam</a> 0.2.8</small></center>
</body></html>