Repository: ant-ivy Updated Branches: refs/heads/master 84234234e -> b27ae9507
Use ASCII (TM) Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/9191f357 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/9191f357 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/9191f357 Branch: refs/heads/master Commit: 9191f3579601120a2222afe9cf54a8f77aa0cfd6 Parents: 8423423 Author: Gintas Grigelionis <[email protected]> Authored: Wed Mar 14 07:43:37 2018 +0100 Committer: Gintas Grigelionis <[email protected]> Committed: Wed Mar 14 07:43:37 2018 +0100 ---------------------------------------------------------------------- asciidoc/osgi.adoc | 4 ++-- asciidoc/osgi/eclipse-plugin.adoc | 2 +- asciidoc/osgi/osgi-mapping.adoc | 2 +- asciidoc/osgi/sigil.adoc | 4 ++-- asciidoc/osgi/standard-osgi.adoc | 2 +- asciidoc/osgi/target-platform.adoc | 2 +- asciidoc/resolver/obr.adoc | 2 +- asciidoc/resolver/osgiagg.adoc | 2 +- asciidoc/resolver/updatesite.adoc | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi.adoc b/asciidoc/osgi.adoc index d6f457c..8a471e0 100644 --- a/asciidoc/osgi.adoc +++ b/asciidoc/osgi.adoc @@ -19,7 +19,7 @@ = OSGi -Since Apache Ivy™ 2.3, some support for OSGi™ dependency management has been introduced. +Since Apache Ivy(TM) 2.3, some support for OSGi(TM) dependency management has been introduced. @@ -51,7 +51,7 @@ The descriptor probably being not instantly downloaded, the descriptor is put in Here are different use case of using the OSGi capabilities of Ivy: -* link:osgi/eclipse-plugin{outfilesuffix}[building an Eclipse™ plugin] + +* link:osgi/eclipse-plugin{outfilesuffix}[building an Eclipse(TM) plugin] + * link:osgi/standard-osgi{outfilesuffix}[building a standard OSGi bundle] + http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi/eclipse-plugin.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/eclipse-plugin.adoc b/asciidoc/osgi/eclipse-plugin.adoc index 5323554..8702e70 100644 --- a/asciidoc/osgi/eclipse-plugin.adoc +++ b/asciidoc/osgi/eclipse-plugin.adoc @@ -27,7 +27,7 @@ It should work with a simple configuration but may not with complex ones. If you ==== -This page describes how to build an Eclipse™ plugin with Apache Ivy™ and its OSGi™ capabilities. +This page describes how to build an Eclipse(TM) plugin with Apache Ivy(TM) and its OSGi(TM) capabilities. == Quick setup http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi/osgi-mapping.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/osgi-mapping.adoc b/asciidoc/osgi/osgi-mapping.adoc index 42a87cd..6e53915 100644 --- a/asciidoc/osgi/osgi-mapping.adoc +++ b/asciidoc/osgi/osgi-mapping.adoc @@ -19,7 +19,7 @@ = OSGi mapping -This page is a description of how OSGi™ dependencies are mapped into Apache Ivy™ ones +This page is a description of how OSGi(TM) dependencies are mapped into Apache Ivy(TM) ones *Goal:* the purpose of this mapping is to transform an OSGi manifest into an ivy.xml, so Ivy can understand OSGi bundles and resolve them. We don't want to do the reverse here. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi/sigil.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/sigil.adoc b/asciidoc/osgi/sigil.adoc index 6c8ab5e..e84f682 100644 --- a/asciidoc/osgi/sigil.adoc +++ b/asciidoc/osgi/sigil.adoc @@ -19,7 +19,7 @@ = Apache Felix Sigil -Another initiative to manage OSGi™ dependencies is the project link:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Sigil[Apache Felix Sigil™]. Sigil can also be used together with Ivy. We will try to explain here the different approach taken there compared to the built-in OSGi capabilities of Ivy. +Another initiative to manage OSGi(TM) dependencies is the project link:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Sigil[Apache Felix Sigil(TM)]. Sigil can also be used together with Ivy. We will try to explain here the different approach taken there compared to the built-in OSGi capabilities of Ivy. == A different approach @@ -27,7 +27,7 @@ Another initiative to manage OSGi™ dependencies is the project link:https:/ Apache Felix Sigil is at its core about managing OSGi dependencies, not directly related to Ivy. Most of its core feature is about the implementation of the not yet released OBR (OSGi Bundle Repository) specification. It then provides integration layers with several tools so that developers can use the OBR API. It provides an Eclipse plugin and there are the Ant/Ivy tasks and resolvers. -On the other hand the built-in OSGi capabilities in Ivy are targeted towards users already familiar with Ivy and link:https://ant.apache.org/ivy/links.html[tools around it] like link:https://ant.apache.org/ivy/ivyde[Apache IvyDE™]. So with a minimum amount of effort, they can get OSGi dependency management. +On the other hand the built-in OSGi capabilities in Ivy are targeted towards users already familiar with Ivy and link:https://ant.apache.org/ivy/links.html[tools around it] like link:https://ant.apache.org/ivy/ivyde[Apache IvyDE(TM)]. So with a minimum amount of effort, they can get OSGi dependency management. == Resulting differences http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi/standard-osgi.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/standard-osgi.adoc b/asciidoc/osgi/standard-osgi.adoc index dbe6ab0..07971c8 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, optionally one for testing too, and then publish our bundle in a OSGi aware repository. +This page describes how to build an OSGi(TM) bundle with Apache Ivy(TM). 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 order 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. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/osgi/target-platform.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/osgi/target-platform.adoc b/asciidoc/osgi/target-platform.adoc index 50a8416..e17d11d 100644 --- a/asciidoc/osgi/target-platform.adoc +++ b/asciidoc/osgi/target-platform.adoc @@ -28,7 +28,7 @@ It should work with a simple configuration but may not with complex ones. If you ==== -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". +The concept of "target platform" is a concept introduced by Eclipse(TM) to describe the set of bundles which will run together in an OSGi(TM) environment. Then when developing an OSGi bundle, we expect it to run in such a "target platform". When developing a single OSGi bundle, a single `ivy.xml` (together with the use of the link:../use/fixdeps{outfilesuffix}[fixdeps] task) is sufficient to describe precisely the bundle requirements. http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/resolver/obr.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/obr.adoc b/asciidoc/resolver/obr.adoc index a5d6485..9b0597e 100644 --- a/asciidoc/resolver/obr.adoc +++ b/asciidoc/resolver/obr.adoc @@ -29,7 +29,7 @@ [*__since 2.3__*] -[ivysettings.resolvers.obr]#This resolver is one of the resolver which supports link:../osgi{outfilesuffix}[OSGi™] dependencies.# A part of the OSGi specification defines OBR (OSGi Bundle Repository). OBR aggregates the OSGi metadata of every bundle included in a repository. So contrary to the other resolvers, this resolver needs to get the descriptor of the repository (an obr.xml) before starting to resolve modules. +[ivysettings.resolvers.obr]#This resolver is one of the resolver which supports link:../osgi{outfilesuffix}[OSGi(TM)] dependencies.# A part of the OSGi specification defines OBR (OSGi Bundle Repository). OBR aggregates the OSGi metadata of every bundle included in a repository. So contrary to the other resolvers, this resolver needs to get the descriptor of the repository (an obr.xml) before starting to resolve modules. == Attributes http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/resolver/osgiagg.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/osgiagg.adoc b/asciidoc/resolver/osgiagg.adoc index b543258..d82f6d8 100644 --- a/asciidoc/resolver/osgiagg.adoc +++ b/asciidoc/resolver/osgiagg.adoc @@ -29,7 +29,7 @@ [*__since 2.4__*] -This resolver is one of the resolvers which support link:../osgi{outfilesuffix}[OSGi™] dependencies. +This resolver is one of the resolvers which support link:../osgi{outfilesuffix}[OSGi(TM)] dependencies. [ivysettings.resolvers.osgi-agg]#This resolver is like a classic link:../resolver/chain{outfilesuffix}[chain] resolver, but with better support for OSGi metadata.# http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9191f357/asciidoc/resolver/updatesite.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/updatesite.adoc b/asciidoc/resolver/updatesite.adoc index 11213d6..55a481e 100644 --- a/asciidoc/resolver/updatesite.adoc +++ b/asciidoc/resolver/updatesite.adoc @@ -29,7 +29,7 @@ [*__since 2.3__*] -[ivysettings.resolvers.updatesite]#This resolver is one of the resolvers which support link:../osgi{outfilesuffix}[OSGi™] dependencies. It resolves modules (OSGi bundles) which are hosted in an Eclipse™ update site.# +[ivysettings.resolvers.updatesite]#This resolver is one of the resolvers which support link:../osgi{outfilesuffix}[OSGi(TM)] dependencies. It resolves modules (OSGi bundles) which are hosted in an Eclipse(TM) update site.# This resolver supports old style Eclipse updatesite, based on a single file, site.xml. It also supports Eclipse P2 repositories.
