Author: djencks
Date: Sat Dec  3 13:27:49 2005
New Revision: 352021

URL: http://svn.apache.org/viewcvs?rev=352021&view=rev
Log:
make assemble-to-repo work with new configIds

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=352021&r1=352020&r2=352021&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Sat Dec  3 13:27:49 2005
@@ -156,7 +156,7 @@
                         targetConfigStore="config-store"
                         targetRepository="repository"
                         sourceRepository="${maven.repo.local}"
-                        artifact="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
+                        artifact="${dependency.getGroupId()}/${dependency.getArtifactId()}/${dependency.getVersion()}/${dependency.getType()}"/>
                 </j:if>
 
                 <!-- handle executable configs -->
@@ -212,7 +212,7 @@
     </goal>
 
     <!-- Maven artifict tags are broken so we must copy by hand -->
-    <goal name="assemble:install" description="Deploy a binary distribution" prereqs="assemble:package-assembly">
+    <goal name="assemble:install" description="Deploy a binary distribution" prereqs="clean,assemble:package-assembly">
         <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
             <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
             <ant:copy file="${maven.build.dir}/${maven.final.name}.tar.gz"