Author: jvanzyl
Date: Sun May 27 16:33:33 2007
New Revision: 542051
URL: http://svn.apache.org/viewvc?view=rev&rev=542051
Log:
MANTTASKS-44 rename the location attribute to path to avoid conflict with with
Ant 1.7
Submitted by: Herve Boutemy
Modified:
maven/ant-tasks/trunk/sample.build.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java
Modified: maven/ant-tasks/trunk/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?view=diff&rev=542051&r1=542050&r2=542051
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Sun May 27 16:33:33 2007
@@ -30,7 +30,7 @@
<classpath refid="maven.classpath"/>
</typedef>
- <artifact:localRepository id="local.repository"
location="${basedir}/target/local-repo" layout="default"/>
+ <artifact:localRepository id="local.repository"
path="${basedir}/target/local-repo" layout="default"/>
<artifact:remoteRepository id="deploy.repository"
url="file://localhost/${basedir}/target/deployment-repo" layout="default"/>
@@ -63,7 +63,7 @@
<target name="test-legacy-pom" depends="initTaskDefs">
<artifact:dependencies>
<dependency groupId="geronimo-spec" artifactId="geronimo-spec-javamail"
version="1.3.1-rc5" />
- <localRepository location="${basedir}/target/local-repo-legacy" />
+ <localRepository path="${basedir}/target/local-repo-legacy" />
<remoteRepository url="http://repo1.maven.org/maven"; layout="legacy"
id="central" />
</artifact:dependencies>
</target>
@@ -168,7 +168,7 @@
<arg line="create ${repo.path.unix}"/>
</exec>
- <artifact:localRepository id="local.repository"
location="${basedir}/target/local-repo" layout="default"/>
+ <artifact:localRepository id="local.repository"
path="${basedir}/target/local-repo" layout="default"/>
<artifact:remoteRepository id="deploy.repository" url="scm:svn:${scm.url}"
layout="default"/>
@@ -189,7 +189,7 @@
<arg line="co ${scm.url} -N local-repo-scm"/>
</exec>
- <artifact:localRepository id="local.repository.scm"
location="${basedir}/target/local-repo-scm" layout="default"/>
+ <artifact:localRepository id="local.repository.scm"
path="${basedir}/target/local-repo-scm" layout="default"/>
<artifact:dependencies pathId="dependency.classpath.scm">
<dependency groupId="org.apache.maven.wagon"
artifactId="wagon-provider-test" version="1.0-alpha-4"/>
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=542051&r1=542050&r2=542051
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Sun May 27 16:33:33 2007
@@ -88,7 +88,7 @@
ArtifactRepositoryLayout repositoryLayout =
(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
localRepository.getLayout() );
- return new DefaultArtifactRepository( "local", "file://" +
localRepository.getLocation(), repositoryLayout );
+ return new DefaultArtifactRepository( "local", "file://" +
localRepository.getPath(), repositoryLayout );
}
protected ArtifactRepository createRemoteArtifactRepository(
RemoteRepository repository )
@@ -169,7 +169,7 @@
Settings settings = getSettings();
LocalRepository localRepository = new LocalRepository();
localRepository.setId( "local" );
- localRepository.setLocation( new File( settings.getLocalRepository() )
);
+ localRepository.setPath( new File( settings.getLocalRepository() ) );
return localRepository;
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?view=diff&rev=542051&r1=542050&r2=542051
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Sun May 27 16:33:33 2007
@@ -201,14 +201,14 @@
}
FileList fileList = new FileList();
- fileList.setDir( getLocalRepository().getLocation() );
+ fileList.setDir( getLocalRepository().getPath() );
FileSet fileSet = new FileSet();
fileSet.setProject( getProject() );
fileSet.setDir( fileList.getDir( getProject() ) );
FileList sourcesFileList = new FileList();
- sourcesFileList.setDir( getLocalRepository().getLocation() );
+ sourcesFileList.setDir( getLocalRepository().getPath() );
FileSet sourcesFileSet = new FileSet();
sourcesFileSet.setDir( sourcesFileList.getDir( getProject() ) );
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java?view=diff&rev=542051&r1=542050&r2=542051
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java
Sun May 27 16:33:33 2007
@@ -30,15 +30,15 @@
public class LocalRepository
extends Repository
{
- private File location;
+ private File path;
- public File getLocation()
+ public File getPath()
{
- return ( (LocalRepository) getInstance() ).location;
+ return ( (LocalRepository) getInstance() ).path;
}
- public void setLocation( File location )
+ public void setPath( File path )
{
- this.location = location;
+ this.path = path;
}
}
