Return-Path: 
 <scm-return-10050-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 37543 invoked from network); 19 Jan 2006 22:52:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Jan 2006 22:52:58 -0000
Received: (qmail 25178 invoked by uid 500); 19 Jan 2006 22:52:58 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 25153 invoked by uid 500); 19 Jan 2006 22:52:58 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 25138 invoked by uid 99); 19 Jan 2006 22:52:57 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2006 14:52:57 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 19 Jan 2006 14:52:57 -0800
Received: (qmail 37171 invoked by uid 65534); 19 Jan 2006 22:52:36 -0000
Message-ID: <20060119225236.37168.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r370662 -
 /geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Date: Thu, 19 Jan 2006 22:52:36 -0000
To: scm@geronimo.apache.org
From: kevan@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: kevan
Date: Thu Jan 19 14:52:34 2006
New Revision: 370662

URL: http://svn.apache.org/viewcvs?rev=370662&view=rev
Log:
Installer fixes to allow maven 1.0.2 builds to work

Modified:
    geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=370662&r1=370661&r2=370662&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Thu Jan 19 14:52:34 2006
@@ -241,40 +241,32 @@
         <!--        <ant:delete dir="${configStoreDir}"/>-->
         <ant:mkdir dir="${configStoreDir}"/>
         <ant:mkdir dir="${geronimo.assembly.dest}/var/config"/>
-        <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="false" outputMode="xml" escapeText="false" trim="false">
+        <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" outputMode="xml" escapeText="false" trim="true" prettyPrint="false">
            &lt;!-- used only for install. This file may be removed. --&gt;
            &lt;configurations&gt;
-        </j:file>
         <j:set var="DS" value="$" />
         <j:set var="LB" value="{" />
         <j:set var="RB" value="}" />
         <j:forEach var="artifact" items="${pom.artifacts}">
+            <!-- One for each configuration -->
             <j:set var="dependency" value="${artifact.dependency}"/>
             <j:if test="${dependency.type == 'car'}">
-                <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
+
                     &lt;configuration&gt;
-                </j:file> 
                 <j:if test="${dependency.getProperty('geronimo.assemble') == 'install'}">
                     <j:set var="PACK" value="${dependency.getProperty('geronimo.pack')}"/>
-                    <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
-                      &lt;artifact&gt;${dependency.getGroupId()}/${dependency.getArtifactId()}/${dependency.getVersion()}/${dependency.getType()} &lt;/artifact&gt;
+                      &lt;artifact&gt;${dependency.getGroupId()}/${dependency.getArtifactId()}/${dependency.getVersion()}/${dependency.getType()}&lt;/artifact&gt;
                       &lt;selected&gt;${DS}${LB}${PACK}${RB}&lt;/selected&gt;
-                    </j:file>
                 </j:if>
-
                 <!-- handle executable configs -->
                 <j:if test="${dependency.getProperty('geronimo.assemble.executable') != null}">
                     <j:set var="exe" value="${dependency.getProperty('geronimo.assemble.executable')}"/>
-                    <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">            
                       &lt;executable&gt;${exe}&lt;/executable&gt;
-                    </j:file>
                 </j:if>
-                <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" omitXmlDeclaration="true" escapeText="false" trim="false">
                     &lt;/configuration&gt;
-                </j:file> 
+
             </j:if>
         </j:forEach>
-        <j:file name="${geronimo.assembly.dest}/var/config/configure.xml" append="true" outputMode="xml" escapeText="false" trim="false" omitXmlDeclaration="true">
            &lt;/configurations&gt;
         </j:file>
     </goal>