svn commit: r613696 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: sample.build.xml src/main/java/org/apache/maven/artifact/ant/DeployTask.java

[hb...@apache.org]

Author: hboutemy
Date: Sun Jan 20 14:38:55 2008
New Revision: 613696

URL: http://svn.apache.org/viewvc?rev=613696&view=rev
Log:
merged from r613695: [MANTTASKS-103] can't use url as remote repository id for deploy since id is used to calculate maven-metadata-<id>.xml filename

Modified:
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml?rev=613696&r1=613695&r2=613696&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml Sun Jan 20 14:38:55 2008
@@ -269,9 +269,15 @@
   <target name="test-deploy-spaces" depends="initTaskDefs,installSshProvider">
     <echo file="target/test file.txt">dummy</echo>
     <artifact:deploy file="target/test file.txt">
-      <remoteRepository url="scp://localhost/tmp/deployment-repo" id="scp.localhost.repo" />
+      <!-- intentionnally left without id to check default id: see MANTTASKS-103 -->
+      <remoteRepository url="scp://localhost/tmp/deployment-repo"/>
+      <localrepository refid="local.repository"/>
       <pom refid="maven.project"/>
     </artifact:deploy>
+
+    <!-- MANTTASKS-103 -->
+    <available file="${basedir}/target/local-repo/org/apache/maven/maven-ant-tasks/maven-metadata-scp://localhost" property="metadata-scp"/>
+    <fail if="metadata-scp">maven-metadata-scp: should not exist since scp: is an illegal remoteRepository id</fail>
   </target>
 
   <target name="test-deploy" depends="initTaskDefs,installSshProvider">
@@ -306,6 +312,7 @@
       </remoteRepository>
       <pom refid="maven.project"/>
     </artifact:deploy>
+
   </target>
 
   <target name="test-scm" depends="initTaskDefs">

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=613696&r1=613695&r2=613696&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java Sun Jan 20 14:38:55 2008
@@ -54,6 +54,12 @@
      */
     protected ArtifactRepository createDeploymentArtifactRepository( RemoteRepository repository )
     {
+        if ( repository.getId().equals( repository.getUrl() ))
+        {
+            // MANTTASKS-103: avoid default id set to the url, since it is used for maven-metadata-<id>.xml  
+            repository.setId( "remote" );
+        }
+
         updateRepositoryWithSettings( repository );
 
         ArtifactRepositoryLayout repositoryLayout =