geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r370650 - /geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
Date Thu, 19 Jan 2006 22:09:56 GMT
Author: kevan
Date: Thu Jan 19 14:09:54 2006
New Revision: 370650

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

Modified:
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly?rev=370650&r1=370649&r2=370650&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly Thu Jan 19 14:09:54
2006
@@ -102,8 +102,7 @@
                 <j:set var="hasRepo" value="false"/>
                 <j:forEach var="artifact" items="${pom.artifacts}">
                     <j:set var="dependency" value="${artifact.dependency}"/>
-                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository'
|| dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assem
-ble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
+                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository'
|| dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assemble')
== 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
                         <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
                         <j:set var="hasRepo" value="true"/>
                     </j:if>
@@ -242,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>
@@ -285,13 +276,13 @@
     </goal>
 
     <goal name="assemble:package-assembly" prereqs="assemble:assemble" description="Build
the binary distribution.">
-        <!-- Create a tar.gz file 
+        <!-- Create a tar.gz file
              Explicitly set execute permission on script files so builds on windows are consistent
with unix -->
 
         <!-- Establish patternset used by later fixcrlf processing -->
         <ant:fileset dir="${geronimo.assembly.dest}" >
-            <!-- Patterns for text based files.  We don't touch *.bat as svn 
-                 should have eol-style set property to CRLF and *.sh we 
+            <!-- Patterns for text based files.  We don't touch *.bat as svn
+                 should have eol-style set property to CRLF and *.sh we
                  force to have LF line endings (handle building on windows).  -->
             <ant:patternset id="geronimo.fixcrlf.patternset">
                 <ant:include name="**/*.dtd" />
@@ -314,21 +305,21 @@
 
         <!-- ensure shell scripts have LF end of lines for both the
              tar.gz and zip file -->
-        <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+        <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
             <ant:include name="**/*.sh" />
         </ant:fixcrlf>
 
-        <!-- Create a zip file --> 
-        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}"> 
-            <ant:echo>Preparing CRLF line endings in text based files for zip 
-            distribution</ant:echo> 
-            <!-- The zip distribution shall have CRLF line 
-            endings and is targeted at Windows platforms.  Non-Windows platforms 
-            should use the tar distribution, as it contains extra file attributes 
-            such as permissions. Since we cannot assume we are running on a Windows 
-            platform, we fix line endings in the zip distribution to be CRLF's. --> 
+        <!-- Create a zip file -->
+        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
+            <ant:echo>Preparing CRLF line endings in text based files for zip
+            distribution</ant:echo>
+            <!-- The zip distribution shall have CRLF line
+            endings and is targeted at Windows platforms.  Non-Windows platforms
+            should use the tar distribution, as it contains extra file attributes
+            such as permissions. Since we cannot assume we are running on a Windows
+            platform, we fix line endings in the zip distribution to be CRLF's. -->
             <ant:fixcrlf  srcdir="${geronimo.assembly.dest}" eol="crlf">
-                <patternset refid="geronimo.fixcrlf.patternset"/> 
+                <patternset refid="geronimo.fixcrlf.patternset"/>
             </ant:fixcrlf>
 
             <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
@@ -345,7 +336,7 @@
         <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
             <ant:echo>Preparing LF line endings in text based files for tar.gz distribution</ant:echo>
 
-            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
                 <patternset refid="geronimo.fixcrlf.patternset"/>
                 <ant:include name="**/*.sh"/>
             </ant:fixcrlf>
@@ -364,11 +355,11 @@
             <checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="SHA"
fileext=".sha"/>
         </j:if>
 
-        <!-- Ensure the files in the assembly directory are left with LF endings 
+        <!-- Ensure the files in the assembly directory are left with LF endings
              for Geronimo developers who may run Geronimo from there. -->
         <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
             <j:if test="${context.getVariable('geronimo.assembly.tar') != 'true'}">
-                <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
+                <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf">
                     <patternset refid="geronimo.fixcrlf.patternset"/>
                 </ant:fixcrlf>
             </j:if>



Mime
View raw message