You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2017/06/03 16:17:05 UTC
[10/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace,
javadoc, JLS)
Checkstyle-driven cleanup (whitespace, javadoc, JLS)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ef719aca
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ef719aca
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ef719aca
Branch: refs/heads/master
Commit: ef719acab90fdda24427d058d5d8aa15d13c7ced
Parents: 57ee0f2
Author: twogee <g....@gmail.com>
Authored: Sat Jun 3 11:42:00 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Sat Jun 3 11:47:51 2017 +0200
----------------------------------------------------------------------
build-release.xml | 266 +++++++++----------
.../src/example/Hello.java | 8 +-
.../src/example/ConfigurationsExample.java | 8 +-
.../src/filter/FilterProvider.java | 4 +-
.../src/filter/ccimpl/CCFilter.java | 2 +-
.../src/filter/hmimpl/HMFilter.java | 2 +-
.../test/filter/AbstractTestFilter.java | 4 +-
.../multi-projects/myapp/src/myapp/Main.java | 4 +-
.../dependee/src/standalone/Main.java | 8 +-
.../dependence/depender/src/depending/Main.java | 6 +-
src/example/dual/project/src/example/Hello.java | 14 +-
src/example/hello-ivy/src/example/Hello.java | 10 +-
.../projects/console/src/console/Main.java | 10 +-
.../projects/find/src/find/FindFile.java | 8 +-
.../projects/find/src/find/Main.java | 14 +-
.../projects/list/src/list/ListFile.java | 8 +-
.../projects/list/src/list/Main.java | 14 +-
.../projects/size/src/size/FileSize.java | 6 +-
.../projects/sizewhere/src/sizewhere/Main.java | 14 +-
.../sizewhere/src/sizewhere/SizeWhere.java | 4 +-
.../projects/version/src/version/Version.java | 6 +-
src/java/org/apache/ivy/Main.java | 2 +-
src/java/org/apache/ivy/ant/AntCallTrigger.java | 6 +-
.../org/apache/ivy/ant/AntMessageLogger.java | 4 +-
.../apache/ivy/ant/IvyAntVariableContainer.java | 4 +-
.../org/apache/ivy/ant/IvyCacheFileset.java | 4 +-
src/java/org/apache/ivy/ant/IvyCheck.java | 2 +-
src/java/org/apache/ivy/ant/IvyCleanCache.java | 4 +-
src/java/org/apache/ivy/core/IvyThread.java | 2 +-
.../apache/ivy/core/cache/ArtifactOrigin.java | 4 +-
.../org/apache/ivy/core/cache/CacheUtil.java | 4 +-
.../cache/DefaultResolutionCacheManager.java | 4 +-
.../core/cache/ModuleDescriptorMemoryCache.java | 2 +-
.../ivy/core/cache/RepositoryCacheManager.java | 65 +++--
.../PublishingDependencyRevisionResolver.java | 2 +-
.../event/publish/EndArtifactPublishEvent.java | 2 +-
.../ivy/core/event/publish/PublishEvent.java | 2 +-
.../publish/StartArtifactPublishEvent.java | 2 +-
.../resolve/EndResolveDependencyEvent.java | 2 +-
.../core/event/retrieve/EndRetrieveEvent.java | 8 +-
.../descriptor/AbstractIncludeExcludeRule.java | 2 +-
.../ivy/core/module/descriptor/Artifact.java | 18 +-
.../core/module/descriptor/Configuration.java | 6 +-
.../module/descriptor/ConfigurationAware.java | 4 +-
.../module/descriptor/ConfigurationGroup.java | 4 +-
.../descriptor/ConfigurationIntersection.java | 4 +-
.../DefaultDependencyArtifactDescriptor.java | 2 +-
.../descriptor/DefaultDependencyDescriptor.java | 11 +-
.../descriptor/DefaultModuleDescriptor.java | 5 +-
.../DependencyDescriptorMediator.java | 2 +-
.../ivy/core/module/descriptor/ExcludeRule.java | 6 +-
.../ivy/core/module/descriptor/IncludeRule.java | 6 +-
.../core/module/descriptor/InheritableItem.java | 2 +-
.../module/descriptor/ModuleDescriptor.java | 10 +-
.../OverrideDependencyDescriptorMediator.java | 6 +-
.../ivy/core/module/id/ArtifactRevisionId.java | 2 +-
.../org/apache/ivy/core/module/id/ModuleId.java | 22 +-
.../ivy/core/module/id/ModuleRevisionId.java | 8 +-
.../apache/ivy/core/module/id/ModuleRules.java | 20 +-
.../apache/ivy/core/publish/PublishOptions.java | 2 +-
.../ivy/core/report/ArtifactDownloadReport.java | 4 +-
.../report/MetadataArtifactDownloadReport.java | 4 +-
.../repository/RepositoryManagementEngine.java | 8 +-
.../apache/ivy/core/resolve/ResolveData.java | 10 +-
.../core/resolve/ResolvedModuleRevision.java | 14 +-
.../ivy/core/retrieve/RetrieveOptions.java | 2 +-
.../apache/ivy/core/settings/IvySettings.java | 4 +
.../ivy/core/settings/IvyVariableContainer.java | 2 +-
.../core/settings/IvyVariableContainerImpl.java | 4 +-
.../apache/ivy/core/settings/Validatable.java | 2 +-
.../org/apache/ivy/core/sort/ModuleInSort.java | 10 +-
.../core/sort/NonMatchingVersionReporter.java | 2 +-
.../org/apache/ivy/core/sort/SortEngine.java | 4 +-
.../org/apache/ivy/osgi/core/BundleInfo.java | 4 +-
.../ivy/osgi/core/ManifestHeaderValue.java | 6 +-
.../apache/ivy/osgi/core/ManifestParser.java | 4 +-
.../ivy/osgi/filter/MultiOperatorFilter.java | 2 +-
.../ivy/osgi/filter/OSGiFilterParser.java | 6 +-
.../ivy/osgi/filter/UniOperatorFilter.java | 2 +-
.../osgi/repo/AbstractFSManifestIterable.java | 8 +-
.../ivy/osgi/repo/AbstractOSGiResolver.java | 2 +-
.../ivy/osgi/repo/FSManifestIterable.java | 4 +-
.../apache/ivy/osgi/repo/RepoDescriptor.java | 8 +-
.../osgi/repo/RepositoryManifestIterable.java | 2 +-
.../apache/ivy/osgi/util/DelegatingHandler.java | 6 +-
.../org/apache/ivy/osgi/util/ParseUtil.java | 2 +-
src/java/org/apache/ivy/osgi/util/Version.java | 2 +-
.../org/apache/ivy/osgi/util/VersionRange.java | 4 +-
.../ivy/plugins/conflict/ConflictManager.java | 4 +-
.../plugins/conflict/LatestConflictManager.java | 5 +-
.../plugins/conflict/RegexpConflictManager.java | 6 +-
.../ivy/plugins/latest/LatestStrategy.java | 4 +-
.../ivy/plugins/lock/DeleteOnExitHook.java | 2 +-
.../plugins/matcher/AbstractPatternMatcher.java | 4 +-
.../org/apache/ivy/plugins/matcher/Matcher.java | 4 +-
.../plugins/matcher/RegexpPatternMatcher.java | 2 +-
.../parser/AbstractModuleDescriptorParser.java | 2 +-
.../plugins/parser/ModuleDescriptorParser.java | 6 +-
.../parser/ModuleDescriptorParserRegistry.java | 2 +-
.../parser/m2/PomModuleDescriptorBuilder.java | 2 +-
.../ivy/plugins/parser/m2/PomWriterOptions.java | 2 +-
.../parser/xml/XmlModuleDescriptorWriter.java | 4 +-
.../apache/ivy/plugins/repository/Resource.java | 14 +-
.../plugins/repository/sftp/SFTPRepository.java | 6 +-
.../apache/ivy/plugins/repository/ssh/Scp.java | 10 +-
.../plugins/repository/ssh/SshRepository.java | 5 +
.../ivy/plugins/repository/ssh/SshResource.java | 8 +-
.../plugins/repository/vfs/VfsRepository.java | 2 +
.../resolver/AbstractPatternsBasedResolver.java | 2 +-
.../ivy/plugins/resolver/AbstractResolver.java | 11 +-
.../resolver/AbstractWorkspaceResolver.java | 2 +-
.../ivy/plugins/resolver/BasicResolver.java | 8 +-
.../ivy/plugins/resolver/DualResolver.java | 2 +-
.../plugins/resolver/FileSystemResolver.java | 2 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 2 +-
.../ivy/plugins/resolver/IvyRepResolver.java | 2 +-
.../plugins/resolver/RepositoryResolver.java | 2 +-
.../plugins/resolver/util/ResourceMDParser.java | 2 +-
.../ivy/plugins/resolver/util/URLLister.java | 2 +-
.../ivy/plugins/trigger/AbstractTrigger.java | 2 +-
.../apache/ivy/plugins/trigger/LogTrigger.java | 10 +-
.../plugins/version/AbstractVersionMatcher.java | 5 +
.../plugins/version/ChainVersionMatcher.java | 6 +-
.../plugins/version/LatestVersionMatcher.java | 5 +
.../org/apache/ivy/plugins/version/Match.java | 2 +-
.../plugins/version/PatternVersionMatcher.java | 2 +-
.../apache/ivy/util/AbstractMessageLogger.java | 2 +-
src/java/org/apache/ivy/util/Checks.java | 2 +-
.../org/apache/ivy/util/ChecksumHelper.java | 4 +-
.../org/apache/ivy/util/ConfigurationUtils.java | 4 +-
src/java/org/apache/ivy/util/Configurator.java | 2 +-
src/java/org/apache/ivy/util/Credentials.java | 4 +-
src/java/org/apache/ivy/util/FileResolver.java | 6 +-
src/java/org/apache/ivy/util/FileUtil.java | 16 +-
src/java/org/apache/ivy/util/HostUtil.java | 4 +-
src/java/org/apache/ivy/util/MemoryUtil.java | 6 +-
src/java/org/apache/ivy/util/Message.java | 4 +-
src/java/org/apache/ivy/util/MessageLogger.java | 8 +-
.../apache/ivy/util/MessageLoggerEngine.java | 6 +-
src/java/org/apache/ivy/util/StringUtils.java | 14 +-
.../ivy/util/extendable/ExtendableItem.java | 10 +-
.../util/extendable/ExtendableItemHelper.java | 2 +-
.../apache/ivy/util/filter/FilterHelper.java | 2 +-
.../apache/ivy/util/url/ApacheURLLister.java | 8 +-
.../apache/ivy/util/url/BasicURLHandler.java | 4 +-
.../apache/ivy/util/url/CredentialsStore.java | 2 +-
.../apache/ivy/util/url/IvyAuthenticator.java | 2 +-
147 files changed, 577 insertions(+), 517 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 0fa4a9c..379655f 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -14,9 +14,9 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<project name="IvyRelease" default="snapshot"
+<project name="IvyRelease" default="snapshot"
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ivy2="antlib:org.apache.ivy.ant_2"
xmlns:xooki="antlib:xooki"
@@ -24,18 +24,18 @@
<import file="build.xml"/>
<macrodef name="run-tutorial">
- <attribute name="antfile" />
- <attribute name="output" />
- <attribute name="target" default="" />
- <attribute name="failonerror" default="true" />
+ <attribute name="antfile"/>
+ <attribute name="output"/>
+ <attribute name="target" default=""/>
+ <attribute name="failonerror" default="true"/>
<sequential>
<echo>Running @{antfile} @{target} > @{output}</echo>
- <local name="antfile.dir" />
- <dirname property="antfile.dir" file="@{antfile}" />
+ <local name="antfile.dir"/>
+ <dirname property="antfile.dir" file="@{antfile}"/>
- <local name="antfile.name" />
- <basename property="antfile.name" file="@{antfile}" />
+ <local name="antfile.name"/>
+ <basename property="antfile.name" file="@{antfile}"/>
<echo file="@{output}">[ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator}</echo>
<java classname="org.apache.tools.ant.launch.Launcher"
@@ -45,103 +45,103 @@
append="true"
output="@{output}">
<classpath>
- <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+ <fileset file="${artifacts.build.dir}/jars/${final.name}"/>
<!--
We need to set the classpath like this, otherwise the invoked
build scripts are not capable of compiling sources ???
-->
- <path path="${java.class.path}" />
+ <path path="${java.class.path}"/>
</classpath>
- <sysproperty key="ivy.cache.dir" value="${tutorial.cache}" />
- <sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}" />
- <sysproperty key="ivy.cache.ttl.default" value="1s" />
- <sysproperty key="skip.download" value="true" />
- <arg line="-f @{antfile}" />
- <arg line="@{target}" />
+ <sysproperty key="ivy.cache.dir" value="${tutorial.cache}"/>
+ <sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}"/>
+ <sysproperty key="ivy.cache.ttl.default" value="1s"/>
+ <sysproperty key="skip.download" value="true"/>
+ <arg line="-f @{antfile}"/>
+ <arg line="@{target}"/>
</java>
</sequential>
</macrodef>
<target name="generate-tutorial-output" depends="jar, generate-doc-init">
- <property name="output.dir" value="${build.dir}/output" />
- <delete dir="${output.dir}" />
- <mkdir dir="${output.dir}" />
+ <property name="output.dir" value="${build.dir}/output"/>
+ <delete dir="${output.dir}"/>
+ <mkdir dir="${output.dir}"/>
<!-- create a copy of the tutorials so we can easily get rid of the generated files -->
- <property name="tutorial.src.dir" value="${build.dir}/examples" />
- <delete dir="${tutorial.src.dir}" />
- <mkdir dir="${tutorial.src.dir}" />
+ <property name="tutorial.src.dir" value="${build.dir}/examples"/>
+ <delete dir="${tutorial.src.dir}"/>
+ <mkdir dir="${tutorial.src.dir}"/>
<copy todir="${tutorial.src.dir}">
- <fileset dir="src/example" />
+ <fileset dir="src/example"/>
</copy>
<!-- create a cache and local-repository for the tutorials -->
- <property name="tutorial.build.dir" value="${build.dir}/tutorial" />
- <property name="tutorial.cache" value="${tutorial.build.dir}/cache" />
- <property name="tutorial.local-repo" value="${tutorial.build.dir}/local" />
+ <property name="tutorial.build.dir" value="${build.dir}/tutorial"/>
+ <property name="tutorial.cache" value="${tutorial.build.dir}/cache"/>
+ <property name="tutorial.local-repo" value="${tutorial.build.dir}/local"/>
<!-- go-ivy : not logged, but run in order to check if it still run -->
- <run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt" />
- <delete file="${output.dir}/dummy.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt"/>
+ <delete file="${output.dir}/dummy.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- hello-ivy : Quick Start - start.html -->
- <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-1.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-2.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-1.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-2.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- multiple resolvers - multiple.html -->
- <run-tutorial antfile="${tutorial.src.dir}/chained-resolvers/chainedresolvers-project/build.xml" output="${output.dir}/chained-resolvers.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/chained-resolvers/chainedresolvers-project/build.xml" output="${output.dir}/chained-resolvers.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- dual - dual.html -->
- <run-tutorial antfile="${tutorial.src.dir}/dual/project/build.xml" output="${output.dir}/dual.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/dual/project/build.xml" output="${output.dir}/dual.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- Project dependencies - multi-project.html -->
- <run-tutorial antfile="${tutorial.src.dir}/dependence/dependee/build.xml" target="publish" output="${output.dir}/dependence-standalone.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/dependence/depender/build.xml" output="${output.dir}/dependence-depending.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/dependence/dependee/build.xml" target="publish" output="${output.dir}/dependence-standalone-2.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/dependence/depender/build.xml" output="${output.dir}/dependence-depending-2.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/dependence/dependee/build.xml" target="publish" output="${output.dir}/dependence-standalone.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/dependence/depender/build.xml" output="${output.dir}/dependence-depending.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/dependence/dependee/build.xml" target="publish" output="${output.dir}/dependence-standalone-2.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/dependence/depender/build.xml" output="${output.dir}/dependence-depending-2.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- configuration - Using Ivy Configuration - conf.html -->
- <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/filter-framework/build.xml" output="${output.dir}/configurations-lib.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/myapp/build.xml" output="${output.dir}/configurations-runcc.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/myapp/build.xml" target="run-hm" output="${output.dir}/configurations-runhm.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/filter-framework/build.xml" output="${output.dir}/configurations-lib.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/myapp/build.xml" output="${output.dir}/configurations-runcc.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/configurations/multi-projects/myapp/build.xml" target="run-hm" output="${output.dir}/configurations-runhm.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!--Building a repository - basic.html -->
- <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2" output="${output.dir}/install.txt" />
+ <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2" output="${output.dir}/install.txt"/>
<pathconvert property="myrepository.content" pathsep="${line.separator}">
- <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace" />
+ <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace"/>
</pathconvert>
<echo file="${output.dir}/myrepository-content.txt">[ivy@apache:/]$ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace -type f -print${line.separator}</echo>
<echo file="${output.dir}/myrepository-content.txt" append="true">${myrepository.content}</echo>
- <delete dir="${tutorial.build.dir}" />
- <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-deps" output="${output.dir}/install-deps.txt" failonerror="false" />
+ <delete dir="${tutorial.build.dir}"/>
+ <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-deps" output="${output.dir}/install-deps.txt" failonerror="false"/>
<pathconvert property="myrepository.content.deps" pathsep="${line.separator}">
- <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate" />
+ <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate"/>
</pathconvert>
<echo file="${output.dir}/myrepository-content-deps.txt">[ivy@apache:/]$ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate -type f -print${line.separator}</echo>
<echo file="${output.dir}/myrepository-content-deps.txt" append="true">${myrepository.content.deps}</echo>
- <delete dir="${tutorial.build.dir}" />
+ <delete dir="${tutorial.build.dir}"/>
<!--Building a repository - advanced.html -->
- <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-namespace" output="${output.dir}/install-namespace.txt" />
+ <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-namespace" output="${output.dir}/install-namespace.txt"/>
<pathconvert property="myrepository.content.namespace" pathsep="${line.separator}">
- <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/advanced" />
+ <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/advanced"/>
</pathconvert>
<echo file="${output.dir}/myrepository-content-namespace.txt">$ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/advanced -type f -print${line.separator}</echo>
<echo file="${output.dir}/myrepository-content-namespace.txt" append="true">${myrepository.content.namespace}</echo>
- <delete dir="${tutorial.build.dir}" />
+ <delete dir="${tutorial.build.dir}"/>
<!-- multi-project - multiproject.html -->
- <run-tutorial antfile="${tutorial.src.dir}/multi-project/build.xml" target="-p" output="${output.dir}/multi-project-general-antp.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/multi-project/projects/find/build.xml" target="-p" output="${output.dir}/multi-project-find-antp.txt" />
- <run-tutorial antfile="${tutorial.src.dir}/multi-project/build.xml" target="publish-all" output="${output.dir}/multi-project-general-publishall.txt" />
- <delete dir="${tutorial.build.dir}" />
+ <run-tutorial antfile="${tutorial.src.dir}/multi-project/build.xml" target="-p" output="${output.dir}/multi-project-general-antp.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/multi-project/projects/find/build.xml" target="-p" output="${output.dir}/multi-project-find-antp.txt"/>
+ <run-tutorial antfile="${tutorial.src.dir}/multi-project/build.xml" target="publish-all" output="${output.dir}/multi-project-general-publishall.txt"/>
+ <delete dir="${tutorial.build.dir}"/>
<!-- Correct the location of the examples to a dummy '/ivy' location -->
<pathconvert property="tutorial.root" dirsep="/">
@@ -154,27 +154,27 @@
</pathconvert>
<pathconvert property="ivy.jar.location" dirsep="/">
<identitymapper/>
- <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+ <fileset file="${artifacts.build.dir}/jars/${final.name}"/>
</pathconvert>
- <replace dir="${output.dir}" token="\" value="/" />
- <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
- <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local" />
- <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar" />
- <replace dir="${output.dir}" token="-f build.xml " value="" />
- <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
+ <replace dir="${output.dir}" token="\" value="/"/>
+ <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy"/>
+ <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local"/>
+ <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar"/>
+ <replace dir="${output.dir}" token="-f build.xml " value=""/>
+ <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache"/>
<copy todir="${doc.tmp.dir}/tutorial/log">
- <fileset dir="${output.dir}" />
+ <fileset dir="${output.dir}"/>
</copy>
</target>
<target name="generate-doc-init" depends="release-version">
<!-- copy documentation to temp dir to replace version tokens -->
- <property name="doc.tmp.dir" value="${build.dir}/tempdoc" />
- <mkdir dir="${doc.tmp.dir}" />
+ <property name="doc.tmp.dir" value="${build.dir}/tempdoc"/>
+ <mkdir dir="${doc.tmp.dir}"/>
<copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
- <fileset dir="${doc.src.dir}" />
+ <fileset dir="${doc.src.dir}"/>
<filterset>
<filter token="version" value="${build.version}"/>
</filterset>
@@ -183,12 +183,12 @@
<target name="generate-doc" depends="generate-doc-init, generate-tutorial-output">
<copy todir="${doc.build.dir}">
- <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
- <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
+ <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd"/>
+ <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt"/>
</copy>
<!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
+ <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
<xooki:generate destDir="${doc.build.dir}" checkUpToDate="true" xookidir="${doc.src.dir}/xooki">
<fileset dir="${doc.tmp.dir}">
<include name="**/*.html"/>
@@ -205,21 +205,21 @@
<!-- generate print-friendly doc -->
<!-- modify the basedir because othwise xooki.js will not be found! -->
- <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc" />
+ <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc"/>
</target>
<target name="generate-print-doc">
<!-- requires java 6 jdk in path and Apache Ant 1.7 -->
- <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml" />
+ <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
<xooki:print src="${doc.tmp.dir}/index.html"
dest="${doc.build.dir}/book.html"
- xookidir="${doc.src.dir}/xooki" />
+ xookidir="${doc.src.dir}/xooki"/>
</target>
- <target name="all-doc" depends="javadoc, generate-doc" />
+ <target name="all-doc" depends="javadoc, generate-doc"/>
<target name="init-snapshot" depends="default-version">
- <property name="snapshot.full.name" value="apache-ivy-${build.version}" />
+ <property name="snapshot.full.name" value="apache-ivy-${build.version}"/>
</target>
<target name="snapshot-metadata" depends="init-snapshot, resolve">
@@ -232,16 +232,16 @@
</target>
<target name="snapshot-src" depends="init-snapshot">
- <delete dir="${build.dir}/snapshot-src" failonerror="false" />
+ <delete dir="${build.dir}/snapshot-src" failonerror="false"/>
<exec executable="git" failonerror="true">
- <arg line="clone ${basedir} ${build.dir}/snapshot-src" />
+ <arg line="clone ${basedir} ${build.dir}/snapshot-src"/>
</exec>
<exec dir="${build.dir}/snapshot-src" executable="git" failonerror="true">
- <arg line="clean -d -x -f" />
+ <arg line="clean -d -x -f"/>
</exec>
<mkdir dir="${distrib.dir}/dist/${build.version}"/>
<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
- <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" />
+ <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
compression="gzip" longfile="gnu">
@@ -273,8 +273,8 @@
<target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
<mkdir dir="${distrib.dir}/dist/${build.version}"/>
- <delete dir="${build.dir}/lib" />
- <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
+ <delete dir="${build.dir}/lib"/>
+ <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
@@ -288,7 +288,7 @@
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- <zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
+ <zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
compression="gzip" longfile="gnu">
@@ -297,16 +297,16 @@
</target>
<target name="snapshot-bin"
- depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
+ depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies"/>
<target name="release-xsd" depends="init-snapshot">
<!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
- <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
+ <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}"/>
</target>
<target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
- <property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
+ <property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}"/>
<ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
templatefile="${basedir}/src/etc/makepom/pom.template">
@@ -314,14 +314,14 @@
<mapping conf="test" scope="test"/>
</ivy:makepom>
<copy file="${artifacts.build.dir}/jars/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
+ tofile="${m2.distrib.dir}/ivy-${build.version}.jar"/>
<!-- jar javadocs -->
<jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
- <fileset dir="${javadoc.build.dir}" />
+ <fileset dir="${javadoc.build.dir}"/>
</jar>
<!-- copy sources jar -->
<copy file="${artifacts.build.dir}/sources/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar" />
+ tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar"/>
<checksum algorithm="md5">
<fileset dir="${m2.distrib.dir}">
@@ -362,7 +362,7 @@
</target>
<target name="release-version">
- <property name="build.version" value="${target.ivy.version}" />
+ <property name="build.version" value="${target.ivy.version}"/>
<echo>Setting version to ${build.version}</echo>
<condition property="status" value="release">
<matches pattern="^\d+\.\d+\.\d+$" string="${build.version}"/>
@@ -370,26 +370,26 @@
<condition property="status" value="milestone">
<matches pattern="^\d+\.\d+\.\d+-(alpha|beta|rc)\d+$" string="${build.version}"/>
</condition>
- <property name="status" value="integration" />
+ <property name="status" value="integration"/>
<echo>Setting status to ${status}</echo>
</target>
<target name="sign" depends="init-ivy">
- <property file="${user.home}/ivybuild.properties" />
+ <property file="${user.home}/ivybuild.properties"/>
<input message="please enter your PGP password: " addproperty="pgp.password"/>
<input message="please enter your PGP keyId: " addproperty="pgp.keyId"/>
- <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
+ <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant_2">
<classpath>
- <fileset dir="${artifacts.build.dir}/jars" includes="${final.name}" />
- <fileset dir="${build.dir}/lib" excludes="ant-*.jar" />
+ <fileset dir="${artifacts.build.dir}/jars" includes="${final.name}"/>
+ <fileset dir="${build.dir}/lib" excludes="ant-*.jar"/>
</classpath>
</taskdef>
- <ivy2:settings id="sign.settingsId" file="ivysettings-release.xml" />
+ <ivy2:settings id="sign.settingsId" file="ivysettings-release.xml"/>
<ivy2:cachepath organisation="org.apache.commons" settingsRef="sign.settingsId" transitive="false" log="download-only"
module="commons-openpgp" revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
<ivy2:cachepath organisation="org.bouncycastle" settingsRef="sign.settingsId" log="download-only"
@@ -404,21 +404,21 @@
<java classname="org.apache.tools.ant.launch.Launcher"
fork="true">
<classpath>
- <fileset dir="${ant.home}" includes="**/*.jar" />
- <path refid="bouncycastle.bcprov.classpath" />
- <path refid="bouncycastle.bcpg.classpath" />
- <path refid="openpgp.classpath" />
+ <fileset dir="${ant.home}" includes="**/*.jar"/>
+ <path refid="bouncycastle.bcprov.classpath"/>
+ <path refid="bouncycastle.bcpg.classpath"/>
+ <path refid="openpgp.classpath"/>
</classpath>
- <arg line="-f build-release.xml" />
- <arg line="sign-internal" />
- <arg line="-Dpgp.password=${pgp.password}" />
- <arg line="-Dpgp.keyId=${pgp.keyId}" />
+ <arg line="-f build-release.xml"/>
+ <arg line="sign-internal"/>
+ <arg line="-Dpgp.password=${pgp.password}"/>
+ <arg line="-Dpgp.keyId=${pgp.keyId}"/>
</java>
</target>
<target name="sign-internal">
- <property file="build.properties" />
- <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml" uri="antlib:org.apache.commons.openpgp.ant" />
+ <property file="build.properties"/>
+ <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml" uri="antlib:org.apache.commons.openpgp.ant"/>
<openpgp:signer secring="${user.home}/.gnupg/secring.gpg"
pubring="${user.home}/.gnupg/pubring.gpg"
password="${pgp.password}"
@@ -441,32 +441,32 @@
<typedef resource="org/apache/rat/anttasks/antlib.xml"
uri="antlib:org.apache.rat.anttasks"
- classpathref="rat.classpath" />
+ classpathref="rat.classpath"/>
<delete dir="${rat.report.dir}"/>
<mkdir dir="${rat.report.dir}"/>
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report.dir}/rat-report.txt">
<fileset dir="${basedir}">
- <exclude name=".classpath" />
- <exclude name=".ivy2/**/*" />
- <exclude name="build/**/*" />
- <exclude name="bin/**/*" />
- <exclude name="**/*.sha1" />
- <exclude name="**/*.md5" />
- <exclude name="**/*.txt" />
- <exclude name="**/MANIFEST*.MF" />
- <exclude name="**/*.json" />
- <exclude name="doc/config.js" />
- <exclude name="doc/js/jquery.pack.js" />
- <exclude name="doc/js/jquery.treeview.js" />
- <exclude name="doc/xooki/tiddly/util.js" />
+ <exclude name=".classpath"/>
+ <exclude name=".ivy2/**/*"/>
+ <exclude name="build/**/*"/>
+ <exclude name="bin/**/*"/>
+ <exclude name="**/*.sha1"/>
+ <exclude name="**/*.md5"/>
+ <exclude name="**/*.txt"/>
+ <exclude name="**/MANIFEST*.MF"/>
+ <exclude name="**/*.json"/>
+ <exclude name="doc/config.js"/>
+ <exclude name="doc/js/jquery.pack.js"/>
+ <exclude name="doc/js/jquery.treeview.js"/>
+ <exclude name="doc/xooki/tiddly/util.js"/>
</fileset>
</rat:report>
<fail message="Some files have missing or incorrect license information. Check RAT report for more details!">
<condition>
<and>
- <not><resourcecontains resource="${rat.report.dir}/rat-report.txt" substring="0 Unknown Licenses" casesensitive="false" /></not>
+ <not><resourcecontains resource="${rat.report.dir}/rat-report.txt" substring="0 Unknown Licenses" casesensitive="false"/></not>
<equals arg1="${rat.failOnError}" arg2="true"/>
</and>
</condition>
@@ -474,25 +474,25 @@
</target>
<target name="upload-nexus" depends="release-version, init-ivy, jar">
- <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
+ <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant_2">
<classpath>
- <fileset dir="${artifacts.build.dir}/jars" includes="${final.name}" />
- <fileset dir="${build.dir}/lib" excludes="ant-*.jar" />
+ <fileset dir="${artifacts.build.dir}/jars" includes="${final.name}"/>
+ <fileset dir="${build.dir}/lib" excludes="ant-*.jar"/>
</classpath>
</taskdef>
- <property file="${user.home}/ivybuild.properties" />
+ <property file="${user.home}/ivybuild.properties"/>
<input message="please enter your PGP password: " addproperty="pgp.password"/>
<input message="please enter your PGP keyId: " addproperty="pgp.keyId"/>
<input message="please enter your repository.apache.org username: " addproperty="upload.user"/>
<input message="please enter your repository.apache.org password: " addproperty="upload.password"/>
- <ivy2:settings id="upload.settingsId" file="ivysettings-release.xml" />
- <ivy2:resolve file="${basedir}/build/artifact/ivy.xml" transitive="false" />
+ <ivy2:settings id="upload.settingsId" file="ivysettings-release.xml"/>
+ <ivy2:resolve file="${basedir}/build/artifact/ivy.xml" transitive="false"/>
<ivy2:publish organisation="org.apache.ivy"
module="ivy"
revision="${build.version}"
@@ -503,9 +503,9 @@
settingsRef="upload.settingsId"
resolver="nexus">
<!-- The standard maven2 artifacts -->
- <artifact name="ivy" ext="pom" type="ivy" />
- <artifact name="ivy" ext="jar" type="sources" classifier="sources" />
- <artifact name="ivy" ext="jar" type="javadoc" classifier="javadoc" />
+ <artifact name="ivy" ext="pom" type="ivy"/>
+ <artifact name="ivy" ext="jar" type="sources" classifier="sources"/>
+ <artifact name="ivy" ext="jar" type="javadoc" classifier="javadoc"/>
</ivy2:publish>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/chained-resolvers/chainedresolvers-project/src/example/Hello.java
----------------------------------------------------------------------
diff --git a/src/example/chained-resolvers/chainedresolvers-project/src/example/Hello.java b/src/example/chained-resolvers/chainedresolvers-project/src/example/Hello.java
index d9bc0ac..11ed0dd 100644
--- a/src/example/chained-resolvers/chainedresolvers-project/src/example/Hello.java
+++ b/src/example/chained-resolvers/chainedresolvers-project/src/example/Hello.java
@@ -20,18 +20,18 @@ package example;
import org.apache.commons.lang.WordUtils;
/**
- * Simple example world to show how easy it is to retreive libs with ivy !!!
+ * Simple example world to show how easy it is to retreive libs with ivy !!!
*/
public final class Hello {
public static void main(String[] args) {
String message = "example world !";
System.out.println("standard message :" + message);
- System.out.println("capitalized by " + WordUtils.class.getName()
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ " : " + WordUtils.capitalizeFully(message));
- System.out.println("upperCased by " + test.StringUtils.class.getName()
+ System.out.println("upperCased by " + test.StringUtils.class.getName()
+ " : " + test.StringUtils.upperCase(message));
}
-
+
private Hello() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/jdbc-example/src/example/ConfigurationsExample.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/jdbc-example/src/example/ConfigurationsExample.java b/src/example/configurations/jdbc-example/src/example/ConfigurationsExample.java
index fba4535..925824f 100644
--- a/src/example/configurations/jdbc-example/src/example/ConfigurationsExample.java
+++ b/src/example/configurations/jdbc-example/src/example/ConfigurationsExample.java
@@ -26,12 +26,12 @@ import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
public final class ConfigurationsExample {
-
+
public static void main(String[] args) {
String jdbcPropToLoad = "prod.properties";
CommandLineParser parser = new PosixParser();
Options options = new Options();
- options.addOption("d", "dev", false,
+ options.addOption("d", "dev", false,
"Dev tag to launch app in dev mode. Means that app will launch embedded mckoi db.");
try {
CommandLine line = parser.parse(options, args);
@@ -56,9 +56,9 @@ public final class ConfigurationsExample {
System.err.println("Jdbc Driver class loading failed. Reason: " + e.getMessage());
e.printStackTrace();
}
-
+
}
-
+
private ConfigurationsExample() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/multi-projects/filter-framework/src/filter/FilterProvider.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/src/filter/FilterProvider.java b/src/example/configurations/multi-projects/filter-framework/src/filter/FilterProvider.java
index 2ee151a..a948c3e 100644
--- a/src/example/configurations/multi-projects/filter-framework/src/filter/FilterProvider.java
+++ b/src/example/configurations/multi-projects/filter-framework/src/filter/FilterProvider.java
@@ -19,7 +19,7 @@ package filter;
public final class FilterProvider {
-
+
public static IFilter getFilter() {
try {
Class clazz = Class.forName("filter.ccimpl.CCFilter");
@@ -34,7 +34,7 @@ public final class FilterProvider {
return null;
}
}
-
+
private FilterProvider() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java b/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
index 3808d20..3dd8abb 100644
--- a/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
+++ b/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
import filter.IFilter;
public class CCFilter implements IFilter {
-
+
public String[] filter(String[] values, final String prefix) {
if (values == null) {
return null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java b/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
index d500809..18191c2 100644
--- a/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
+++ b/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
@@ -22,7 +22,7 @@ import java.util.List;
import filter.IFilter;
public class HMFilter implements IFilter {
-
+
public String[] filter(String[] values, String prefix) {
if (values == null) {
return null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
index 5d7e133..fcb97a6 100644
--- a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
+++ b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
@@ -42,7 +42,7 @@ public abstract class AbstractTestFilter {
@Test(expected = NullPointerException.class)
public void testFilterNullPrefix() {
getIFilter().filter(new String[]{"test"}, null);
- }
+ }
@Test
public void testFilter() {
@@ -50,7 +50,7 @@ public abstract class AbstractTestFilter {
"nogood", "mustbe filtered"}, "t");
assertNotNull(result);
assertEquals(result.length, 1);
- }
+ }
@Test
public void testFilterWithNullValues() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/configurations/multi-projects/myapp/src/myapp/Main.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/myapp/src/myapp/Main.java b/src/example/configurations/multi-projects/myapp/src/myapp/Main.java
index e5e2729..1a90eb6 100644
--- a/src/example/configurations/multi-projects/myapp/src/myapp/Main.java
+++ b/src/example/configurations/multi-projects/myapp/src/myapp/Main.java
@@ -22,7 +22,7 @@ import filter.FilterProvider;
import filter.IFilter;
public final class Main {
-
+
public static void main(String[] args) {
String[] toFilter = new String[] {"one", "two", "tree", "four"};
IFilter filter = FilterProvider.getFilter();
@@ -30,7 +30,7 @@ public final class Main {
String[] filtered = filter.filter(toFilter, "t");
System.out.println("Result :" + Arrays.asList(filtered));
}
-
+
private Main() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/dependence/dependee/src/standalone/Main.java
----------------------------------------------------------------------
diff --git a/src/example/dependence/dependee/src/standalone/Main.java b/src/example/dependence/dependee/src/standalone/Main.java
index ce28cb8..ca5fa10 100644
--- a/src/example/dependence/dependee/src/standalone/Main.java
+++ b/src/example/dependence/dependee/src/standalone/Main.java
@@ -36,20 +36,20 @@ public final class Main {
String version = p.getProperty("version");
if (version != null) {
return String.valueOf(Integer.parseInt(version));
- }
+ }
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
-
+
/**
* Return the same string with all words capitalized.
* @param str the string conatining the words to capitalize
* @return null if the string was null, the string with all words capitalized otherwise
*/
public static String capitalizeWords(String str) {
- System.out.println(" [" + Main.class.getName() + "] capitalizing string \""
+ System.out.println(" [" + Main.class.getName() + "] capitalizing string \""
+ str + "\" using " + WordUtils.class.getName());
return WordUtils.capitalizeFully(str);
}
@@ -58,7 +58,7 @@ public final class Main {
System.out.println("standard message : " + message);
System.out.println("capitalized message : " + capitalizeWords(message));
}
-
+
private Main() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/dependence/depender/src/depending/Main.java
----------------------------------------------------------------------
diff --git a/src/example/dependence/depender/src/depending/Main.java b/src/example/dependence/depender/src/depending/Main.java
index 2fa27da..a54e920 100644
--- a/src/example/dependence/depender/src/depending/Main.java
+++ b/src/example/dependence/depender/src/depending/Main.java
@@ -24,17 +24,17 @@ public final class Main {
public static void main(String[] args) {
String standaloneVersion = standalone.Main.getVersion();
if (standaloneVersion != null) {
- System.out.println("you are using version " + standaloneVersion
+ System.out.println("you are using version " + standaloneVersion
+ " of class " + standalone.Main.class.getName());
} else {
System.err.println("failed to get version of " + standalone.Main.class.getName());
}
- String message = "i am " + Main.class.getName()
+ String message = "i am " + Main.class.getName()
+ " and " + standalone.Main.class.getName() + " will do the job for me";
System.out.println("standard message : " + message);
System.out.println("capitalized message : " + standalone.Main.capitalizeWords(message));
}
-
+
private Main() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/dual/project/src/example/Hello.java
----------------------------------------------------------------------
diff --git a/src/example/dual/project/src/example/Hello.java b/src/example/dual/project/src/example/Hello.java
index 30e6bf9..bc84237 100644
--- a/src/example/dual/project/src/example/Hello.java
+++ b/src/example/dual/project/src/example/Hello.java
@@ -22,30 +22,30 @@ import org.apache.commons.httpclient.methods.HeadMethod;
import org.apache.commons.lang.WordUtils;
/**
- * Simple hello world example to show how easy it is to retrieve libs with ivy,
- * including transitive dependencies
+ * Simple hello world example to show how easy it is to retrieve libs with ivy,
+ * including transitive dependencies
*/
public final class Hello {
public static void main(String[] args) throws Exception {
String message = "hello ivy !";
System.out.println("standard message : " + message);
- System.out.println("capitalized by " + WordUtils.class.getName()
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ " : " + WordUtils.capitalizeFully(message));
-
+
HttpClient client = new HttpClient();
HeadMethod head = new HeadMethod("http://www.ibiblio.org/");
client.executeMethod(head);
-
+
int status = head.getStatusCode();
System.out.println("head status code with httpclient: " + status);
head.releaseConnection();
-
+
System.out.println(
"now check if httpclient dependency on commons-logging has been realized");
Class clss = Class.forName("org.apache.commons.logging.Log");
System.out.println("found logging class in classpath: " + clss);
}
-
+
private Hello() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/hello-ivy/src/example/Hello.java
----------------------------------------------------------------------
diff --git a/src/example/hello-ivy/src/example/Hello.java b/src/example/hello-ivy/src/example/Hello.java
index 55bff13..f3d0d45 100644
--- a/src/example/hello-ivy/src/example/Hello.java
+++ b/src/example/hello-ivy/src/example/Hello.java
@@ -26,7 +26,7 @@ import org.apache.commons.cli.Options;
import org.apache.commons.lang.WordUtils;
/**
- * Simple example to show how easy it is to retrieve transitive libs with ivy !!!
+ * Simple example to show how easy it is to retrieve transitive libs with ivy !!!
*/
public final class Hello {
public static void main(String[] args) throws Exception {
@@ -36,16 +36,16 @@ public final class Hello {
.create("message");
Options options = new Options();
options.addOption(msg);
-
+
CommandLineParser parser = new GnuParser();
CommandLine line = parser.parse(options, args);
-
+
String message = line.getOptionValue("message", "hello ivy !");
System.out.println("standard message : " + message);
- System.out.println("capitalized by " + WordUtils.class.getName()
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ " : " + WordUtils.capitalizeFully(message));
}
-
+
private Hello() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/console/src/console/Main.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/console/src/console/Main.java b/src/example/multi-project/projects/console/src/console/Main.java
index 1a328b1..87ab609 100644
--- a/src/example/multi-project/projects/console/src/console/Main.java
+++ b/src/example/multi-project/projects/console/src/console/Main.java
@@ -25,9 +25,9 @@ import java.lang.reflect.Method;
public final class Main {
- private static final Collection QUIT_COMMANDS =
+ private static final Collection QUIT_COMMANDS =
Arrays.asList(new String[] {"quit", "q", "exit"});
- private static final Collection HELP_COMMANDS =
+ private static final Collection HELP_COMMANDS =
Arrays.asList(new String[] {"help", "h", "?"});
public static void main(String[] a) throws Exception {
@@ -47,7 +47,7 @@ public final class Main {
error(command);
continue;
}
-
+
try {
String[] args = new String[split.length - 1];
System.arraycopy(split, 1, args, 0, args.length);
@@ -60,7 +60,7 @@ public final class Main {
}
}
}
-
+
private static void help() {
System.out.println("available commands:");
System.out.println("\tquit: quit the console");
@@ -71,7 +71,7 @@ public final class Main {
+ "compute total size of files with given name in given dir");
System.out.println("\thelp: displays this message");
}
-
+
private static void error(String command) {
System.out.println("unknown command " + command);
System.out.println("type ? for help");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/find/src/find/FindFile.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/find/src/find/FindFile.java b/src/example/multi-project/projects/find/src/find/FindFile.java
index 30e22a9..1e1e7ea 100644
--- a/src/example/multi-project/projects/find/src/find/FindFile.java
+++ b/src/example/multi-project/projects/find/src/find/FindFile.java
@@ -30,19 +30,19 @@ public final class FindFile {
static {
Version.register("find");
}
-
+
public static Collection find(File dir, String name) {
return find(ListFile.list(dir), name);
}
-
- private static Collection find(Collection files, final String name) {
+
+ private static Collection find(Collection files, final String name) {
return CollectionUtils.select(files, new Predicate() {
public boolean evaluate(Object o) {
return ((File) o).getName().indexOf(name) != -1;
}
});
}
-
+
private FindFile() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/find/src/find/Main.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/find/src/find/Main.java b/src/example/multi-project/projects/find/src/find/Main.java
index 63c9db0..1ed0c7e 100644
--- a/src/example/multi-project/projects/find/src/find/Main.java
+++ b/src/example/multi-project/projects/find/src/find/Main.java
@@ -44,16 +44,16 @@ public final class Main {
options.addOption(dir);
options.addOption(name);
-
+
return options;
}
-
+
public static void main(String[] args) throws Exception {
Options options = getOptions();
try {
-
+
CommandLineParser parser = new GnuParser();
-
+
CommandLine line = parser.parse(options, args);
File dir = new File(line.getOptionValue("dir", "."));
String name = line.getOptionValue("name", "jar");
@@ -65,12 +65,12 @@ public final class Main {
} catch (ParseException exp) {
// oops, something went wrong
System.err.println("Parsing failed. Reason: " + exp.getMessage());
-
+
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("find", options);
- }
+ }
}
-
+
private Main() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/list/src/list/ListFile.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/list/src/list/ListFile.java b/src/example/multi-project/projects/list/src/list/ListFile.java
index 99b921a..0985ab7 100644
--- a/src/example/multi-project/projects/list/src/list/ListFile.java
+++ b/src/example/multi-project/projects/list/src/list/ListFile.java
@@ -26,13 +26,13 @@ public final class ListFile {
static {
Version.register("list");
}
-
+
public static Collection list(File dir) {
Collection files = new ArrayList();
-
+
return list(dir, files);
}
-
+
private static Collection list(File file, Collection files) {
if (file.isDirectory()) {
File[] f = file.listFiles();
@@ -44,7 +44,7 @@ public final class ListFile {
}
return files;
}
-
+
private ListFile() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/list/src/list/Main.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/list/src/list/Main.java b/src/example/multi-project/projects/list/src/list/Main.java
index 8874994..5ae5c8d 100644
--- a/src/example/multi-project/projects/list/src/list/Main.java
+++ b/src/example/multi-project/projects/list/src/list/Main.java
@@ -39,14 +39,14 @@ public final class Main {
Options options = new Options();
options.addOption(dir);
-
+
return options;
}
-
+
public static void main(String[] args) throws Exception {
Options options = getOptions();
try {
-
+
CommandLineParser parser = new GnuParser();
CommandLine line = parser.parse(options, args);
@@ -59,13 +59,13 @@ public final class Main {
} catch (ParseException exp) {
// oops, something went wrong
System.err.println("Parsing failed. Reason: " + exp.getMessage());
-
+
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("list", options);
- }
+ }
}
-
+
private Main() {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/size/src/size/FileSize.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/size/src/size/FileSize.java b/src/example/multi-project/projects/size/src/size/FileSize.java
index 7a3e842..f0e0163 100644
--- a/src/example/multi-project/projects/size/src/size/FileSize.java
+++ b/src/example/multi-project/projects/size/src/size/FileSize.java
@@ -30,7 +30,7 @@ public final class FileSize {
public static long totalSize(File dir) {
return totalSize(list.ListFile.list(dir));
}
-
+
public static long totalSize(Collection files) {
long total = 0;
for (Iterator it = files.iterator(); it.hasNext();) {
@@ -38,8 +38,8 @@ public final class FileSize {
total += f.length();
}
return total;
- }
-
+ }
+
private FileSize() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/sizewhere/src/sizewhere/Main.java b/src/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
index 2a795ff..dc2a996 100644
--- a/src/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
+++ b/src/example/multi-project/projects/sizewhere/src/sizewhere/Main.java
@@ -42,30 +42,30 @@ public final class Main {
options.addOption(dir);
options.addOption(name);
-
+
return options;
}
-
+
public static void main(String[] args) throws Exception {
Options options = getOptions();
try {
-
+
CommandLineParser parser = new GnuParser();
CommandLine line = parser.parse(options, args);
File dir = new File(line.getOptionValue("dir", "."));
String name = line.getOptionValue("name", "jar");
- System.out.println("total size of files in " + dir
+ System.out.println("total size of files in " + dir
+ " containing " + name + ": " + SizeWhere.totalSize(dir, name));
} catch (ParseException exp) {
// oops, something went wrong
System.err.println("Parsing failed. Reason: " + exp.getMessage());
-
+
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("sizewhere", options);
- }
+ }
}
-
+
private Main() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java b/src/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
index fc25c2a..df27f31 100644
--- a/src/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
+++ b/src/example/multi-project/projects/sizewhere/src/sizewhere/SizeWhere.java
@@ -27,11 +27,11 @@ public final class SizeWhere {
static {
Version.register("sizewhere");
}
-
+
public static long totalSize(File dir, String name) {
return FileSize.totalSize(FindFile.find(dir, name));
}
-
+
private SizeWhere() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/example/multi-project/projects/version/src/version/Version.java
----------------------------------------------------------------------
diff --git a/src/example/multi-project/projects/version/src/version/Version.java b/src/example/multi-project/projects/version/src/version/Version.java
index 22952a8..9c9a605 100644
--- a/src/example/multi-project/projects/version/src/version/Version.java
+++ b/src/example/multi-project/projects/version/src/version/Version.java
@@ -27,9 +27,9 @@ public final class Version {
versions = new HashMap();
register("version");
}
-
+
private static Map versions;
-
+
public static void register(String module) {
try {
InputStream moduleVersion = Version.class.getResourceAsStream("/" + module
@@ -45,7 +45,7 @@ public final class Version {
ex.printStackTrace();
}
}
-
+
private Version() {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/Main.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/Main.java b/src/java/org/apache/ivy/Main.java
index 18d6a5d..c256319 100644
--- a/src/java/org/apache/ivy/Main.java
+++ b/src/java/org/apache/ivy/Main.java
@@ -393,7 +393,7 @@ public final class Main {
* All the files contained in the returned List exist, non existing files are simply skipped
* with a warning.
* </p>
- *
+ *
* @param line
* the command line in which the cp option should be parsed
* @return a List of files to include as extra classpath entries, or <code>null</code> if no cp
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/AntCallTrigger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/AntCallTrigger.java b/src/java/org/apache/ivy/ant/AntCallTrigger.java
index 0d287c4..0770dbd 100644
--- a/src/java/org/apache/ivy/ant/AntCallTrigger.java
+++ b/src/java/org/apache/ivy/ant/AntCallTrigger.java
@@ -39,14 +39,14 @@ import org.apache.tools.ant.taskdefs.Property;
* a failure.
* <p>
* Example of use in an ivysettings file:
- *
+ *
* <pre>
* <ant-call-trigger event="post-download-artifact" filter="type=zip"
* target="unzip"/>
* </pre>
- *
+ *
* Triggers a call to the target "unzip" for any downloaded artifact of type zip
- *
+ *
* @see AntBuildTrigger
* @since 1.4
*/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/AntMessageLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/AntMessageLogger.java b/src/java/org/apache/ivy/ant/AntMessageLogger.java
index 285e453..f6eedfb 100644
--- a/src/java/org/apache/ivy/ant/AntMessageLogger.java
+++ b/src/java/org/apache/ivy/ant/AntMessageLogger.java
@@ -39,7 +39,7 @@ public class AntMessageLogger extends AbstractMessageLogger {
* The created instance will automatically be unregistered from the Ivy instance when the task
* finishes.
* </p>
- *
+ *
* @param task
* the task the logger should use for logging
* @param ivy
@@ -107,7 +107,7 @@ public class AntMessageLogger extends AbstractMessageLogger {
/**
* Constructs a new AntMessageImpl instance.
- *
+ *
* @param task
* the ant project component this message implementation should use for logging. Must
* not be <code>null</code>.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java b/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
index e3a3d09..f9dc77f 100644
--- a/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
+++ b/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
@@ -60,14 +60,14 @@ class IvyAntVariableContainer extends IvyVariableContainerImpl implements IvyVar
/**
* Updates the Ant Project used in this container with variables set in Ivy.
- *
+ *
* All variables defined in Ivy will be set in the Ant project under two names:
* <ul>
* <li>the name of the variable</li>
* <li>the name of the variable suffixed with a dot + the given id, if the given id is not null
* </li>
* </ul>
- *
+ *
* @param id
* The identifier of the settings in which the variables have been set, which should
* be used as property names suffix
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/IvyCacheFileset.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyCacheFileset.java b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
index fbcf043..9a60f2e 100644
--- a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
+++ b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
@@ -93,7 +93,7 @@ public class IvyCacheFileset extends IvyCacheTask {
/**
* Returns the path of the file relative to the given base directory.
- *
+ *
* @param base
* the parent directory to which the file must be evaluated.
* @param file
@@ -119,7 +119,7 @@ public class IvyCacheFileset extends IvyCacheTask {
* <p>
* The returned base directory must be a parent of both the current base and the given file.
* </p>
- *
+ *
* @param base
* the current base directory, may be null.
* @param file
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/IvyCheck.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyCheck.java b/src/java/org/apache/ivy/ant/IvyCheck.java
index c101274..dda9c7f 100644
--- a/src/java/org/apache/ivy/ant/IvyCheck.java
+++ b/src/java/org/apache/ivy/ant/IvyCheck.java
@@ -52,7 +52,7 @@ public class IvyCheck extends IvyTask {
/**
* Adds a set of files to check.
- *
+ *
* @param set
* a set of files to check
*/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/ant/IvyCleanCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyCleanCache.java b/src/java/org/apache/ivy/ant/IvyCleanCache.java
index e22e40a..c4b0c07 100644
--- a/src/java/org/apache/ivy/ant/IvyCleanCache.java
+++ b/src/java/org/apache/ivy/ant/IvyCleanCache.java
@@ -40,7 +40,7 @@ public class IvyCleanCache extends IvyTask {
/**
* Sets the name of the repository cache to clean, '*' for all caches, 'NONE' for no repository
* cache cleaning at all.
- *
+ *
* @param cache
* the name of the cache to clean. Must not be <code>null</code>.
*/
@@ -54,7 +54,7 @@ public class IvyCleanCache extends IvyTask {
/**
* Sets whether the resolution cache should be cleaned or not.
- *
+ *
* @param resolution
* <code>true</code> if the resolution cache should be cleaned, <code>false</code>
* otherwise.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/IvyThread.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/IvyThread.java b/src/java/org/apache/ivy/core/IvyThread.java
index 5675160..d48fd16 100644
--- a/src/java/org/apache/ivy/core/IvyThread.java
+++ b/src/java/org/apache/ivy/core/IvyThread.java
@@ -21,7 +21,7 @@ package org.apache.ivy.core;
* A simple thread subclass associated the same IvyContext as the thread in which it is
* instantiated. If you override the run target, then you will have to call initContext() to do the
* association with the original IvyContext.
- *
+ *
* @see IvyContext
*/
public class IvyThread extends Thread {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java b/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
index 82ab6c0..b3449a2 100644
--- a/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
+++ b/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
@@ -30,7 +30,9 @@ public class ArtifactOrigin {
private static final String UNKNOWN = "UNKNOWN";
/**
- * Deprecated because of renaming due spell check.
+ * @param artifact ditto
+ * @return ArtifactOrigin
+ * @deprecated because of renaming due spell check.
*/
@Deprecated
public static final ArtifactOrigin unkwnown(Artifact artifact) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/cache/CacheUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/CacheUtil.java b/src/java/org/apache/ivy/core/cache/CacheUtil.java
index 71b2c14..d9394c3 100644
--- a/src/java/org/apache/ivy/core/cache/CacheUtil.java
+++ b/src/java/org/apache/ivy/core/cache/CacheUtil.java
@@ -19,13 +19,13 @@ package org.apache.ivy.core.cache;
/**
* Utility class providing some cache related facilities.
- *
+ *
*/
public final class CacheUtil {
/**
* Checks that the given pattern is acceptable as a cache pattern
- *
+ *
* @param cachePattern
* the pattern to check
* @throws IllegalArgumentException
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
index 2ae9b71..d1ccfc3 100644
--- a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
@@ -166,7 +166,7 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv
/**
* Choose write module descriptor parser for a given moduleDescriptor
- *
+ *
* @param moduleDescriptorFile
* a given module descriptor
* @return ModuleDescriptorParser
@@ -286,7 +286,7 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv
}
}
- private static class MapURLResolver extends RelativeUrlResolver {
+ private static final class MapURLResolver extends RelativeUrlResolver {
private Map paths;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCache.java b/src/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCache.java
index 97ef10e..cd2b0bd 100644
--- a/src/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCache.java
+++ b/src/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCache.java
@@ -41,7 +41,7 @@ class ModuleDescriptorMemoryCache {
/**
* Create a cache of the given size
- *
+ *
* @param size int
*/
public ModuleDescriptorMemoryCache(int size) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
index 6027452..b2b3e77 100644
--- a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
@@ -68,29 +68,33 @@ public interface RepositoryCacheManager {
* Search a module descriptor in cache for a mrid
*
* @param dd the dependency descriptor identifying the module to search
- * @param requestedRevisionId the requested dependency module revision id identifying the module to search
+ * @param requestedRevisionId the requested dependency module revision id identifying the module
+ * to search
* @param options options on how caching should be handled
- * @param expectedResolver the resolver with which the md in cache must have been resolved to be returned,
- * null if this doesn't matter
+ * @param expectedResolver the resolver with which the md in cache must have been resolved to
+ * be returned, null if this doesn't matter
* @return the ResolvedModuleRevision corresponding to the module found, null if none correct
* has been found in cache
*/
ResolvedModuleRevision findModuleInCache(DependencyDescriptor dd,
- ModuleRevisionId requestedRevisionId, CacheMetadataOptions options,
+ ModuleRevisionId requestedRevisionId,
+ CacheMetadataOptions options,
String expectedResolver);
/**
* Downloads an artifact to this cache.
*
* @param artifact the artifact to download
- * @param resourceResolver a resource resolver to use if the artifact needs to be resolved to a Resource for
- * downloading
- * @param resourceDownloader a resource downloader to use if actual download of the resource is needed
+ * @param resourceResolver a resource resolver to use if the artifact needs to be resolved to
+ * a Resource for downloading
+ * @param resourceDownloader a resource downloader to use if actual download of the resource is
+ * needed
* @param options a set of options to adjust the download
* @return a report indicating how the download was performed
*/
ArtifactDownloadReport download(Artifact artifact,
- ArtifactResourceResolver resourceResolver, ResourceDownloader resourceDownloader,
+ ArtifactResourceResolver resourceResolver,
+ ResourceDownloader resourceDownloader,
CacheDownloadOptions options);
/**
@@ -99,16 +103,19 @@ public interface RepositoryCacheManager {
* If the cached version is considered enough up to date, no downloading is done.
*
* @param resource the resource of the file to put in cache
- * @param name the descriptive name of the resource (helps while manually looking into the cache
- * files)
+ * @param name the descriptive name of the resource (helps while manually looking into the
+ * cache files)
* @param type the type of the resource (helps while manually looking into the cache files)
- * @param extension the extension of the resource (helps while manually looking into the cache files)
+ * @param extension the extension of the resource (helps while manually looking into the cache
+ * files)
* @param options a set of options to adjust the download
* @param repository the repository which resolve the content of the resource
* @return a report indicating how the download was performed
*/
ArtifactDownloadReport downloadRepositoryResource(Resource resource, String name,
- String type, String extension, CacheResourceOptions options, Repository repository);
+ String type, String extension,
+ CacheResourceOptions options,
+ Repository repository);
/**
* Caches an original module descriptor.
@@ -117,33 +124,43 @@ public interface RepositoryCacheManager {
* should be available as a local file.
* </p>
*
- * @param resolver the dependency resolver from which the cache request comes from
- * @param originalMetadataRef a resolved resource pointing to the remote original module descriptor
- * @param dd the dependency descriptor for which the module descriptor should be cached
+ * @param resolver the dependency resolver from which the cache request comes
+ * from
+ * @param originalMetadataRef a resolved resource pointing to the remote original module
+ * descriptor
+ * @param dd the dependency descriptor for which the module descriptor
+ * should be cached
* @param requestedMetadataArtifact the module descriptor artifact as requested originally
- * @param downloader a ResourceDownloader able to download the original module descriptor resource if
- * required by this cache implementation
+ * @param downloader a ResourceDownloader able to download the original module
+ * descriptor resource if required by this cache implementation
* @param options options to apply to cache this module descriptor
* @return a {@link ResolvedModuleRevision} representing the local cached module descriptor, or
* null if it failed
* @throws ParseException if an exception occurred while parsing the module descriptor
*/
ResolvedModuleRevision cacheModuleDescriptor(DependencyResolver resolver,
- ResolvedResource originalMetadataRef, DependencyDescriptor dd,
- Artifact requestedMetadataArtifact, ResourceDownloader downloader,
+ ResolvedResource originalMetadataRef,
+ DependencyDescriptor dd,
+ Artifact requestedMetadataArtifact,
+ ResourceDownloader downloader,
CacheMetadataOptions options) throws ParseException;
/**
* Stores a standardized version of an original module descriptor in the cache for later use.
*
- * @param resolver the dependency resolver from which the cache request comes from
- * @param originalMetadataRef a resolved resource pointing to the remote original module descriptor
+ * @param resolver the dependency resolver from which the cache request comes
+ * from
+ * @param originalMetadataRef a resolved resource pointing to the remote original module
+ * descriptor
* @param requestedMetadataArtifact the module descriptor artifact as requested originally
- * @param rmr the {@link ResolvedModuleRevision} representing the local cached module descriptor
- * @param writer a {@link ModuleDescriptorWriter} able to write the module descriptor to a stream.
+ * @param rmr the {@link ResolvedModuleRevision} representing the local
+ * cached module descriptor
+ * @param writer a {@link ModuleDescriptorWriter} able to write the module
+ * descriptor to a stream.
*/
void originalToCachedModuleDescriptor(DependencyResolver resolver,
- ResolvedResource originalMetadataRef, Artifact requestedMetadataArtifact,
+ ResolvedResource originalMetadataRef,
+ Artifact requestedMetadataArtifact,
ResolvedModuleRevision rmr, ModuleDescriptorWriter writer);
/**
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java b/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java
index 567de12..8a7d8b7 100644
--- a/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java
+++ b/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java
@@ -28,7 +28,7 @@ public interface PublishingDependencyRevisionResolver {
/**
* Returns the revision of the dependency for the publishing of the 'published' module in
* 'publishedStatus' status.
- *
+ *
* @param published ModuleDescriptor
* @param publishedStatus ditto
* @param depMrid ModuleRevisionId
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/publish/EndArtifactPublishEvent.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/event/publish/EndArtifactPublishEvent.java b/src/java/org/apache/ivy/core/event/publish/EndArtifactPublishEvent.java
index 864e5cb..c2e08dd 100644
--- a/src/java/org/apache/ivy/core/event/publish/EndArtifactPublishEvent.java
+++ b/src/java/org/apache/ivy/core/event/publish/EndArtifactPublishEvent.java
@@ -25,7 +25,7 @@ import org.apache.ivy.plugins.resolver.DependencyResolver;
/**
* Event fired after artifact publication has finished (possibly in error). Triggers registered on
* {@link #NAME} will be notified of these events.
- *
+ *
* @see DependencyResolver#publish(Artifact, File, boolean)
*/
public class EndArtifactPublishEvent extends PublishEvent {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/publish/PublishEvent.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/event/publish/PublishEvent.java b/src/java/org/apache/ivy/core/event/publish/PublishEvent.java
index 72ec32a..9ad6b56 100644
--- a/src/java/org/apache/ivy/core/event/publish/PublishEvent.java
+++ b/src/java/org/apache/ivy/core/event/publish/PublishEvent.java
@@ -25,7 +25,7 @@ import org.apache.ivy.plugins.resolver.DependencyResolver;
/**
* Base class for events fired during {@link DependencyResolver#publish(Artifact, File, boolean)}.
- *
+ *
* @see StartArtifactPublishEvent
* @see EndArtifactPublishEvent
*/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/publish/StartArtifactPublishEvent.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/event/publish/StartArtifactPublishEvent.java b/src/java/org/apache/ivy/core/event/publish/StartArtifactPublishEvent.java
index 42fb224..42a8068 100644
--- a/src/java/org/apache/ivy/core/event/publish/StartArtifactPublishEvent.java
+++ b/src/java/org/apache/ivy/core/event/publish/StartArtifactPublishEvent.java
@@ -25,7 +25,7 @@ import org.apache.ivy.plugins.resolver.DependencyResolver;
/**
* Event fired just before an artifact is published into a resolver. Triggers registered on
* {@link #NAME} will be notified of these events.
- *
+ *
* @see DependencyResolver#publish(Artifact, File, boolean)
*/
public class StartArtifactPublishEvent extends PublishEvent {