← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ivy/oneiric

~ubuntu-branches/ubuntu/oneiric/ivy/oneiric

« back to all changes in this revision

Viewing changes to src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java

Committer: Bazaar Package Importer
Author(s): Miguel Landaeta
Date: 2011-02-06 20:56:32 UTC
mfrom: (3.2.4 sid)
Revision ID: james.westby@ubuntu.com-20110206205632-sqhg7bx09z0ywj79

Tags: 2.2.0-1

* New upstream release.
* Update pom.xml to the latest version.
* Add Build-Depends and Suggests on libbcprov-java and libbcpg-java.
* Add mh_clean call in clean target.
* Bump Standards-Version to 3.9.1. No changes were required.
* Add myself to Uploaders.

files added:
src/etc/makepom

src/etc/makepom/pom.template

src/java/org/apache/ivy/core/module/descriptor/DefaultExtendsDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/ExtendsDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/InheritableItem.java

src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java

src/java/org/apache/ivy/plugins/parser/m2/pom.template

src/java/org/apache/ivy/plugins/signer

src/java/org/apache/ivy/plugins/signer/SignatureGenerator.java

src/java/org/apache/ivy/plugins/signer/bouncycastle

src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java

files modified:
CHANGES.txt

META-INF/MANIFEST.MF

NOTICE

README

RELEASE_NOTES

build.properties

build.xml

debian/changelog

debian/control

debian/pom.xml

debian/rules

ivy.xml

ivy.xsd

optional.patterns

src/example/build-a-ivy-repository/build.xml

src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml

src/example/configurations/jdbc-example/ivy.xml

src/example/go-ivy/build.xml

src/example/multi-project/build.xml

src/example/multi-project/projects/version/src/version/Version.java

src/example/packager-resolver/ivysettings.xml

src/java/org/apache/ivy/Ivy.java

src/java/org/apache/ivy/ant/AntMessageLogger.java

src/java/org/apache/ivy/ant/IvyAntSettings.java

src/java/org/apache/ivy/ant/IvyArtifactReport.java

src/java/org/apache/ivy/ant/IvyBuildNumber.java

src/java/org/apache/ivy/ant/IvyDeliver.java

src/java/org/apache/ivy/ant/IvyInfo.java

src/java/org/apache/ivy/ant/IvyListModules.java

src/java/org/apache/ivy/ant/IvyMakePom.java

src/java/org/apache/ivy/ant/IvyPostResolveTask.java

src/java/org/apache/ivy/ant/IvyPublish.java

src/java/org/apache/ivy/ant/IvyReport.java

src/java/org/apache/ivy/ant/IvyResolve.java

src/java/org/apache/ivy/ant/IvyRetrieve.java

src/java/org/apache/ivy/core/IvyPatternHelper.java

src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java

src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java

src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java

src/java/org/apache/ivy/core/deliver/DeliverEngine.java

src/java/org/apache/ivy/core/deliver/DeliverOptions.java

src/java/org/apache/ivy/core/event/IvyEvent.java

src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java

src/java/org/apache/ivy/core/module/descriptor/Configuration.java

src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/ModuleDescriptor.java

src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java

src/java/org/apache/ivy/core/publish/PublishEngine.java

src/java/org/apache/ivy/core/publish/PublishOptions.java

src/java/org/apache/ivy/core/resolve/IvyNode.java

src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java

src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java

src/java/org/apache/ivy/core/resolve/ResolveData.java

src/java/org/apache/ivy/core/resolve/ResolveEngine.java

src/java/org/apache/ivy/core/resolve/VisitNode.java

src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java

src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java

src/java/org/apache/ivy/core/search/SearchEngine.java

src/java/org/apache/ivy/core/settings/IvySettings.java

src/java/org/apache/ivy/core/settings/XmlSettingsParser.java

src/java/org/apache/ivy/core/settings/typedef.properties

src/java/org/apache/ivy/core/sort/SortEngine.java

src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/parser/ModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/parser/ParserSettings.java

src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java

src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java

src/java/org/apache/ivy/plugins/parser/m2/PomReader.java

src/java/org/apache/ivy/plugins/parser/xml/UpdateOptions.java

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java

src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd

src/java/org/apache/ivy/plugins/report/XmlReportOutputter.java

src/java/org/apache/ivy/plugins/report/XmlReportWriter.java

src/java/org/apache/ivy/plugins/report/ivy-report.xsl

src/java/org/apache/ivy/plugins/repository/TransferEvent.java

src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java

src/java/org/apache/ivy/plugins/repository/url/URLResource.java

src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java

src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java

src/java/org/apache/ivy/plugins/resolver/BasicResolver.java

src/java/org/apache/ivy/plugins/resolver/CacheResolver.java

src/java/org/apache/ivy/plugins/resolver/ChainResolver.java

src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java

src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java

src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java

src/java/org/apache/ivy/plugins/resolver/ResolverSettings.java

src/java/org/apache/ivy/plugins/resolver/packager/build.xml

src/java/org/apache/ivy/plugins/resolver/packager/packager-1.0.xsd

src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl

src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java

src/java/org/apache/ivy/util/ChecksumHelper.java

src/java/org/apache/ivy/util/ConfigurationUtils.java

src/java/org/apache/ivy/util/CredentialsUtil.java

src/java/org/apache/ivy/util/FileUtil.java

src/java/org/apache/ivy/util/MessageLoggerEngine.java

src/java/org/apache/ivy/util/PropertiesFile.java

src/java/org/apache/ivy/util/XMLHelper.java

src/java/org/apache/ivy/util/url/AbstractURLHandler.java

src/java/org/apache/ivy/util/url/ApacheURLLister.java

src/java/org/apache/ivy/util/url/BasicURLHandler.java

src/java/org/apache/ivy/util/url/CredentialsStore.java

src/java/org/apache/ivy/util/url/HttpClientHandler.java

src/java/org/apache/ivy/util/url/IvyAuthenticator.java

Show diffs side-by-side

added added

removed removed

src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java

279

279

}

280

280

281

281

private void initTransaction(ModuleRevisionId module) {

282

ModuleRevisionId mrid = module;

283

if (isM2compatible()) {

284

mrid = convertM2IdForResourceSearch(module);

285

}

286

282

287

transactionTempDir = Checks.checkAbsolute(IvyPatternHelper.substitute(

283

288

baseTransactionPattern,

284

289

ModuleRevisionId.newInstance(

285

module, module.getRevision() + TRANSACTION_DESTINATION_SUFFIX)),

290

mrid, mrid.getRevision() + TRANSACTION_DESTINATION_SUFFIX)),

286

291

"baseTransactionPattern");

287

292

transactionDestDir = Checks.checkAbsolute(IvyPatternHelper.substitute(

288

baseTransactionPattern, module), "baseTransactionPattern");

293

baseTransactionPattern, mrid), "baseTransactionPattern");

289

294

}

290

295

291

296

public String getTransactional() {

Older »