Repository: ant-ivyde Updated Branches: refs/heads/master b52a8e436 -> a2a3acb11
More revisions⦠Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/a2a3acb1 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/a2a3acb1 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/a2a3acb1 Branch: refs/heads/master Commit: a2a3acb117989d812225344ec3c8762f8ed381b1 Parents: b52a8e4 Author: Gintas Grigelionis <gin...@apache.org> Authored: Wed Mar 14 07:26:44 2018 +0100 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Wed Mar 14 07:26:44 2018 +0100 ---------------------------------------------------------------------- doc/src/cp_container.adoc | 2 +- doc/src/cpc/create.adoc | 4 ++-- doc/src/cpc/edit.adoc | 2 +- doc/src/cpc/maven.adoc | 12 ++++++------ doc/src/cpc/wtp.adoc | 2 +- doc/src/non-java.adoc | 8 ++++---- doc/src/toc.json | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/cp_container.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cp_container.adoc b/doc/src/cp_container.adoc index 9854843..9a1fd64 100644 --- a/doc/src/cp_container.adoc +++ b/doc/src/cp_container.adoc @@ -27,5 +27,5 @@ Some of the tasks that can be performed on the container include: * link:cpc/retrieve{outfilesuffix}[Retrieve] the dependencies in your project * Resolve dependencies within the Eclipse link:cpc/workspace{outfilesuffix}[workspace] * link:cpc/launch{outfilesuffix}[Launch] software or unit tests with a classpath managed by IvyDE -* Use IvyDE with link:cpc/maven{outfilesuffix}[maven pom.xml] +* Use IvyDE with link:cpc/maven{outfilesuffix}[Maven pom.xml] * Use IvyDE in concert with link:cpc/wtp{outfilesuffix}[WTP] http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/cpc/create.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/create.adoc b/doc/src/cpc/create.adoc index b3ed69d..2db0ffe 100644 --- a/doc/src/cpc/create.adoc +++ b/doc/src/cpc/create.adoc @@ -21,7 +21,7 @@ First, locate an ivy.xml file or a maven pom.xml ready to be used to build a cla == Fast creation -For most of the projects, the ivy.xml file (or the pom.xml) is in the java project. So you can just right click on the ivy.xml and select "Add Ivy Library..." and you can directly access the prefilled setup of the IvyDE classpath container +For most of the projects, the ivy.xml file (or the pom.xml) is in the Java project. So you can just right click on the ivy.xml and select "Add Ivy Library..." and you can directly access the prefilled setup of the IvyDE classpath container image::../images/addivylibrary.jpg[] @@ -37,7 +37,7 @@ image::../images/build_path_menu.jpg[] image::../images/add_lib.jpg[] -* Select an ivy.xml file or a link:maven{outfilesuffix}[maven pom.xml] and the desired configurations. +* Select an ivy.xml file or a link:maven{outfilesuffix}[Maven pom.xml] and the desired configurations. image::../images/ivy_file_def.jpg[] http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/cpc/edit.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/edit.adoc b/doc/src/cpc/edit.adoc index 33a3613..423113f 100644 --- a/doc/src/cpc/edit.adoc +++ b/doc/src/cpc/edit.adoc @@ -17,7 +17,7 @@ under the License. //// -During the life of your project, you can change the ivy.xml file or link:maven{outfilesuffix}[maven pom.xml] and change its configuration. +During the life of your project, you can change the ivy.xml file or link:maven{outfilesuffix}[Maven pom.xml] and change its configuration. == Context Menu http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/cpc/maven.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/maven.adoc b/doc/src/cpc/maven.adoc index 497125e..92f0b0e 100644 --- a/doc/src/cpc/maven.adoc +++ b/doc/src/cpc/maven.adoc @@ -19,28 +19,28 @@ If you want to use a Apache Maven™ pom.xml instead of an ivy.xml file, you can select a pom file in the configuration options of the IvyDE classpath. -When a maven pom is selected, the configurations list is updated with all maven scopes. +When a Maven POM is selected, the configurations list is updated with all Maven scopes. -Both examples below are a good illustration of the simplicity of using maven poms in Apache IvyDE: +Both examples below are a good illustration of the simplicity of using Maven POMs in Apache IvyDE: * link:#one[Maven1 sample] * link:#two[Maven2 sample] == [[one]]Maven1 Sample -This sample presents a simple use case involving a maven pom and the IvyDE classpath container. We are going to create an Eclipse™ project on commons-httpclient sources. +This sample presents a simple use case involving a Maven POM and the IvyDE classpath container. We are going to create an Eclipse™ project on commons-httpclient sources. * Download the link:http://archive.apache.org/dist/httpcomponents/commons-httpclient/3.0/source/commons-httpclient-3.0-src.zip[commons httpclient sources] * Unzip this file (c:/tmp/commons-httpclient/) -* Create a new Eclipse java project based on the unzipped sources (c:/tmp/commons-httpclient/) +* Create a new Eclipse Java project based on the unzipped sources (c:/tmp/commons-httpclient/) image::../images/httpProject_errors.jpg[] *Note:* your project willnot compile: some imports cannot be resolved. -* Add a new classpath container based on the "project.xml" pom and select "default" configuration (maven scope) +* Add a new classpath container based on the "project.xml" pom and select "default" configuration (Maven scope) image::../images/httpProject_pom.jpg[] @@ -52,7 +52,7 @@ image::../images/httpProject_clean.jpg[] This sample demonstrates how the IvyDE classpath container on a Apache Maven 2 pom can handle transitive dependencies. -* Create a new empty java project in Eclipse. +* Create a new empty Java project in Eclipse. * In your project, create an `ivysettings.xml` file: http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/cpc/wtp.adoc ---------------------------------------------------------------------- diff --git a/doc/src/cpc/wtp.adoc b/doc/src/cpc/wtp.adoc index 76b242e..d88d76c 100644 --- a/doc/src/cpc/wtp.adoc +++ b/doc/src/cpc/wtp.adoc @@ -50,7 +50,7 @@ A feature request has been opened in WTP's Bugzilla: see link:https://bugs.eclip 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]: -* 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) +* 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) * make sure your Java project is a WTP "utility" project http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/non-java.adoc ---------------------------------------------------------------------- diff --git a/doc/src/non-java.adoc b/doc/src/non-java.adoc index fee8f00..abc39ec 100644 --- a/doc/src/non-java.adoc +++ b/doc/src/non-java.adoc @@ -19,13 +19,13 @@ 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 exemple: we will manage the dependencies between some JavaScript files and bring them into a Java webapp. == Import the sample project into Eclipse The full project sample can be downloaded from link:sample/webapp-js-repo.zip[there]. Unzip it somewhere and import it into Eclipse (see "Existing Projects into Workspace" in the "Import" menu). -The Eclipse project is already configured with an IvyDE classpath container so we can run the Java webapp. We will just have to add the retrieve of the javascript files. +The Eclipse project is already configured with an IvyDE classpath container so we can run the Java webapp. We will just have to add the retrieve of the JavaScript files. == [[configure]]Configure the non-Java dependencies @@ -82,7 +82,7 @@ Now in the "Settings" tab, the setup entries are the same as the link:preference image::images/retrieve_setup_settings.jpg[] -For the sample project, we want to use the ivysettings in the java project: `${workspace_loc:ivyde-sample-webapp-js-repo/ivysettings.xml}`. +For the sample project, we want to use the ivysettings in the Java project: `${workspace_loc:ivyde-sample-webapp-js-repo/ivysettings.xml}`. Finally, click *OK* to finish. @@ -100,6 +100,6 @@ To see the result, we'll launch the Java webapp and look it it your browser loca Right click the Java class `org.apache.ivyde.sample.webappjsrepo.HTTPServer` and select "Run As" / "Java Application". Now open the web page http://localhost:8888/index.html -If working properly, the javascript files should have been properly loaded and the input field should have automatically been filled with a default value. +If working properly, the JavaScript files should have been properly loaded and the input field should have automatically been filled with a default value. image::images/webapp-js-repo-launch.jpg[] http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a2a3acb1/doc/src/toc.json ---------------------------------------------------------------------- diff --git a/doc/src/toc.json b/doc/src/toc.json index 74dc35f..493accd 100644 --- a/doc/src/toc.json +++ b/doc/src/toc.json @@ -112,7 +112,7 @@ }, { "id":"cpc/maven", - "title":"Use with maven poms", + "title":"Use with Maven POMs", "children": [ ]
