geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r292819 - in /geronimo/trunk/plugins: geronimo-assembly-plugin/plugin.jelly geronimo-deployment-plugin/ maven-geronimo-plugin/
Date Fri, 30 Sep 2005 17:43:40 GMT
Author: djencks
Date: Fri Sep 30 10:43:37 2005
New Revision: 292819

URL: http://svn.apache.org/viewcvs?rev=292819&view=rev
Log:
Rename geronimo-deployment plugin location to match its name

Added:
    geronimo/trunk/plugins/geronimo-deployment-plugin/
      - copied from r292137, geronimo/trunk/plugins/maven-geronimo-plugin/
Removed:
    geronimo/trunk/plugins/maven-geronimo-plugin/
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=292819&r1=292818&r2=292819&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Fri Sep 30 10:43:37 2005
@@ -23,7 +23,6 @@
     xmlns:artifact="artifact"
     xmlns:ant="jelly:ant"
     xmlns:define="jelly:define"
-    xmlns:m="jelly:maven"
     xmlns:assemble="geronimo:assembly"
     >
 
@@ -99,81 +98,9 @@
         <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar" basedir="${geronimo.assembly.dest}"/>
     </goal>
 
-    <goal name="geronimo:package-assembly" prereqs="geronimo:assemble" description="Build
the binary distribution.">
-        <!-- Create a tar.gz file -->
-        <m:makeRelativePath var="geronimo.assembly.dir.name"
-            basedir="${geronimo.assembly.dir}/.."
-            path="${geronimo.assembly.dir}"/>
-        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
-            <ant:tar longfile="gnu" compression="gzip" tarfile="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz">
-                <ant:tarfileset dir="${geronimo.assembly.dir}/..">
-                    <ant:include name="${geronimo.assembly.dir.name}/**"/>
-                </ant:tarfileset>
-            </ant:tar>
-            <checksum file="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"
algorithm="MD5" fileext=".md5"/>
-            <checksum file="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"
algorithm="SHA" fileext=".sha"/>
-        </j:if>
-
-        <!-- Create a zip file -->
-        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
-            <ant:zip zipfile="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip">
-                <ant:zipfileset dir="${geronimo.assembly.dir}/..">
-                    <ant:include name="${geronimo.assembly.dir.name}/**"/>
-                </ant:zipfileset>
-            </ant:zip>
-            <checksum file="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip"
algorithm="MD5" fileext=".md5"/>
-            <checksum file="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip"
algorithm="SHA" fileext=".sha"/>
-        </j:if>
-    </goal>
-
-    <!-- Maven artifict tags are broken so we must copy by hand -->
-    <goal name="geronimo:install-assembly" description="Deploy a binary distribution"
prereqs="geronimo:package-assembly">
-        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
-            <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
-            <ant:copy file="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"
-                todir="${maven.repo.local}/${pom.groupId}/distributions"/>
-<!--            <artifact:install-->
-<!--                artifact="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"-->
-<!--                type="distribution-targz"-->
-<!--                project="${pom}"-->
-        </j:if>
-
-        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
-            <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
-            <ant:copy file="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip"
-                todir="${maven.repo.local}/${pom.groupId}/distributions"/>
-<!--            <artifact:install-->
-<!--                artifact="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip"-->
-<!--                type="distribution-zip"-->
-<!--                project="${pom}"-->
-        </j:if>
-    </goal>
-
-    <!-- ================================================================== -->
-    <!-- D E P L O Y   D I S T R I B U T I O N                              -->
-    <!-- ================================================================== -->
-
-<!--    <goal name="geronimo:deploy-assembly" description="Deploy a binary distribution"
prereqs="geronimo:package-assembly">-->
-<!--        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">-->
-<!--            <artifact:deploy-->
-<!--                artifact="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"-->
-<!--                type="distribution-targz"-->
-<!--                project="${pom}"-->
-<!--                typeHandler="${distTypeHandler}"/>-->
-<!--        </j:if>-->
-<!---->
-<!--        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">-->
-<!--            <artifact:deploy-->
-<!--                artifact="${geronimo.assembly.distributions.dir}/${maven.final.name}.zip"-->
-<!--                type="distribution-zip"-->
-<!--                project="${pom}"-->
-<!--                typeHandler="${distTypeHandler}"/>-->
-<!--        </j:if>-->
-<!--    </goal>-->
-
-<!--    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install
an assembled Geronimo installation into the local repository">-->
-<!--        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar"
project="${pom}"/>-->
-<!--    </goal>-->
+    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install
an assembled Geronimo installation into the local repository">
+        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>
+    </goal>
 
     <!--
         <goal name="geronimo:deploy-assembly" prereqs="geronimo:assemble" description="Deploy
an assembled Geronimo installation into the remote repository">



Mime
View raw message