http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/moreexamples.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/moreexamples.adoc b/asciidoc/moreexamples.adoc index a5627c2..ee3b633 100644 --- a/asciidoc/moreexamples.adoc +++ b/asciidoc/moreexamples.adoc @@ -46,5 +46,3 @@ Johan stuyts, the author of SAnt, also contributed a nice article on his view of Apache Ivy - Beginners Guide is a step by step guide to assist beginners in understanding basic concepts/tasks and use them straight away in their projects either through Ant build or in Eclipse IDE. - -
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi.adoc b/asciidoc/osgi.adoc index 94d8b43..34ca660 100644 --- a/asciidoc/osgi.adoc +++ b/asciidoc/osgi.adoc @@ -26,13 +26,13 @@ Since Apache Ivy™ 2.3, some support for OSGi™ dependency management ha WARNING: Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discuss your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found, on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev]. -So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their trasitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF. +So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their transitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF. == Note on the implementation -With OSGi we can declare different kind of capabilites of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involing OSGi dependencies management. +With OSGi we can declare different kind of capabilities of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involving OSGi dependencies management. Details on the mapping of the OSGi dependency model into Ivy's one can be found in that link:osgi/osgi-mapping.html[page]. @@ -42,7 +42,7 @@ Details on the mapping of the OSGi dependency model into Ivy's one can be found Since the nature of the OSGi dependencies, resolving against a repository cannot be started before acquiring the metadata of every bundle of the repository. To resolve an `Import-Package`, Ivy has to find every bundle which has the proper `Export-Package`. So unlike the usual Ivy resolvers, the OSGi capable ones have to get the descriptor before starting a resolve. -The descriptor probably being not instantanly downloaded, the descriptor is put in cache. (FIXME not implemented) +The descriptor probably being not instantly downloaded, the descriptor is put in cache. (FIXME not implemented) == Use cases @@ -50,10 +50,9 @@ The descriptor probably being not instantanly downloaded, the descriptor is put Here are different use case of using the OSGi capabilities of Ivy: - + * link:osgi/eclipse-plugin.html[building an Eclipse™ plugin] + - + * link:osgi/standard-osgi.html[building a standard OSGi bundle] + - -* link:osgi/target-platform.html[managing a "target" platform] + +* link:osgi/target-platform.html[managing a "target" platform] + http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/eclipse-plugin.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/eclipse-plugin.adoc b/asciidoc/osgi/eclipse-plugin.adoc index d972c84..a2e8e0d 100644 --- a/asciidoc/osgi/eclipse-plugin.adoc +++ b/asciidoc/osgi/eclipse-plugin.adoc @@ -39,11 +39,11 @@ In few steps, we will setup a build to compile and package an Eclipse plugin. * in the `ivysettings.properties`, specify the location of the plugins folder of your Eclipse target - * in the `ivy.xml`, change the symbolic name declared in the extends element + * in the `ivy.xml`, change the symbolic name declared in the extends element - * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case + * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case - * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the begining of the file) + * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the beginning of the file) And that's it ! Now let's use it. @@ -91,8 +91,8 @@ NOTE: For resolution to work correctly, Ivy relies on the aggregated metadata of When building an Eclipse plugin, we are relying on a "target platform", the Eclipse installation we want our plugin to be eventually installed into. For Ivy, this will represent the repository of artifacts. -Ivy needs an aggragation of the OSGi metadata in order to resolve a such repository. The Ant task link:../use/buildobr.html[buildobr] builds a OBR (OSGi Bundle Repository) descriptor file from a set of OSGi bundles. So here we are using this Ant task to gather OSGi metadata from the Eclipse plugins in the "target platform". In the above example, the file is built in `target/repo-eclipse.xml`. +Ivy needs an aggregation of the OSGi metadata in order to resolve a such repository. The Ant task link:../use/buildobr.html[buildobr] builds a OBR (OSGi Bundle Repository) descriptor file from a set of OSGi bundles. So here we are using this Ant task to gather OSGi metadata from the Eclipse plugins in the "target platform". In the above example, the file is built in `target/repo-eclipse.xml`. -The plugin to be built has a `ivy.xml` file describing its depedencies to be used by Ivy. Since the actual depedencies are in the `MANIFEST.MF` file, in the `ivy.xml` file we specify that it extends `META-INF/MANIFEST.MF`. So there not much dependencies specified in the `ivy.xml`. But as Ivy doesn't support the `Bundle-Fragment` OSGi feature, the `ivy.xml` can help specify the missing dependencies. +The plugin to be built has a `ivy.xml` file describing its dependencies to be used by Ivy. Since the actual dependencies are in the `MANIFEST.MF` file, in the `ivy.xml` file we specify that it extends `META-INF/MANIFEST.MF`. So there not much dependencies specified in the `ivy.xml`. But as Ivy doesn't support the `Bundle-Fragment` OSGi feature, the `ivy.xml` can help specify the missing dependencies. Having this setup, it is then a standard Ant+Ivy build. Ivy computes the classpath to be then used by the `javac` tasks. Note that `javac` is not aware of the OSGi metadata and is then incapable of failing to compile if private packages are accessed. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/osgi-mapping.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/osgi-mapping.adoc b/asciidoc/osgi/osgi-mapping.adoc index 5d8f06d..ccba816 100644 --- a/asciidoc/osgi/osgi-mapping.adoc +++ b/asciidoc/osgi/osgi-mapping.adoc @@ -29,10 +29,10 @@ This page is a description of how OSGi™ dependencies are mapped into Apache In OSGi a bundle is identified by its symbolic name. In Ivy there is a notion of organisation and module name. -The choosen mapping is: +The chosen mapping is: -* The organisation is "bundle" (transitive dependencies like pakages or services have their own organisations, "package" and "service") + +* The organisation is "bundle" (transitive dependencies like packages or services have their own organisations, "package" and "service") + * The module name is the symbolic name + @@ -40,12 +40,12 @@ The choosen mapping is: [] |======= -| *OSGi* | *Ivy* -| `Bundle-SymbolicName: com.acme.product.plugin` +| *OSGi* | *Ivy* +| `Bundle-SymbolicName: com.acme.product.plugin` a| [source, xml] ---- -<info organisation="bundle" module="com.acme.product.plugin" /> +<info organisation="bundle" module="com.acme.product.plugin"/> ---- |======= @@ -62,13 +62,13 @@ When it comes to version ranges, Ivy will correctly understand fully defined ran [] |======= -| *OSGi* | *Ivy* -| `Bundle-Version: 3.3.3` | `revision="3.3.3"` -|`Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"` +| *OSGi* | *Ivy* +| `Bundle-Version: 3.3.3` | `revision="3.3.3"` +|`Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"` a| [source, xml] ---- -<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" /> +<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)"/> ---- @@ -79,12 +79,12 @@ a| == Ivy configurations -Ivy has the concept of link:../terminology.html#configurations[module configurations]. OSGi on the other hand, doesn't have such a concept. However, Ivy defines the following configurations, when it comes to dependency mapping for OSGi: +Ivy has the concept of link:../terminology.html#configurations[module configurations]. OSGi on the other hand, doesn't have such a concept. However, Ivy defines the following configurations, when it comes to dependency mapping for OSGi: - * `default` : it will contain every required dependency (transitively) + * `default` : it will contain every required dependency (transitively) - * `optional` : it will contain every optional dependency and every required depedency the the first degree dependencies. + * `optional` : it will contain every optional dependency and every required dependency the the first degree dependencies. * `transitive-optional` : it will contain every optional dependency (optional transitively) @@ -107,26 +107,26 @@ Exported package, are declaring capabilities of the bundle in term of package. B First, each exported package will be declared in the ivy.xml as a configuration. The name of the configuration will start will `use_` and will end with the name of that package. -Then each time an exported package is declared to use some other one, it will be mapped as a dependency between the Ivy configurations corresponding to those packages. +Then each time an exported package is declared to use some other one, it will be mapped as a dependency between the Ivy configurations corresponding to those packages. [] |======= -| *OSGi* | *Ivy* -| `Export-Package: com.acme.product.plugin.utils` +| *OSGi* | *Ivy* +| `Export-Package: com.acme.product.plugin.utils` a| [source, xml] ---- -<configuration name="use_com.acme.product.plugin.utils" extends="default" /> +<configuration name="use_com.acme.product.plugin.utils" extends="default"/> ---- -| `Export-Package: com.acme.product.plugin.utils,com.acme.product.plugin.common;use:=com.acme.product.plugin.utils` +| `Export-Package: com.acme.product.plugin.utils,com.acme.product.plugin.common;use:=com.acme.product.plugin.utils` a| [source, xml] ---- -<configuration name="use_com.acme.product.plugin.utils" extends="default" /> -<configuration name="use_com.acme.product.plugin.common" extends="default,use_com.acme.product.plugin.utils" /> +<configuration name="use_com.acme.product.plugin.utils" extends="default"/> +<configuration name="use_com.acme.product.plugin.common" extends="default,use_com.acme.product.plugin.utils"/> ---- @@ -137,7 +137,7 @@ a| == OSGi Requirements / Ivy dependencies -In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy undesrstands only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency. +In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy understands only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency. === Require-Bundle @@ -150,20 +150,20 @@ If there is the OSGi `resolution` parameter specified to `optional`, then the de [] |======= -| *OSGi* | *Ivy* -| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"` +| *OSGi* | *Ivy* +| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"` a| [source, xml] ---- -<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default" /> +<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default"/> ---- -| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1";resolution:="optional"` +| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1";resolution:="optional"` a| [source, xml] ---- -<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional" /> +<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional"/> ---- @@ -183,20 +183,20 @@ As it is an import package, the configuration of the dependency will be the `use [] |======= -| *OSGi* | *Ivy* -| `Import-Package: com.acme.product.plugin.utils;version="3.2.1"` +| *OSGi* | *Ivy* +| `Import-Package: com.acme.product.plugin.utils;version="3.2.1"` a| [source, xml] ---- -<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" /> +<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/> ---- -| `Import-Package: com.acme.product.plugin.utils;version="3.2.1";resolution:="optional"` -a| +| `Import-Package: com.acme.product.plugin.utils;version="3.2.1";resolution:="optional"` +a| [source, xml] ---- -<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" /> +<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/> ---- @@ -212,16 +212,16 @@ The OSGi `Bundle-RequiredExecutionEnvironment` manifest attribute specifies whic [] |======= -| *OSGi* | *Ivy* -| `Bundle-RequiredExecutionEnvironment: JavaSE-1.6` +| *OSGi* | *Ivy* +| `Bundle-RequiredExecutionEnvironment: JavaSE-1.6` a| [source, xml] ---- <dependencies> - <exclude org="package" module="javax.accessibility" /> - <exclude org="package" module="javax.activation" /> - <exclude org="package" module="javax.activity" /> + <exclude org="package" module="javax.accessibility"/> + <exclude org="package" module="javax.activation"/> + <exclude org="package" module="javax.activity"/> ... </dependencies> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/sigil.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/sigil.adoc b/asciidoc/osgi/sigil.adoc index 5d78a6d..c8ede8d 100644 --- a/asciidoc/osgi/sigil.adoc +++ b/asciidoc/osgi/sigil.adoc @@ -50,4 +50,3 @@ The immediate consequence of this difference is that the built-in resolver is pr Apache Felix Sigil has its own format about specifying the OSGi dependencies. Whereas Ivy requires an `ivysettings.xml` and an `ivy.xml`, Sigil requires a `sigil-repos.properties` and a `sigil.properties`. Then if you want to use the Sigil resolver in Ivy, you will need 4 files, the 2 Ivy ones and the 2 Sigil ones, as described in the Sigil quickstart link:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Sigil+Ivy+Quickstart[here]. To support OSGi directly in Ivy, you just need to add an extra namespace in the `ivy.xml`, and in the `ivysettings.xml` just declare the proper resolver and latest revision strategy. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/standard-osgi.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/standard-osgi.adoc b/asciidoc/osgi/standard-osgi.adoc index ccbc67e..a4ed555 100644 --- a/asciidoc/osgi/standard-osgi.adoc +++ b/asciidoc/osgi/standard-osgi.adoc @@ -35,7 +35,7 @@ It should work with simple configuration but may not in complex ones. If you hav ''' -This page describes how to build an OSGi™ bundle with Apache Ivy™. In this use case, we just basically want to compute a classpath to compile, optionaly one for testing too, and then publish our bundle in a OSGi aware repository. +This page describes how to build an OSGi™ bundle with Apache Ivy™. In this use case, we just basically want to compute a classpath to compile, optionally one for testing too, and then publish our bundle in a OSGi aware repository. In oder to produce OSGi metadata of sufficient quality and to avoid maintaining them manually, the link:http://bndtools.org/[bnd] tool will be used. The approach taken is then an "Ivy file first" approach. The dependencies will be specified in the `ivy.xml` file, the `MANIFEST.MF` being generated from the computed classpath. @@ -49,9 +49,9 @@ In few steps, we will setup a build to compile and publish an OSGi bundle. * in the `ivysettings.properties`, specify the location of the plugins folder of your Eclipse target - * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case + * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case - * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the begining of the file) + * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the beginning of the file) To build the project, run: http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/target-platform.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/target-platform.adoc b/asciidoc/osgi/target-platform.adoc index ca884ce..8103170 100644 --- a/asciidoc/osgi/target-platform.adoc +++ b/asciidoc/osgi/target-platform.adoc @@ -28,11 +28,11 @@ It should work with simple configuration but may not in complex ones. If you hav ==== -The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundles which will run together in an OSGi™ environement. Then when developping an OSGi bundle, we expect it to run in such a "target platform". +The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundles which will run together in an OSGi™ environment. Then when developing an OSGi bundle, we expect it to run in such a "target platform". -When developping a single OSGi bundle, a single `ivy.xml` (together with the use of the link:../use/fixdeps.html[fixdeps] task) is sufficent to describe precisely the bundle requirements. +When developing a single OSGi bundle, a single `ivy.xml` (together with the use of the link:../use/fixdeps.html[fixdeps] task) is sufficient to describe precisely the bundle requirements. -But when developping several bundles, it will be error prone to declare for each bundle its dependencies. Because once deployed in an OSGi environement, the bindings are sensitive to the available bundles. So when developping, we must ensure that the set of bundles will be the same set as the one at deploy time. +But when developing several bundles, it will be error prone to declare for each bundle its dependencies. Because once deployed in an OSGi environment, the bindings are sensitive to the available bundles. So when developing, we must ensure that the set of bundles will be the same set as the one at deploy time. The concept of "target platform" is a perfect fit to describe the set of bundles to resolve against. Here is a recipe to handle it with just Ant+Ivy. @@ -50,14 +50,12 @@ First you need a project (basically a folder) in which you will manage your targ * and a link:../samples/target-platform/build.xml[build.xml] with which you'll manage your target platform -In the build there is a target: `update-dependencies`. This target will do a resolve with the `ivy.xml` and will generate an `ivy-fixed.xml` from the resolved depedencies. This `ivy-fixed.xml` file contains only fixed non transitive dependencies (see the link:../use/fixdeps.html[fixdeps] task for further info). With that `ivy-fixed.xml` file, subsequent dependency resolutions are then reproducible and will always generate the same set of artifacts. +In the build there is a target: `update-dependencies`. This target will do a resolve with the `ivy.xml` and will generate an `ivy-fixed.xml` from the resolved dependencies. This `ivy-fixed.xml` file contains only fixed non transitive dependencies (see the link:../use/fixdeps.html[fixdeps] task for further info). With that `ivy-fixed.xml` file, subsequent dependency resolutions are then reproducible and will always generate the same set of artifacts. Once generated, it is recommended to share that `ivy-fixed.xml` file into you version control system (subversion, git, etc...). The target `update-dependencies` is then to be launched each time you edit the `ivy.xml`, when you want to change the content of your target platform. -The second target `generate-target-platform` will generate an `obr.xml`, a OSGi Bundle repository descriptor. This file will list every artifact wich has been resolved by the `ivy-fixed.xml`. Then each of your bundles you develop will do its resolve against that `obr.xml` (see the link:../resolver/obr.html[obr resolver]). +The second target `generate-target-platform` will generate an `obr.xml`, a OSGi Bundle repository descriptor. This file will list every artifact which has been resolved by the `ivy-fixed.xml`. Then each of your bundles you develop will do its resolve against that `obr.xml` (see the link:../resolver/obr.html[obr resolver]). The generated `obr.xml` contains paths to the local filesystem, so it is neither recommended to share it between developers nor commit it to version control system. If it is required to develop your plugin with the Eclipse PDE plugin, you can then use the alternative target `generate-retrieved-target-platform`. It has the same principle as the `generate-target-platform` but the artifacts are also retrieved in a single folder, just like the plugins in an Eclipse install. That way you can define your target platform within Eclipse quite easily. - - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/principle.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/principle.adoc b/asciidoc/principle.adoc index 2ea209d..8ff5dfb 100644 --- a/asciidoc/principle.adoc +++ b/asciidoc/principle.adoc @@ -28,21 +28,21 @@ More details on ant tasks link:ant.html[here]. == Configure -Ivy needs to be configured to be able to resolve your dependencies. This configuration is usually done with a settings file, which defines a set of dependency resolvers. Each resolver is able to find ivy files and/or artifacts, given simple information such as organisation, module, revision, artifact name, artifact type and artifact extension. +Ivy needs to be configured to be able to resolve your dependencies. This configuration is usually done with a settings file, which defines a set of dependency resolvers. Each resolver is able to find ivy files and/or artifacts, given simple information such as organisation, module, revision, artifact name, artifact type and artifact extension. -The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found. +The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found. A default configuration is used by ivy when none is given. This configuration uses an link:resolver/ibiblio.html[ibiblio resolver] pointing to https://repo1.maven.org/maven2/ to resolve all modules. == Resolve -The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies. +The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies. Then, for each dependency declared in this file, it asks the appropriate resolver (according to settings) to find the module (i.e. either an ivy file for it, or its artifacts if no ivy file can be found). It also uses a filesystem based cache to avoid asking for a dependency if it is already in cache (at least if possible, which is not the case with latest revisions). If the resolver is a composite one (i.e. a chain or a dual resolver), several resolvers may actually be called to find the module. -When the dependency module has been found, its ivy file is downloaded to the ivy cache. Then ivy checks if the dependency module has dependencies, in which case it recursilvely traverses the graph of dependencies. +When the dependency module has been found, its ivy file is downloaded to the ivy cache. Then ivy checks if the dependency module has dependencies, in which case it recursively traverses the graph of dependencies. All over this traversal, conflict management is done to prevent access to a module as soon as possible. @@ -78,4 +78,3 @@ This is done with a simple xsl transformation of the xml report generated at res == Publish Finally, Ivy can be used to publish a particular version of a module in your repository, so that it becomes available for future resolving. This task is usually called either manually or from a continuous integration server. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/release-notes.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc index 1c3fee9..415e788 100644 --- a/asciidoc/release-notes.adoc +++ b/asciidoc/release-notes.adoc @@ -27,37 +27,37 @@ ---- December 21, 2015 - The Apache Ivy project is pleased to announce its 2.5.0 release. - + Apache Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies, characterized by flexibility, configurability, and tight integration with Apache Ant. Key features of this 2.5.0 release are -* Ivy now uses BoucyCastle 1.52. Due to the non backward compatibility of that library, earlier versions are not supported. +* Ivy now uses BouncyCastle 1.52. Due to the non backward compatibility of that library, earlier versions are not supported. * the minimum Java version required is now Java 7 * TODO * TODO You can download this 2.5.0 release at: http://ant.apache.org/ivy/download.cgi - + Issues should be reported to: https://issues.apache.org/jira/browse/IVY - + More information can be found on the website: http://ant.apache.org/ivy/ ---- - + === List of Changes in this Release - -For details about the following changes, check our JIRA install at + +For details about the following changes, check our JIRA install at http://issues.apache.org/jira/browse/ivy - + List of changes since Ivy 2.4.0: - FIX: Made the maven 'test' configuration public so we can use the test-jar as dependency (link:https://issues.apache.org/jira/browse/IVY-1444[IVY-1444]) @@ -390,5 +390,3 @@ Contributors: * Aleksey Zhukov + * Zhong Wang + - - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/bintray.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/bintray.adoc b/asciidoc/resolver/bintray.adoc index 8f99267..dd1d5c5 100644 --- a/asciidoc/resolver/bintray.adoc +++ b/asciidoc/resolver/bintray.adoc @@ -48,11 +48,11 @@ This resolver uses Bintray DaaS (Distribution as a Service) platform to retrieve [source] ---- -<bintray /> +<bintray/> ---- -A default, defines a link:https://bintray.com/bintray/jcenter[JCenter] bintray resolver. +A default, defines a link:https://bintray.com/bintray/jcenter[JCenter] bintray resolver. In most circumstances you won't need any other resolvers as JCenter is already a super-set of many other repositories, including Maven Central. @@ -68,5 +68,5 @@ In most circumstances you won't need any other resolvers as JCenter is already a ---- -Defines two resolvers to use a link:https://bintray.com/dsowerby/maven[repository] "maven" of user "dsowerby" (https://dl.bintray.com/dsowerby/maven/) +Defines two resolvers to use a link:https://bintray.com/dsowerby/maven[repository] "maven" of user "dsowerby" (https://dl.bintray.com/dsowerby/maven/) and link:https://bintray.com/igelgrun/batrak[repository] "batrak" of user "igelgrun" (https://dl.bintray.com/igelgrun/batrak/). http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/chain.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/chain.adoc b/asciidoc/resolver/chain.adoc index 2e894c4..b3fb992 100644 --- a/asciidoc/resolver/chain.adoc +++ b/asciidoc/resolver/chain.adoc @@ -104,4 +104,3 @@ Same as before, except that if a revision is found in the filesystem then ivyrep ---- Same as first example, except that once a module is found by either filesystem or ivyrep, then it's the whole chain which will be queried to download the artifacts. So in this case ivy file and artifacts may be split across the two resolvers for the same module. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/dual.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/dual.adoc b/asciidoc/resolver/dual.adoc index f2a944c..891d00c 100644 --- a/asciidoc/resolver/dual.adoc +++ b/asciidoc/resolver/dual.adoc @@ -43,5 +43,3 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute |Element|Description|Cardinality |any resolver|two resolvers, the first being the ivy resolver, the second the artifact resolver|2 |======= - - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/filesystem.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/filesystem.adoc b/asciidoc/resolver/filesystem.adoc index 6d13cfc..6887aa0 100644 --- a/asciidoc/resolver/filesystem.adoc +++ b/asciidoc/resolver/filesystem.adoc @@ -39,7 +39,7 @@ The configuration of such a resolver is mainly done through ivy and artifact pat == Atomic publish support *__since 2.0__* This resolver supports atomic publish, which is useful for environments with a lot of concurrent publish and resolve actions. The atomic publish relies on the atomicity of the rename operation in the underlying filesystem (which includes NTFS and POSIX based filesystems). -In this case the resolver starts by publishing the module according to the pattern, but where a `.part` suffix is appended to the revision. Then the publish is committed with a rename to the final location. +In this case the resolver starts by publishing the module according to the pattern, but where a `.part` suffix is appended to the revision. Then the publish is committed with a rename to the final location. *Limitations* Atomic publish is currently limited in several ways: @@ -88,5 +88,3 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute |ivy|defines a pattern for ivy files, using the pattern attribute|0..n |artifact|defines a pattern for artifacts, using the pattern attribute|1..n |======= - - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/ibiblio.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/ibiblio.adoc b/asciidoc/resolver/ibiblio.adoc index 73049bc..4dd4ed0 100644 --- a/asciidoc/resolver/ibiblio.adoc +++ b/asciidoc/resolver/ibiblio.adoc @@ -27,7 +27,7 @@ |======= -This resolver usually uses ibiblio to find artifacts. +This resolver usually uses ibiblio to find artifacts. *__since 1.3__* Using the `m2compatible` attribute, you can benefit from Maven2 repository compatibility (convert dots in organisation into slashes, search for poms, use transitive dependencies of poms). This setting also affects the default place where the resolver looks for its artifacts to point to the Maven2 repository. So setting this attribute to `true` is sufficient to use Maven2 ibiblio repository. @@ -87,4 +87,3 @@ Defines a resolver called `maven2` using the Maven2 public repository to find mo ---- Same as above, but doesn't use poms, only artifacts. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/jar.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/jar.adoc b/asciidoc/resolver/jar.adoc index 9eef6c4..9f2ecb7 100644 --- a/asciidoc/resolver/jar.adoc +++ b/asciidoc/resolver/jar.adoc @@ -67,8 +67,8 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute ---- <jar name="my-local-jar-resolver" file="/home/me/myrepo.jar"> - <ivy pattern="[organisation]/[module]/ivys/ivy-[revision].xml" /> - <artifact pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[type]" /> + <ivy pattern="[organisation]/[module]/ivys/ivy-[revision].xml"/> + <artifact pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/> </jar> ---- @@ -82,14 +82,13 @@ A simple local jar repository. ---- <jar name="my-remote-jar-resolver" url="http://www.mywebsite.com/dist/myrepo.jar";> - <ivy pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml" /> - <ivy pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml" /> - <artifact pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" /> - <artifact pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" /> - <artifact pattern="dir_in_jar/yet_another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" /> + <ivy pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"/> + <ivy pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"/> + <artifact pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/> + <artifact pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/> + <artifact pattern="dir_in_jar/yet_another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/> </jar> ---- A remote jar repository with multiple ivy and artifact patterns, patterns pointing in some sub directories in the jar. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/mirrored.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/mirrored.adoc b/asciidoc/resolver/mirrored.adoc index c646aa4..129ad59 100644 --- a/asciidoc/resolver/mirrored.adoc +++ b/asciidoc/resolver/mirrored.adoc @@ -40,7 +40,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute |======= |Attribute|Description|Required |m2compatible|True if this resolver should be maven2 compatible, false otherwise|No, defaults to false -|mirrorListUrl|The url where to retrive the list of mirror urls.|Yes +|mirrorListUrl|The url where to retrieve the list of mirror urls.|Yes |======= @@ -75,7 +75,7 @@ And the piece of settings: ---- <mirroredurl name="mirrored-maven" m2compatible="true" mirrorListUrl="file:///Users/me/dev/repo/mavenrepolist.txt"> - <artifact pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> + <artifact pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> </mirroredurl> ---- @@ -92,9 +92,8 @@ The mirror list can be retrieved from a geo-location aware url: ---- <mirroredurl name="mirrored-asf" mirrorListUrl="http://www.apache.org/dyn/closer.cgi";> - <ivy pattern="repo/[organisation]/[module]/[revision]/ivy.xml" /> - <artifact pattern="repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> + <ivy pattern="repo/[organisation]/[module]/[revision]/ivy.xml"/> + <artifact pattern="repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/> </mirroredurl> ---- - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/obr.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/obr.adoc b/asciidoc/resolver/obr.adoc index 1661a8d..4f4d2a0 100644 --- a/asciidoc/resolver/obr.adoc +++ b/asciidoc/resolver/obr.adoc @@ -50,7 +50,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` requirement can be satisfied by several different bundles. So when resolving such requirement, Ivy will first look into the already resolved bundles if one provides that package. If it fails to find one, then two behaviours can occur: - * if the requirement strategy is `first`, among the bundles statifying the requirement, it will shoose the first one. A warn will be logged ahout the choice Ivy has to arbitrarily do. + + * if the requirement strategy is `first`, among the bundles satisfying the requirement, it will choose the first one. A warning will be logged about the choice Ivy has to arbitrarily do. + * if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. + @@ -62,7 +62,7 @@ The requirement strategy is defining how the resolver should behave in front of [source, xml] ---- -<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"; /> +<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"/> ---- @@ -74,9 +74,8 @@ A simple repository configured to use the Felix OBR. [source, xml] ---- -<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" requirementStrategy="first" /> +<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" requirementStrategy="first"/> ---- A local repository which is trusted to always provide correct dependency for the `Import-Package` requirements. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/osgiagg.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/osgiagg.adoc b/asciidoc/resolver/osgiagg.adoc index bb3afbd..5c6275b 100644 --- a/asciidoc/resolver/osgiagg.adoc +++ b/asciidoc/resolver/osgiagg.adoc @@ -50,14 +50,13 @@ As sub element, this resolver accept any kind of OSGi resolver: link:../resolver [source, xml] ---- -<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"; /> -<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"; /> +<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"/> +<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"/> <osgi-agg name="all-osgi"> - <resolver ref="ivyde-updatesite" /> - <resolver ref="felix-repo" /> + <resolver ref="ivyde-updatesite"/> + <resolver ref="felix-repo"/> </osgi-agg> ---- -An aggregated OSGi reporsory composed of the Apache IvyDE Eclipse update site and the Felix OBR. - +An aggregated OSGi repository composed of the Apache IvyDE Eclipse update site and the Felix OBR. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/packager.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/packager.adoc b/asciidoc/resolver/packager.adoc index 50ee6e9..b4e4c0d 100644 --- a/asciidoc/resolver/packager.adoc +++ b/asciidoc/resolver/packager.adoc @@ -39,10 +39,10 @@ The Packager resolver supports a "resource cache", where downloaded archives can The packaging instructions are contained in "packager.xml" in a simple XML format. At resolve time this file gets converted into a "build.xml" file via XSLT and then executed using link:https://ant.apache.org/[Ant]. Therefore, Ant must be available as an executable on the platform. The ant task executes in a separate ant project and so is not affected by properties, etc. that may be set in any existing ant environment in which Ivy is running. However, Ivy will define a few properties for convenience; see the "Properties" listed below. -For security reasons, the XSLT transform ensures that +For security reasons, the XSLT transform ensures that + + a. all downloaded archives have verified SHA1 checksums (including cached resources); and - a. all downloaded archives have verified SHA1 checksums (including cached resources); and - b. only a very limited set of ant tasks can be performed during the artifact "build" phase; currently these include move, copy, mkdir, zip, unzip, tar, and untar (this restriction may be overridden however; see below). @@ -104,22 +104,22 @@ Configure a resourceURL in situations where you don't want to rely on (or wait f ---- -Defines a packager resolver which points to the `http://ivyroundup.googlecode.com/` online repository. Builds will occur in a subdirectory of +Defines a packager resolver which points to the `http://ivyroundup.googlecode.com/` online repository. Builds will occur in a subdirectory of [source] ---- ${user.home}/.ivy2/packager/build ---- -downloaded resources will be cached in +downloaded resources will be cached in [source] ---- ${user.home}/.ivy2/packager/cache ---- -and the mirror site +and the mirror site [source] ---- -ftp://mirror.example.com/pub/resources/[organisation]/[module]/ +ftp://mirror.example.com/pub/resources/[organisation]/[module]/ ---- will be tried first for all resources. @@ -259,7 +259,7 @@ The m2resource XML tag supports the following attributes: |groupId|Maven group ID|No; defaults to ${ivy.packager.organisation} |artifactId|Maven artifact ID|No; defaults to ${ivy.packager.module} |version|Maven version|No; defaults to ${ivy.packager.revision} -|repo|Maven repository URL|No; defaults to https://repo1.maven.org/maven2/ +|repo|Maven repository URL|No; defaults to https://repo1.maven.org/maven2/ |======= @@ -299,4 +299,3 @@ Below is an example of packaging instructions for the link:http://commons.apache </packager-module> ---- - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/sftp.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/sftp.adoc b/asciidoc/resolver/sftp.adoc index b93fda2..9012b7c 100644 --- a/asciidoc/resolver/sftp.adoc +++ b/asciidoc/resolver/sftp.adoc @@ -28,7 +28,7 @@ *__since 1.4__* -This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. +This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. If your server supports ssh but not sftp, there is also an link:../resolver/ssh.html[ssh resolver]. @@ -42,7 +42,7 @@ e.g. pattern="sftp://user:[email protected]:8022/path/to/my/repos/[artifact].[ -Note that the authentication features of this resolver are exactly the same as the ssh resolver. Choosing between the two is often a matter of server implementation. If your server supports sftp, usually it's preferrable. +Note that the authentication features of this resolver are exactly the same as the ssh resolver. Choosing between the two is often a matter of server implementation. If your server supports sftp, usually it's preferable. Internally this resolver relies on link:http://www.jcraft.com/jsch/[jsch] as ssh client, which is a popular java ssh client, used for example in Eclipse. @@ -86,7 +86,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute <sftp user="myuser" host="myhost.com"> <ivy pattern="/path/to/ivy/[module]/ivy.xml"/> <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/> -</sftp> +</sftp> ---- @@ -149,4 +149,3 @@ Will connect to yourserver.com on port 8022 with user 'user' and use keyFile `pa ---- Will connect to the host named by myhost according to the config file in `/path/to/.ssh/config`, using the hostname, username, and optionally IdentityFile specified in the config section "Host myhost". For example, if the corresponding Host section contains "Hostname yourserver.com" and "User myremoteusername", it will connect to yourserver.com using username myremoteusername. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/ssh.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/ssh.adoc b/asciidoc/resolver/ssh.adoc index 8e7021b..8c65e09 100644 --- a/asciidoc/resolver/ssh.adoc +++ b/asciidoc/resolver/ssh.adoc @@ -28,7 +28,7 @@ *__since 1.4__* -This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. +This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment. If your server supports sftp, you can consider using the link:../resolver/sftp.html[sftp resolver]. @@ -75,7 +75,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute <ssh user="myuser" host="myhost.com"> <ivy pattern="/path/to/ivy/[module]/ivy.xml"/> <artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/> -</ssh> +</ssh> ---- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/updatesite.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/updatesite.adoc b/asciidoc/resolver/updatesite.adoc index c821360..d8c977e 100644 --- a/asciidoc/resolver/updatesite.adoc +++ b/asciidoc/resolver/updatesite.adoc @@ -52,7 +52,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` requirement can be satisfied by several different bundles. So when resolving such requirement, Ivy will first look into the already resolved bundles if one provides that package. If it fails to find one, then two behaviours can occur: - * if the requirement strategy is `first`, among the bundles statifying the requirement, it will shoose the first one. A warn will be logged ahout the choice Ivy has to arbitrarily do. + + * if the requirement strategy is `first`, among the bundles satisfying the requirement, it will choose the first one. A warning will be logged about the choice Ivy has to arbitrarily do. + * if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. + @@ -64,7 +64,7 @@ The requirement strategy is defining how the resolver should behave in front of [source, xml] ---- -<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"; /> +<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"/> ---- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/url.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/url.adoc b/asciidoc/resolver/url.adoc index acec61b..62965a1 100644 --- a/asciidoc/resolver/url.adoc +++ b/asciidoc/resolver/url.adoc @@ -62,9 +62,9 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute ---- <url name="two-patterns-example"> - <ivy pattern="http://ivyrep.mycompany.com/[module]/[revision]/ivy-[revision].xml"; /> - <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact]-[revision].[ext]"; /> - <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact].[ext]"; /> + <ivy pattern="http://ivyrep.mycompany.com/[module]/[revision]/ivy-[revision].xml"/> + <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact]-[revision].[ext]"/> + <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact].[ext]"/> </url> ---- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/vfs.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/vfs.adoc b/asciidoc/resolver/vfs.adoc index 068b879..ba55e3b 100644 --- a/asciidoc/resolver/vfs.adoc +++ b/asciidoc/resolver/vfs.adoc @@ -52,11 +52,10 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute ---- <vfs name="vfs-resolver"> - <ivy pattern="sftp://username:password@host/[organisation]/[module]/[revision]/ivy.xml"; /> - <artifact pattern="sftp://username:password@host/[organisation]/[module]/[revision]/[artifact].[ext]"; /> -</vfs> + <ivy pattern="sftp://username:password@host/[organisation]/[module]/[revision]/ivy.xml"/> + <artifact pattern="sftp://username:password@host/[organisation]/[module]/[revision]/[artifact].[ext]"/> +</vfs> ---- Access ivy and artifacts files using sftp. - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/running.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/running.adoc b/asciidoc/running.adoc index 3e39744..bad9278 100644 --- a/asciidoc/running.adoc +++ b/asciidoc/running.adoc @@ -18,7 +18,7 @@ //// Ivy is sending http headers when downloading files. - The User-Agent http header can be controlled using a + The User-Agent http header can be controlled using a [source] ---- http.agent http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/apache-hello-ivy-default.html ---------------------------------------------------------------------- diff --git a/asciidoc/samples/apache-hello-ivy-default.html b/asciidoc/samples/apache-hello-ivy-default.html index edb4488..4a0707b 100644 --- a/asciidoc/samples/apache-hello-ivy-default.html +++ b/asciidoc/samples/apache-hello-ivy-default.html @@ -14,7 +14,7 @@ "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. --> <html> <head> @@ -30,12 +30,12 @@ <a href="http://ant.apache.org/ivy/";><img src="http://ant.apache.org/ivy/images/logo.png";></a> </div> <h1> -<a name="apache-hello-ivy"></a><span id="module">hello-ivy</span> - by +<a name="apache-hello-ivy"></a><span id="module">hello-ivy</span> + by <span id="organisation">apache</span> </h1> <div id="date"> - resolved on + resolved on 2007-10-21 17:24:25</div> <ul id="confmenu"> <li> @@ -49,14 +49,14 @@ <td class="title">Modules</td><td class="value">3</td> </tr> <tr> -<td class="title">Revisions</td><td class="value">4 +<td class="title">Revisions</td><td class="value">4 (0 searched <img src="http://ivy.jayasoft.org/images/searched.gif"; alt="searched" title="module revisions which required a search with a dependency resolver to be resolved">, 0 downloaded <img src="http://ivy.jayasoft.org/images/downloaded.gif"; alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver">, 1 evicted <img src="http://ivy.jayasoft.org/images/evicted.gif"; alt="evicted" title="module revisions which were evicted by others">, 0 errors <img src="http://ivy.jayasoft.org/images/error.gif"; alt="error" title="module revisions on which error occurred">)</td> </tr> <tr> -<td class="title">Artifacts</td><td class="value">3 +<td class="title">Artifacts</td><td class="value">3 (0 downloaded, 0 failed)</td> </tr> @@ -288,7 +288,7 @@ 0 kB in cache)</td> </tr> <tr> -<td class="title">Evicted by</td><td class="value">2.0 +<td class="title">Evicted by</td><td class="value">2.0 in <b>latest-revision</b> conflict manager </td> </tr> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/build-install.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/build-install.xml b/asciidoc/samples/build-install.xml index 8f7183a..39df71c 100644 --- a/asciidoc/samples/build-install.xml +++ b/asciidoc/samples/build-install.xml @@ -14,32 +14,32 @@ "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. --> <!-- This build script is used to download dependencies for a freshly downloaded binary distribution of Ivy without dependencies. - + To use it, you only need to have this script in the directory where you have unzipped your binary distribution of Ivy, and to call it using ant -f build-install.xml - + If you don't want to download all optional dependencies, you can set the conf attribute value in the ivy:retrieve task, to select only the configuration you want (check the ivy.xml for details about which configurations are available, and what they are useful for). --> -<project name="ivy-bin-install" default="download-deps" +<project name="ivy-bin-install" default="download-deps" xmlns:ivy="antlib:org.apache.ivy.ant"> <target name="init-ivy-settings"> <echo file="${basedir}/ivysettings.xml"> <![CDATA[ <ivysettings> <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> - <settings defaultResolver="public" /> + <settings defaultResolver="public"/> <resolvers> - <!-- + <!-- we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts The reason for that is that commons vfs is still not released, thus we depend on an integration version only available on ivyrep, but not on ivyrep @@ -52,10 +52,10 @@ </url> </resolvers> </ivysettings> - ]]> + ]]> </echo> </target> - + <target name="init-ivy" depends="init-ivy-settings"> <path id="ivy.lib.path"> <fileset dir="${basedir}" includes="*.jar" excludes="ivy-core-*.jar"/> @@ -63,10 +63,10 @@ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/> </target> - + <target name="download-deps" depends="init-ivy"> - <ivy:retrieve - conf="*" + <ivy:retrieve + conf="*" pattern="${basedir}/lib/[conf]/[artifact]-[revision].[ext]"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/build.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/build.xml b/asciidoc/samples/build.xml index a7dbbcd..eeb823c 100644 --- a/asciidoc/samples/build.xml +++ b/asciidoc/samples/build.xml @@ -14,38 +14,38 @@ "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="go-ivy" default="go" xmlns:ivy="antlib:org.apache.ivy.ant"> - <!-- - this build file is a self contained project: it doesn't require anything else + <!-- + this build file is a self contained project: it doesn't require anything else that ant 1.6.2 or greater and java 1.4 or greater properly installed. - + It is used to showcase how easy and straightforward it can be to use Ivy. - - This is not an example of the best pratice to use in a project, especially + + This is not an example of the best practice to use in a project, especially for the java source code "generation" :-) (see generate-src target) - + To run copy this file in an empty directory, open a shell or a command window - in this directory and run "ant". It will download ivy and then use it to resolve + in this directory and run "ant". It will download ivy and then use it to resolve the dependency of the class which is itself "contained" in this build script. - + After a successful build run "ant" again and you will see the build will be much faster. - + More information can be found at http://ant.apache.org/ivy/ --> - - <!-- here is the version of ivy we will use. change this property to try a newer + + <!-- here is the version of ivy we will use. change this property to try a newer version if you want --> - <property name="ivy.install.version" value="2.0.0-beta1" /> - <property name="ivy.jar.dir" value="${basedir}/ivy" /> - <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" /> - - <property name="build.dir" value="build" /> - <property name="src.dir" value="src" /> - - + <property name="ivy.install.version" value="2.0.0-beta1"/> + <property name="ivy.jar.dir" value="${basedir}/ivy"/> + <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/> + + <property name="build.dir" value="build"/> + <property name="src.dir" value="src"/> + + <target name="download-ivy" unless="skip.download"> <mkdir dir="${ivy.jar.dir}"/> <!-- download Ivy from web site so that it can be used even without any special installation --> @@ -53,9 +53,9 @@ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"; dest="${ivy.jar.file}" usetimestamp="true"/> </target> - - <!-- ================================= - target: install-ivy + + <!-- ================================= + target: install-ivy this target is not necessary if you put ivy.jar in your ant lib directory if you already have ivy in your ant lib, you can simply remove this target and the dependency the 'go' target has on it @@ -70,44 +70,44 @@ </path> <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/> - </target> - - <!-- ================================= + </target> + + <!-- ================================= target: go Go ivy, go! ================================= --> - <target name="go" depends="install-ivy, generate-src" + <target name="go" depends="install-ivy, generate-src" description="--> resolve dependencies, compile and run the project"> <echo message="using ivy to resolve commons-lang 2.1..."/> - <!-- here comes the magic line: asks ivy to resolve a dependency on + <!-- here comes the magic line: asks ivy to resolve a dependency on commons-lang 2.1 and to build an ant path with it from its cache --> - <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1" + <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1" pathid="lib.path.id" inline="true"/> - + <echo message="compiling..."/> - <mkdir dir="${build.dir}" /> - <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" /> - + <mkdir dir="${build.dir}"/> + <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id"/> + <echo> We are now ready to execute our simple program with its dependency on commons-lang. Let's go! </echo> <java classname="example.Hello"> <classpath> - <path refid="lib.path.id" /> - <path location="${build.dir}" /> + <path refid="lib.path.id"/> + <path location="${build.dir}"/> </classpath> </java> </target> - <!-- ================================= + <!-- ================================= target: generate-src - 'Generates' the class source. It actually just echo a simple java + 'Generates' the class source. It actually just echo a simple java source code to a file. In real life this file would already be present on your file system, and this target wouldn't be necessary. ================================= --> <target name="generate-src"> - <mkdir dir="${src.dir}/example" /> + <mkdir dir="${src.dir}/example"/> <echo file="${src.dir}/example/Hello.java"> package example; @@ -117,35 +117,35 @@ public class Hello { public static void main(String[] args) { 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)); } } </echo> </target> - - <!-- ================================= - target: clean + + <!-- ================================= + target: clean ================================= --> <target name="clean" description="--> clean the project"> <delete includeemptydirs="true" quiet="true"> - <fileset dir="${src.dir}" /> - <fileset dir="${build.dir}" /> + <fileset dir="${src.dir}"/> + <fileset dir="${build.dir}"/> </delete> </target> - - <!-- ================================= - target: clean-ivy + + <!-- ================================= + target: clean-ivy ================================= --> <target name="clean-ivy" description="--> clean the ivy installation"> <delete dir="${ivy.jar.dir}"/> </target> - - <!-- ================================= - target: clean-cache + + <!-- ================================= + target: clean-cache ================================= --> - <target name="clean-cache" depends="install-ivy" + <target name="clean-cache" depends="install-ivy" description="--> clean the ivy cache"> - <ivy:cleancache /> + <ivy:cleancache/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/build.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/eclipse-plugin/build.xml b/asciidoc/samples/eclipse-plugin/build.xml index 93581b8..8b182c8 100644 --- a/asciidoc/samples/eclipse-plugin/build.xml +++ b/asciidoc/samples/eclipse-plugin/build.xml @@ -14,64 +14,64 @@ "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="eclipse-plugin-build" xmlns:ivy="ivy"> <!-- Load Ivy ant tasks --> - <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" /> - <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing --> + <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml"/> + <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the following --> <!-- taskdef rather than the above one --> - <!--path id="ivy.classpath"> + <!--path id="ivy.classpath"> <fileset dir="${basedir}"> - <include name="ivy.jar" /> + <include name="ivy.jar"/> </fileset> </path> <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /--> <!-- Load the properties where is defined the eclipse home --> - <property file="${basedir}/ivysettings.properties" /> + <property file="${basedir}/ivysettings.properties"/> <target name="clean" description="Clean the build directory"> - <delete dir="${basedir}/target" /> + <delete dir="${basedir}/target"/> </target> <target name="buildobr" description="Build the obr index"> <!-- build the repo.xml which aggregate every metadata of the Eclipse plugins --> - <mkdir dir="${basedir}/target" /> - <ivy:buildobr baseDir="${eclipse.home}" basePath="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true" /> + <mkdir dir="${basedir}/target"/> + <ivy:buildobr baseDir="${eclipse.home}" basePath="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true"/> </target> <target name="ivy:configure"> <!-- classical ivy configuration --> - <ivy:configure file="ivysettings.xml" /> + <ivy:configure file="ivysettings.xml"/> </target> <target name="ivy:resolve" depends="ivy:configure"> <!-- classical resolve and cache-path --> - <ivy:resolve file="ivy.xml" conf="*" /> - <ivy:cachepath pathid="compile.classpath" conf="compile" useOrigin="true" /> + <ivy:resolve file="ivy.xml" conf="*"/> + <ivy:cachepath pathid="compile.classpath" conf="compile" useOrigin="true"/> </target> <target name="compile" depends="ivy:resolve" description="Compile the Eclipse plugin"> - <mkdir dir="${basedir}/target/classes" /> + <mkdir dir="${basedir}/target/classes"/> <!-- simple javac (WARNING: contrary to the JDT, javac doesn't understand OSGi's accessibility (private packages)) --> - <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" /> + <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false"/> <copy todir="${basedir}/target/classes"> <fileset dir="${basedir}/src"> - <include name="**" /> - <exclude name="**/*.java" /> - <exclude name="**/package.html" /> + <include name="**"/> + <exclude name="**/*.java"/> + <exclude name="**/package.html"/> </fileset> <fileset dir="${basedir}"> - <include name="plugin.xml" /> + <include name="plugin.xml"/> </fileset> </copy> </target> <target name="build" depends="compile" description="Build the Eclipse plugin"> <!-- simple jaring --> - <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF" /> + <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivy.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/eclipse-plugin/ivy.xml b/asciidoc/samples/eclipse-plugin/ivy.xml index cf23e6c..fd50060 100644 --- a/asciidoc/samples/eclipse-plugin/ivy.xml +++ b/asciidoc/samples/eclipse-plugin/ivy.xml @@ -15,25 +15,25 @@ "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. --> <ivy-module version="2.2" xmlns:o="http://ant.apache.org/ivy/osgi";> <info organisation="bundle" module="myplugin"> - <extends organisation="bundle" module="com.acme.myplugin" revision="1.0.0.qualifier" location="META-INF/MANIFEST.MF" /> + <extends organisation="bundle" module="com.acme.myplugin" revision="1.0.0.qualifier" location="META-INF/MANIFEST.MF"/> </info> <configurations> - <conf name="compile" extends="default,embedded" description="Dependencies for the compilation" /> - <conf name="embedded" description="Dependencies embedded into the plugin's jar" /> - <conf name="win32" extends="compile" description="To run on Microsoft Windows" /> - <conf name="macos" extends="compile" description="To run on Mac OS X" /> - <conf name="linux" extends="compile" description="To run on Linux" /> + <conf name="compile" extends="default,embedded" description="Dependencies for the compilation"/> + <conf name="embedded" description="Dependencies embedded into the plugin's jar"/> + <conf name="win32" extends="compile" description="To run on Microsoft Windows"/> + <conf name="macos" extends="compile" description="To run on Mac OS X"/> + <conf name="linux" extends="compile" description="To run on Linux"/> </configurations> <dependencies> <!-- example of a dependency that we can't declare in the MANIFEST.MF because we want it to be embedded --> <!--dependency osgi="bundle" org="" module="org.apache.commons.httpcore" rev="4.1.0" conf="embedded->default" /--> <!-- Ivy-Osgi doesn't understand bundle fragment --> - <dependency org="bundle" name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default" /> - <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default" /> - <dependency org="bundle" name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default" /> + <dependency org="bundle" name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default"/> + <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default"/> + <dependency org="bundle" name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default"/> </dependencies> </ivy-module> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivysettings.properties ---------------------------------------------------------------------- diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.properties b/asciidoc/samples/eclipse-plugin/ivysettings.properties index b41f191..ef63e41 100644 --- a/asciidoc/samples/eclipse-plugin/ivysettings.properties +++ b/asciidoc/samples/eclipse-plugin/ivysettings.properties @@ -6,9 +6,9 @@ # * to you under the Apache License, Version 2.0 (the # * "License"); you may not use this file except in compliance # * with the License. You may obtain a copy of the License at -# * +# * # * http://www.apache.org/licenses/LICENSE-2.0 -# * +# * # * Unless required by applicable law or agreed to in writing, # * software distributed under the License is distributed on an # * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivysettings.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.xml b/asciidoc/samples/eclipse-plugin/ivysettings.xml index 0be2afc..463596a 100644 --- a/asciidoc/samples/eclipse-plugin/ivysettings.xml +++ b/asciidoc/samples/eclipse-plugin/ivysettings.xml @@ -14,23 +14,23 @@ "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. --> <ivysettings> <!-- Load the properties where is defined the eclipse location --> - <properties file="ivysettings.properties" /> + <properties file="ivysettings.properties"/> <!-- We need to define the Ivy Osgi latest strategy as the default one --> - <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi" /> + <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi"/> <!-- These are usual cache setup --> <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true"> - <cache name="eclipse" basedir="${ivy.settings.dir}/cache/eclipse" /> + <cache name="eclipse" basedir="${ivy.settings.dir}/cache/eclipse"/> </caches> <!-- We just need to define our Ivy OSGi resolver --> <resolvers> - <obr name="eclipse" repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml" /> + <obr name="eclipse" repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml"/> </resolvers> </ivysettings> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-doc.xsl ---------------------------------------------------------------------- diff --git a/asciidoc/samples/ivy-doc.xsl b/asciidoc/samples/ivy-doc.xsl index 1f401ad..2b4e71e 100644 --- a/asciidoc/samples/ivy-doc.xsl +++ b/asciidoc/samples/ivy-doc.xsl @@ -15,7 +15,7 @@ "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. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> @@ -35,10 +35,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <html> <head> <title><xsl:value-of select="info/@module"/> by <xsl:value-of select="info/@organisation"/> :: Ivy description</title> - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <meta http-equiv="content-language" content="en" /> - <meta name="robots" content="index,follow" /> - <link rel="stylesheet" type="text/css" href="ivy-style.css" /> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"/> + <meta http-equiv="content-language" content="en"/> + <meta name="robots" content="index,follow"/> + <link rel="stylesheet" type="text/css" href="ivy-style.css"/> </head> <body> <div id="logo"><a href="http://ant.apache.org/ivy/";><img src="http://ant.apache.org/ivy/images/logo.png"/></a><br/><a id="rep" href="http://www.jayasoft.fr/org/ivyrep/";>Ivy Repository</a></div> @@ -48,13 +48,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/<xsl:value-of select="info/@module"/>/</xsl:attribute> <xsl:value-of select="info/@module"/> </xsl:element> - </span> - by + </span> + by <span id="organisation"> <xsl:element name="a"> <xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/</xsl:attribute> <xsl:value-of select="info/@organisation"/> - </xsl:element> + </xsl:element> </span></h1> <div id="revision"><span id="revision">Revision: </span><xsl:value-of select="info/@revision"/></div> <table class="header"> @@ -95,7 +95,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </td></tr> <tr><td class="title">Description</td><td class="value"><xsl:copy-of select="info/description"/></td></tr> </table> - + <xsl:if test="count($repositories) > 0"> <div id="repositories"> <h2>Public Repositories</h2> @@ -128,7 +128,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </table> </div> </xsl:if> - + <div id="public-confs" class="conf"> <h2>Public Configurations</h2> <table> @@ -157,7 +157,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </tbody> </table> </div> - + <xsl:if test="count($deprecated.conf) > 0"> <div id="deprecated-confs" class="conf"> <h2>Deprecated Configurations</h2> @@ -181,7 +181,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </table> </div> </xsl:if> - + <xsl:if test="count($private.conf) > 0"> <div id="deprecated-confs" class="conf"> <h2>Private Configurations</h2> @@ -205,7 +205,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </table> </div> </xsl:if> - + <div id="artifacts"> <h2>Published Artifacts</h2> <table> @@ -224,13 +224,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <td> <xsl:value-of select="@conf"/> <xsl:for-each select="conf"> - <xsl:if test="position() > 1">, + <xsl:if test="position() > 1">, </xsl:if> <xsl:value-of select="@name"/> </xsl:for-each> <xsl:if test="not(@conf) and count(conf) = 0"> <i>all</i> - </xsl:if> + </xsl:if> </td> </tr> </xsl:for-each> @@ -242,7 +242,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </tbody> </table> </div> - + <xsl:if test="count($dependencies) > 0"> <div id="dependencies"> <h2>Dependencies</h2> @@ -273,8 +273,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> </table> </div> </xsl:if> - - + + </body> </html> </xsl:template> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-report.css ---------------------------------------------------------------------- diff --git a/asciidoc/samples/ivy-report.css b/asciidoc/samples/ivy-report.css index c89bd54..a5b58a2 100644 --- a/asciidoc/samples/ivy-report.css +++ b/asciidoc/samples/ivy-report.css @@ -18,13 +18,13 @@ body { font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif; - font-size:small; + font-size:small; } div#logo { - float: right; - padding-left: 10px; - padding-bottom: 10px; + float: right; + padding-left: 10px; + padding-bottom: 10px; background: white; text-align: center; } @@ -36,13 +36,13 @@ div#logo { div#date { font-style: italic; padding-left: 60px; - padding-bottom: 40px; + padding-bottom: 40px; } h1 { margin-bottom:2px; - + border-color:#7A9437; border-style:solid; border-width:0 0 3px 0; @@ -64,13 +64,13 @@ span#organisation { margin: 12px 0px 0px 0px; padding: 0px; z-index: 1; - padding-left: 10px + padding-left: 10px } #confmenu li { display: inline; overflow: hidden; - list-style-type: none; + list-style-type: none; } #confmenu a, a.active { @@ -79,7 +79,7 @@ span#organisation { font: bold 1em "Trebuchet MS", Arial, sans-serif; border: 2px solid black; padding: 2px 5px 0px 5px; - text-decoration: none; + text-decoration: none; } /* @@ -95,20 +95,20 @@ background: #DEE4CD #confmenu a:hover { color: #fff; - background: #ADC09F; + background: #ADC09F; } #confmenu a:visited { - color: #DEDECF; + color: #DEDECF; } #confmenu a.active:visited { - color: #7A9437; + color: #7A9437; } #confmenu a.active:hover { background: #DEE4CD; - color: #DEDECF; + color: #DEDECF; } #content { @@ -116,23 +116,23 @@ background: #DEE4CD padding: 20px; border: 2px solid black; border-top: none; - z-index: 2; + z-index: 2; } #content a { text-decoration: none; - color: #E8E9BE; + color: #E8E9BE; } -#content a:hover { - background: #898B5E; +#content a:hover { + background: #898B5E; } h2 { margin-bottom:2px; font-size:medium; - + border-color:#7A9437; border-style:solid; border-width:0 0 2px 0; @@ -151,7 +151,7 @@ h4 { margin-bottom:2px; margin-top:2px; font-size:medium; - + border-color:#7A9437; border-style:dashed; border-width:0 0 1px 0; @@ -276,4 +276,3 @@ td.title:first-letter { color:#7A9437; background-color:transparent; } - http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-sample-xslt.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/ivy-sample-xslt.xml b/asciidoc/samples/ivy-sample-xslt.xml index 28f32dd..7c5bb94 100644 --- a/asciidoc/samples/ivy-sample-xslt.xml +++ b/asciidoc/samples/ivy-sample-xslt.xml @@ -16,7 +16,7 @@ "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. --> <ivy-module version="2.0"> <info organisation="myorg" @@ -24,15 +24,15 @@ revision="myrev" status="integration" publication="20041101110000"> - + <license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/> - + <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/> <ivyauthor name="myorg" url="http://www.myorg.org/"/> <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/"; pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/> - <description homepage="http://www.my.org/mymodule/";> + <description homepage="http://www.my.org/mymodule/";> This module is <b>great</b> !<br/> You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too. </description> @@ -41,7 +41,7 @@ <conf name="myconf1" description="desc 1"/> <conf name="myconf2" description="desc 2" visibility="public"/> <conf name="myconf3" description="desc 3" visibility="private"/> - <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/> + <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/> <conf name="myoldconf" description="my old desc" deprecated="20050115"/> </configurations> <publications> @@ -79,7 +79,7 @@ <dependency org="yourorg" name="yourmodule8" rev="8.1"> <artifact name="yourartifact8-1" type="jar"/> <artifact name="yourartifact8-2" type="jar"/> - </dependency> + </dependency> <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default"> <artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/> @@ -87,14 +87,14 @@ <conf name="myconf2"/> <conf name="myconf3"/> </artifact> - </dependency> + </dependency> <dependency org="yourorg" name="yourmodule10" rev="10.1"> <include name="your.*" type="jar"/> <include ext="xml"/> <exclude name="toexclude"/> </dependency> - + <conflict org="yourorg" module=".*" manager="all"/> <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/> </dependencies> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-sample.xml ---------------------------------------------------------------------- diff --git a/asciidoc/samples/ivy-sample.xml b/asciidoc/samples/ivy-sample.xml index 62ef74c..5c682e0 100644 --- a/asciidoc/samples/ivy-sample.xml +++ b/asciidoc/samples/ivy-sample.xml @@ -15,7 +15,7 @@ "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. --> <ivy-module version="2.0"> <info organisation="myorg" @@ -23,15 +23,15 @@ revision="myrev" status="integration" publication="20041101110000"> - + <license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/> - + <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/> <ivyauthor name="myorg" url="http://www.myorg.org/"/> <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/"; pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/> - <description homepage="http://www.my.org/mymodule/";> + <description homepage="http://www.my.org/mymodule/";> This module is <b>great</b> !<br/> You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too. </description> @@ -40,7 +40,7 @@ <conf name="myconf1" description="desc 1"/> <conf name="myconf2" description="desc 2" visibility="public"/> <conf name="myconf3" description="desc 3" visibility="private"/> - <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/> + <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/> <conf name="myoldconf" description="my old desc" deprecated="20050115"/> </configurations> <publications> @@ -78,7 +78,7 @@ <dependency org="yourorg" name="yourmodule8" rev="8.1"> <artifact name="yourartifact8-1" type="jar"/> <artifact name="yourartifact8-2" type="jar"/> - </dependency> + </dependency> <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default"> <artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/> @@ -86,14 +86,14 @@ <conf name="myconf2"/> <conf name="myconf3"/> </artifact> - </dependency> + </dependency> <dependency org="yourorg" name="yourmodule10" rev="10.1"> <include name="your.*" type="jar"/> <include ext="xml"/> <exclude name="toexclude"/> - </dependency> - + </dependency> + <conflict org="yourorg" module=".*" manager="all"/> <conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/> </dependencies> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-style.css ---------------------------------------------------------------------- diff --git a/asciidoc/samples/ivy-style.css b/asciidoc/samples/ivy-style.css index 9518ef9..dd48d68 100644 --- a/asciidoc/samples/ivy-style.css +++ b/asciidoc/samples/ivy-style.css @@ -18,13 +18,13 @@ body { font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif; - font-size:small; + font-size:small; } div#logo { - float: right; - padding-left: 10px; - padding-bottom: 10px; + float: right; + padding-left: 10px; + padding-bottom: 10px; background: white; text-align: center; } @@ -46,7 +46,7 @@ a#rep:hover { h1 { margin-bottom:2px; - + border-color:#7A9437; border-style:solid; border-width:0 0 3px 0; @@ -76,7 +76,7 @@ span#organisation a:hover { h2 { margin-bottom:2px; font-size:medium; - + border-color:#7A9437; border-style:solid; border-width:0 0 2px 0;
![http://ant.apache.org/ivy/images/logo.png"](http://ant.apache.org/ivy/images/logo.png"){kind=link}
![http://ivy.jayasoft.org/images/searched.gif"](http://ivy.jayasoft.org/images/searched.gif"){kind=link}
![http://ivy.jayasoft.org/images/downloaded.gif"](http://ivy.jayasoft.org/images/downloaded.gif"){kind=link}
![http://ivy.jayasoft.org/images/evicted.gif"](http://ivy.jayasoft.org/images/evicted.gif"){kind=link}
![http://ivy.jayasoft.org/images/error.gif"](http://ivy.jayasoft.org/images/error.gif"){kind=link}
![http://ant.apache.org/ivy/images/logo.png"/](http://ant.apache.org/ivy/images/logo.png"/){kind=link}