Repository: ant-ivyde Updated Branches: refs/heads/master 86f0ba22c -> 3f5e4c61d
Check spelling⦠Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/3f5e4c61 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/3f5e4c61 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/3f5e4c61 Branch: refs/heads/master Commit: 3f5e4c61da8e65b08874d52c7fc6accbd6a7daf8 Parents: 86f0ba2 Author: Gintas Grigelionis <[email protected]> Authored: Sun Jun 17 19:01:35 2018 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Sun Jun 17 19:02:11 2018 +0200 ---------------------------------------------------------------------- doc/src/compatibility.adoc | 2 +- doc/src/console.adoc | 2 +- doc/src/cpc/jarmapping.adoc | 6 +++--- doc/src/cpc/maven.adoc | 2 +- doc/src/cpc/workspace.adoc | 6 +++--- doc/src/cpc/wtp.adoc | 2 +- doc/src/dev/release.adoc | 14 +++++++------- doc/src/eclipsevar.adoc | 2 +- doc/src/index.adoc | 2 +- doc/src/js/jquery.treeview.js | 2 +- doc/src/non-java.adoc | 8 ++++---- doc/src/preferences.adoc | 4 ++-- doc/src/release-notes.adoc | 6 +++--- doc/src/resolve-visualizer.adoc | 2 +- .../1.0/javascripts/jquery-default-value-1.0.js | 2 +- doc/src/settingseditor.adoc | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/compatibility.adoc ---------------------------------------------------------------------- diff --git a/doc/src/compatibility.adoc b/doc/src/compatibility.adoc index 6b5a82c..953bf06 100644 --- a/doc/src/compatibility.adoc +++ b/doc/src/compatibility.adoc @@ -31,6 +31,6 @@ Apache IvyDE expects to be used with a version 2.1 or superior of Apache Ivy. In Apache IvyDE has been maintained to be compatible with Eclipse 4.3 (aka Eclipse Kepler) and superior. -== JVM compability +== JVM compatibility Apache IvyDE is requiring a minimum of Java 7. http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/console.adoc ---------------------------------------------------------------------- diff --git a/doc/src/console.adoc b/doc/src/console.adoc index 2feb577..020a3cd 100644 --- a/doc/src/console.adoc +++ b/doc/src/console.adoc @@ -35,7 +35,7 @@ The colors in the console correspond to the different log levels. Here is the de There are two kinds of logs. The ones from Ivy itself and the ones from IvyDE. The ones from Ivy are the ones you should be used to see when you use it via Ant. -The IvyDE logs are here to help you understand what IvyDE actually do when launching a resolve or refreshing a project. They can be espacially usefull in debug mode when reporting a bug to the developpers of IvyDE. +The IvyDE logs are here to help you understand what IvyDE actually do when launching a resolve or refreshing a project. They can be especially useful in debug mode when reporting a bug to the developers of IvyDE. == Configuration http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/cpc/jarmapping.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/jarmapping.adoc b/doc/src/cpc/jarmapping.adoc index 6b4efcf..248ec77 100644 --- a/doc/src/cpc/jarmapping.adoc +++ b/doc/src/cpc/jarmapping.adoc @@ -35,7 +35,7 @@ For the javadocs, it is relying on the "Javadocs types". == Binding the jars -=== Alorithm +=== Algorithm The second step is to bind a source artifact with a binary one. IvyDE has the following algorithm: @@ -52,7 +52,7 @@ In the link:https://ant.apache.org/ivy/history/latest-milestone/ivyfile/artifact * `ivyde:source="my-source-artifact-name"` which specify the artifact name of the source to bind to the current binary one * `ivyde:javadoc="my-javadoc-artifact-name"` which specify the artifact name of the javadoc to bind to the current binary one -=== Exemples +=== Examples For instance, searching for the sources of mylib.jar (type=jar), with the default value of "Sources suffixes" ("-source,-sources,-src"), IvyDE will look to bind it to the first one existing of: @@ -81,7 +81,7 @@ With the IvyDE namespace, having the ivy.xml file: </ivy-module> ---- -Without furether setup in IvyDE preferences pages, IvyDE will bind: +Without further setup in IvyDE preferences pages, IvyDE will bind: * the jar `the-sources-of-mylib` as sources of the jar `mylib` * the jar `the-javadoc-of-mylib` as javadoc of the jar `mylib` http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/cpc/maven.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/maven.adoc b/doc/src/cpc/maven.adoc index ce4234c..cd3d114 100644 --- a/doc/src/cpc/maven.adoc +++ b/doc/src/cpc/maven.adoc @@ -38,7 +38,7 @@ This sample presents a simple use case involving a Maven POM and the IvyDE class image::../images/httpProject_errors.jpg[] -*Note:* your project willnot compile: some imports cannot be resolved. +*Note:* your project will not compile: some imports cannot be resolved. * Add a new classpath container based on the "project.xml" pom and select "default" configuration (Maven scope) http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/cpc/workspace.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/workspace.adoc b/doc/src/cpc/workspace.adoc index d517748..ae513f1 100644 --- a/doc/src/cpc/workspace.adoc +++ b/doc/src/cpc/workspace.adoc @@ -17,7 +17,7 @@ under the License. //// -Some projects are composed of mulpliple modules. Often, these modules have dependencies between them, dependencies managed by Apache Ivy (of course!). +Some projects are composed of multiple modules. Often, these modules have dependencies between them, dependencies managed by Apache Ivy (of course!). Eclipse is capable of calculating the workspace's build order according to dependencies between projects. To leverage this advantage, Apache IvyDE has the ability to add a project reference to a dependency located in the workspace in place of downloading its published artifact(s) from the repository. In this way, developers can develop multi-module applications, and test the interaction between these modules, before building and publishing artifacts to the repository. @@ -33,8 +33,8 @@ Important notes: to make the resolve in workspace work correctly the __info__ in * The __org__ and __name__ * If there is a __rev__ specified, dependencies should specify the appropriate range -* If there is no __rev__ specified, only dependencies with __lastest__ will match -* The __status__ should match the required one: a dependency with __latest.integration__ will only match if there is __status="interation"__ in the info of the dependant module +* If there is no __rev__ specified, only dependencies with __latest__ will match +* The __status__ should match the required one: a dependency with __latest.integration__ will only match if there is __status="integration"__ in the info of the dependant module Having two projects "A" and "B" configured to use IvyDE and the workspace resolver, here is the expected resolved dependencies: http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/cpc/wtp.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/wtp.adoc b/doc/src/cpc/wtp.adoc index a312f20..df386cb 100644 --- a/doc/src/cpc/wtp.adoc +++ b/doc/src/cpc/wtp.adoc @@ -48,7 +48,7 @@ WTP doesn't support classpath containers like IvyDE's or Maven's one which can l A feature request has been opened in WTP's Bugzilla: see link:https://bugs.eclipse.org/bugs/show_bug.cgi?id=184125[bug #184125]. -If you really want to link a Java project into the classpath of a WTP project, you should folow what is described in the link:https://bugs.eclipse.org/bugs/show_bug.cgi?id=184125#c12[comment #12] and the link:https://bugs.eclipse.org/bugs/show_bug.cgi?id=184125#c17[comment #17]: +If you really want to link a Java project into the classpath of a WTP project, you should follow what is described in the link:https://bugs.eclipse.org/bugs/show_bug.cgi?id=184125#c12[comment #12] and the link:https://bugs.eclipse.org/bugs/show_bug.cgi?id=184125#c17[comment #17]: * in your ivy.xml of your WTP project, exclude from your dependencies the Java projects you want to link to (you can create a specific Ivy configuration for that, so it won't mess with the configurations used by an Ant build for instance) http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/dev/release.adoc ---------------------------------------------------------------------- diff --git a/doc/src/dev/release.adoc b/doc/src/dev/release.adoc index 4ea0e9d..9d287c9 100644 --- a/doc/src/dev/release.adoc +++ b/doc/src/dev/release.adoc @@ -28,7 +28,7 @@ First in link:https://issues.apache.org/jira/browse/IVYDE[Jira] make sure that n === Release notes -Make sure the release notes and the annoucement are up to date in doc/src/release-notes.adoc. +Make sure the release notes and the announcement are up to date in doc/src/release-notes.adoc. === Last checks @@ -127,15 +127,15 @@ Then just do: $ svn mv https://dist.apache.org/repos/dist/dev/ant/ivyde/$VERSION https://dist.apache.org/repos/dist/release/ant/ivyde/$VERSION ---- -In order to keep the main dist area of a reasonable size, old releases should be removed. They will disapear from the main dist but will still be available via the link:https://archive.apache.org/dist/ant/ivyde/[archive]. To do so, just use the `svn rm` command against the artifacts or folders to remove. +In order to keep the main dist area of a reasonable size, old releases should be removed. They will disappear from the main dist but will still be available via the link:https://archive.apache.org/dist/ant/ivyde/[archive]. To do so, just use the `svn rm` command against the artifacts or folders to remove. === Deploy the updatesite Follow the instructions of that link:updatesite{outfilesuffix}#deployment[page]. -== Annoucement +== Announcement -The annoucement should have been already prepared and reviewed by other committers. Its content can be found in doc/release-notes.html. +The announcement should have been already prepared and reviewed by other committers. Its content can be found in doc/release-notes.html. With that content, send a mail to [email protected], [email protected] and [email protected] with the title "[ANNOUNCE] Apache IvyDE $VERSION released", and with your apache email as sender (announce@ requires it). @@ -200,7 +200,7 @@ And now let's generate the site and deploy it: ---- ant generate-history -Dhistory.version=$VERSION ---- -WARNING: that target is modifiying the toc.json in the imported branch so that the generated html have a proper version declared in the toc. You should not commit that change. Once the site has been generated, you may want to revert the changes so you won't commit it by mistake. (TODO: process to improve so we shouldn't worry). +WARNING: that target is modifying the toc.json in the imported branch so that the generated html have a proper version declared in the toc. You should not commit that change. Once the site has been generated, you may want to revert the changes so you won't commit it by mistake. (TODO: process to improve so we shouldn't worry). . generate the website with the new toc: [source] @@ -232,9 +232,9 @@ Add the just released version in IvyDE's doap file: see doap_IvyDE.rdf at the ro === Clean up the release notes -Edit the release notes in the documentation (doc/release-notes.html) so it can be prepared and maintanined for the next release: +Edit the release notes in the documentation (doc/release-notes.html) so it can be prepared and maintained for the next release: -* edit the content under "Release Annoucement": edit the version it is talking about and clean it up so it is a summary of the release notes +* edit the content under "Release Announcement": edit the version it is talking about and clean it up so it is a summary of the release notes * edit the content under "Status of this release": update it with the goal of the next release, or a TODO if it has not yet been defined * edit the content under "Major Changes in this Release": wipe it all and put there something like "Nothing done yet" * edit the content under "List of Changes in this Release": remove the list of entries and update the version in "List of changes since Apache IvyDE X.X.X" http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/eclipsevar.adoc ---------------------------------------------------------------------- diff --git a/doc/src/eclipsevar.adoc b/doc/src/eclipsevar.adoc index c45fee6..7879aab 100644 --- a/doc/src/eclipsevar.adoc +++ b/doc/src/eclipsevar.adoc @@ -17,7 +17,7 @@ under the License. //// -Eclipse contains a link:https://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.jdt.doc.user/reference/preferences/run-debug/ref-string_substitution.htm[string substitution mecanism]. This feature allows you to specify a path location that can be shared between developers. +Eclipse contains a link:https://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.jdt.doc.user/reference/preferences/run-debug/ref-string_substitution.htm[string substitution mechanism]. This feature allows you to specify a path location that can be shared between developers. Apache IvyDE uses it to find the ivysettings.xml and properties files in both the link:preferences{outfilesuffix}#settings[global preference page] and the link:cpc/create{outfilesuffix}#localconf[project specific preference page]. http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/index.adoc ---------------------------------------------------------------------- diff --git a/doc/src/index.adoc b/doc/src/index.adoc index 46bad03..7845c39 100644 --- a/doc/src/index.adoc +++ b/doc/src/index.adoc @@ -32,7 +32,7 @@ A summary of the features it provides follows: * link:revdepexplorer{outfilesuffix}[Reverse Dependency Explorer]: helps you work with conflicting dependencies amongst several projects. -* link:non-java{outfilesuffix}[Resolve and retrieve for non Java project]: automation of the retrival of your dependencies in your non Java project +* link:non-java{outfilesuffix}[Resolve and retrieve for non Java project]: automation of the retrieval of your dependencies in your non Java project Apache IvyDE can be also used with other plugins like link:cpc/wtp{outfilesuffix}[WTP] and link:ant{outfilesuffix}[Apache Ant]. http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/js/jquery.treeview.js ---------------------------------------------------------------------- diff --git a/doc/src/js/jquery.treeview.js b/doc/src/js/jquery.treeview.js index 0a5f251..b218a7c 100644 --- a/doc/src/js/jquery.treeview.js +++ b/doc/src/js/jquery.treeview.js @@ -17,7 +17,7 @@ * The "treeview" class is added if not already present. * * To hide branches on first display, mark their li elements with - * the class "closed". If the "collapsed" option is used, mark intially open + * the class "closed". If the "collapsed" option is used, mark initially open * branches with class "open". * * @example .treeview, .treeview ul { http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/non-java.adoc ---------------------------------------------------------------------- diff --git a/doc/src/non-java.adoc b/doc/src/non-java.adoc index abc39ec..5100bf2 100644 --- a/doc/src/non-java.adoc +++ b/doc/src/non-java.adoc @@ -19,7 +19,7 @@ Ivy is a generic dependency manager and can manipulate jars as well as any other kind of resources. IvyDE leverages this feature by bringing dependency management to non Java Eclipse projects. -In this document we will document how to work with IvyDE and non Java dependencies with a concrete exemple: we will manage the dependencies between some JavaScript files and bring them into a Java webapp. +In this document we will document how to work with IvyDE and non Java dependencies with a concrete example: we will manage the dependencies between some JavaScript files and bring them into a Java webapp. == Import the sample project into Eclipse @@ -51,7 +51,7 @@ image::images/retrieve_setup.jpg[] .Name -It gives a human readable name to the retrieve setup. This name will be used later in the context menu to actually launch a retreive of the dependencies. +It gives a human readable name to the retrieve setup. This name will be used later in the context menu to actually launch a retrieve of the dependencies. For the sample project, let's choose "javascripts". .Ivy file @@ -66,7 +66,7 @@ For the sample project we want them there: `src/org/apache/ivyde/sample/webappjs .Delete old retrieved artifacts -Before doing a retrieve, the location where the dependencies are dowloaded will be wiped out is this option is selected. +Before doing a retrieve, the location where the dependencies are downloaded will be wiped out is this option is selected. .Configurations @@ -75,7 +75,7 @@ For the sample project, we want it to be `js`. .Types -This is a comma seperated list of type names which is be retrieved ('`$$*$$`' means __All__). +This is a comma separated list of type names which is be retrieved ('`$$*$$`' means __All__). For the sample project, we want them all: '`$$*$$`'. Now in the "Settings" tab, the setup entries are the same as the link:preferences{outfilesuffix}#settings[global ones]. Click on "Enable project specific settings" to customize for your setup. http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/preferences.adoc ---------------------------------------------------------------------- diff --git a/doc/src/preferences.adoc b/doc/src/preferences.adoc index eef550e..35424ef 100644 --- a/doc/src/preferences.adoc +++ b/doc/src/preferences.adoc @@ -17,7 +17,7 @@ under the License. //// -Apache IvyDE maintains a global configuration, which controls the behaviour of every Ivy instance in every project in the workspace. This global configuration can be overrided in each link:cpc/edit{outfilesuffix}[project]. +Apache IvyDE maintains a global configuration, which controls the behaviour of every Ivy instance in every project in the workspace. This global configuration can be overridden in each link:cpc/edit{outfilesuffix}[project]. The global configuration can be found in the preferences of Eclipse (menu Window > Preferences for Windows and Linux users, Eclipse > Preferences for mac users), and select the item Ivy. @@ -31,7 +31,7 @@ If checked, it will force Ivy to never check resources via any network and trust .Open the Ivy console on startup -If checked, the Ivy console will be opened on startup so that every log from Ivy will be printed. This is especially usefull when looking for debug log from IvyDE starting up. +If checked, the Ivy console will be opened on startup so that every log from Ivy will be printed. This is especially useful when looking for debug log from IvyDE starting up. .On Eclipse startup: http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/release-notes.adoc ---------------------------------------------------------------------- diff --git a/doc/src/release-notes.adoc b/doc/src/release-notes.adoc index 241bc4f..dab12c0 100644 --- a/doc/src/release-notes.adoc +++ b/doc/src/release-notes.adoc @@ -17,13 +17,13 @@ under the License. //// -. link:#annoucement[Release Annoucement] +. link:#announcement[Release Announcement] . link:#what[What is Apache IvyDE?] . link:#majorchanges[Major Changes in this Release] . link:#changes[List of Changes in this Release] . link:#contrib[Committers and Contributors for this Release] -== [[annoucement]]Release Annoucement +== [[announcement]]Release Announcement The Apache IvyDE project is pleased to announce its 2.3.0-rc1 release. @@ -33,7 +33,7 @@ The Apache IvyDE Eclipse plugin integrates Apache Ivy's dependency management in Apache IvyDE is the Eclipse plugin which integrates Apache Ivy's dependency management into Eclipse(TM). -Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your Java Eclipse projects, or any other kind of project which needs dependency management. Apache IvyDE will contribute to the classpath of your Java project or you can make it retrieve your dependencies directly into your project. Last but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files with completion. Get some preview here: https://ant.apache.org/ivy/ivyde/screenshots.html. +Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your Java Eclipse projects, or any other kind of project which needs dependency management. Apache IvyDE will contribute to the classpath of your Java project or you can make it retrieve your dependencies directly into your project. Last but not least Apache IvyDE offer editors of `ivy.xml` and `ivysettings.xml` files with completion. Get some preview here: https://ant.apache.org/ivy/ivyde/screenshots.html. === [[majorchanges]]Major changes in this release: http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/resolve-visualizer.adoc ---------------------------------------------------------------------- diff --git a/doc/src/resolve-visualizer.adoc b/doc/src/resolve-visualizer.adoc index b10d887..815aa02 100644 --- a/doc/src/resolve-visualizer.adoc +++ b/doc/src/resolve-visualizer.adoc @@ -17,7 +17,7 @@ under the License. //// -The resolve vizulizer show the graph of the dependencies of a project. +The resolve visualizer shows the graph of the dependencies of a project. == [[open]]Open the view http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/sample/webapp-js-repo/repo/com.jquery/jquery-default-value/1.0/javascripts/jquery-default-value-1.0.js ---------------------------------------------------------------------- diff --git a/doc/src/sample/webapp-js-repo/repo/com.jquery/jquery-default-value/1.0/javascripts/jquery-default-value-1.0.js b/doc/src/sample/webapp-js-repo/repo/com.jquery/jquery-default-value/1.0/javascripts/jquery-default-value-1.0.js index 7f9c0c8..695c2e0 100644 --- a/doc/src/sample/webapp-js-repo/repo/com.jquery/jquery-default-value/1.0/javascripts/jquery-default-value-1.0.js +++ b/doc/src/sample/webapp-js-repo/repo/com.jquery/jquery-default-value/1.0/javascripts/jquery-default-value-1.0.js @@ -1,6 +1,6 @@ /** * jQuery Default Value Plugin v1.0 - * Progressive enhancement technique for inital input field values + * Progressive enhancement technique for initial input field values * * The MIT License * http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3f5e4c61/doc/src/settingseditor.adoc ---------------------------------------------------------------------- diff --git a/doc/src/settingseditor.adoc b/doc/src/settingseditor.adoc index 54abdf7..c1694d4 100644 --- a/doc/src/settingseditor.adoc +++ b/doc/src/settingseditor.adoc @@ -27,7 +27,7 @@ Completion comes with contextual help. The completion popup is displayed through === XML structure -Allows you to quickly to insert valid tags in the right place. If the tag can have nested childrenm, both notations, simple tag and open tag, are proposed. +Allows you to quickly to insert valid tags in the right place. If the tag can have nested children, both notations, simple tag and open tag, are proposed. image::images/settings_completion_struct.jpg[]
