From a2fdfe6737e67935779ea26bbf2d4650e5d77dc4 Mon Sep 17 00:00:00 2001 From: twogee Date: Mon, 5 Jun 2017 22:37:14 +0200 Subject: [PATCH] Whitespace cleanup --- build-for-bin-distrib.xml | 29 +- build-release.xml | 60 ++-- src/example/bintray/build.xml | 6 +- src/example/build-a-ivy-repository/build.xml | 124 +++---- src/example/chained-resolvers/build.xml | 30 +- .../chainedresolvers-project/build.xml | 76 ++--- .../configurations/jdbc-example/build.xml | 103 +++--- .../multi-projects/filter-framework/build.xml | 195 +++++------ .../multi-projects/myapp/build.xml | 87 ++--- src/example/dependence/build.xml | 32 +- src/example/dependence/dependee/build.xml | 98 +++--- src/example/dependence/depender/build.xml | 82 ++--- src/example/dual/build.xml | 30 +- src/example/dual/project/build.xml | 78 ++--- src/example/go-ivy/build.xml | 171 +++++----- src/example/hello-ivy/build.xml | 72 ++-- src/example/multi-project/build.xml | 89 +++-- src/example/multi-project/common/common.xml | 311 +++++++++--------- src/java/org/apache/ivy/ant/antlib.xml | 16 +- test/java/org/apache/ivy/TestHelper.java | 2 +- 20 files changed, 842 insertions(+), 849 deletions(-) diff --git a/build-for-bin-distrib.xml b/build-for-bin-distrib.xml index efac7b20..e6a5f233 100644 --- a/build-for-bin-distrib.xml +++ b/build-for-bin-distrib.xml @@ -14,22 +14,19 @@ "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. --> - - - - - + uri="antlib:org.apache.ivy.ant" + classpath="ivy.jar"/> - + - + ======================================================================= Dependencies retrieved in lib directory @@ -37,22 +34,22 @@ Dependency report generated in report directory ======================================================================= - + - + ======================================================================= Please enter configuration (or comma separated list of configurations). Available configurations are: ${ivy.configurations} - + - + - - + + - \ No newline at end of file + diff --git a/build-release.xml b/build-release.xml index 379655f4..2364091e 100644 --- a/build-release.xml +++ b/build-release.xml @@ -17,10 +17,10 @@ under the License. --> + xmlns:ivy="antlib:org.apache.ivy.ant" + xmlns:ivy2="antlib:org.apache.ivy.ant_2" + xmlns:xooki="antlib:xooki" + xmlns:openpgp="antlib:org.apache.commons.openpgp.ant"> @@ -63,7 +63,7 @@ - + @@ -176,12 +176,12 @@ - + - + @@ -216,13 +216,13 @@ xookidir="${doc.src.dir}/xooki"/> - + - + + compression="gzip" longfile="gnu"> - + @@ -266,12 +266,12 @@ + compression="gzip" longfile="gnu"> - + @@ -297,15 +297,14 @@ + depends="snapshot-bin-with-dependencies,snapshot-bin-without-dependencies"/> - - + - @@ -382,7 +380,7 @@ + uri="antlib:org.apache.ivy.ant_2"> @@ -473,11 +471,11 @@ - + + uri="antlib:org.apache.ivy.ant_2"> @@ -494,14 +492,14 @@ + module="ivy" + revision="${build.version}" + srcivypattern="${basedir}/build/artifact/ivy.xml" + artifactspattern="${basedir}/build/distrib/maven2/[revision]/[artifact]-[revision](-[classifier]).[ext]" + publishivy="false" + conf="core" + settingsRef="upload.settingsId" + resolver="nexus"> @@ -510,10 +508,10 @@ + depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, test-report" /> - + diff --git a/src/example/bintray/build.xml b/src/example/bintray/build.xml index c82359eb..6fdff4c8 100644 --- a/src/example/bintray/build.xml +++ b/src/example/bintray/build.xml @@ -18,6 +18,10 @@ --> - + + + + + Nothing to clean here. diff --git a/src/example/build-a-ivy-repository/build.xml b/src/example/build-a-ivy-repository/build.xml index ce83957e..e09f5d7b 100644 --- a/src/example/build-a-ivy-repository/build.xml +++ b/src/example/build-a-ivy-repository/build.xml @@ -15,106 +15,108 @@ "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. --> - - - - - - - + + + - - + + - - - - - - - - - - - - + + + + + - - + + + + + + + - + description="--> install module from maven 2 repository"> + - - - + + - - - + + - - + description="--> install module with dependencies from maven2 repo using namespaces"> + - - - - + + + - - + + + diff --git a/src/example/chained-resolvers/build.xml b/src/example/chained-resolvers/build.xml index b8e01223..9c03292d 100644 --- a/src/example/chained-resolvers/build.xml +++ b/src/example/chained-resolvers/build.xml @@ -14,25 +14,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. --> - - - + - - - - - - - - - + + + + + + + diff --git a/src/example/chained-resolvers/chainedresolvers-project/build.xml b/src/example/chained-resolvers/chainedresolvers-project/build.xml index 53dcaeed..e5ad13bd 100644 --- a/src/example/chained-resolvers/chainedresolvers-project/build.xml +++ b/src/example/chained-resolvers/chainedresolvers-project/build.xml @@ -14,68 +14,68 @@ "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. --> - - - - - - + + + - + + + + - - + + - - + + - - - - - - - - - - + + - - - - - - - + + + + + - - - - - + + + diff --git a/src/example/configurations/jdbc-example/build.xml b/src/example/configurations/jdbc-example/build.xml index df5eaca8..a173e651 100644 --- a/src/example/configurations/jdbc-example/build.xml +++ b/src/example/configurations/jdbc-example/build.xml @@ -14,84 +14,85 @@ "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. --> - - - - + + + + - - - - - - - - - + - - - - - - - + + + + - - + - - - + + + - + - - - + - - - - + + + + - - - - - - + + + + + - - - - - + + + diff --git a/src/example/configurations/multi-projects/filter-framework/build.xml b/src/example/configurations/multi-projects/filter-framework/build.xml index 566f011c..d8818ca4 100644 --- a/src/example/configurations/multi-projects/filter-framework/build.xml +++ b/src/example/configurations/multi-projects/filter-framework/build.xml @@ -14,125 +14,126 @@ "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. --> - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - - - - + + + - - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - + + + - - - - + + + + - - diff --git a/src/example/configurations/multi-projects/myapp/build.xml b/src/example/configurations/multi-projects/myapp/build.xml index 460cd43b..f5e49e6f 100644 --- a/src/example/configurations/multi-projects/myapp/build.xml +++ b/src/example/configurations/multi-projects/myapp/build.xml @@ -14,80 +14,81 @@ "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. --> - - - - + + + + - - + + - - + + - - + + - - - - - - retrieve dependencies with ivy"> + + + + - - - + - - - - - - - - - - - + + + + + + - - - - - + + + diff --git a/src/example/dependence/build.xml b/src/example/dependence/build.xml index 5c94a536..9c412923 100644 --- a/src/example/dependence/build.xml +++ b/src/example/dependence/build.xml @@ -14,29 +14,29 @@ "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. --> - - - - - - - + + + + + - - - - - + + + + - + diff --git a/src/example/dependence/dependee/build.xml b/src/example/dependence/dependee/build.xml index d45c22d8..dbf05e94 100644 --- a/src/example/dependence/dependee/build.xml +++ b/src/example/dependence/dependee/build.xml @@ -14,97 +14,95 @@ "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. --> - - - - + + + + - - - + + + - - + + - - + + - - - - - + - - - - - + - - - - - - - + + + - + - - - + + - - - - - - - + + + + + diff --git a/src/example/dependence/depender/build.xml b/src/example/dependence/depender/build.xml index 2cf9249e..250414d6 100644 --- a/src/example/dependence/depender/build.xml +++ b/src/example/dependence/depender/build.xml @@ -14,80 +14,80 @@ "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. --> - - - - + + + + - - - + + + - - + + - - + + - - - - + - - - - - - - - - + + + + + - - - + - - - - - - - - - + + + + + diff --git a/src/example/dual/build.xml b/src/example/dual/build.xml index 56f281f8..04c9d8ee 100644 --- a/src/example/dual/build.xml +++ b/src/example/dual/build.xml @@ -14,25 +14,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. --> - - - + - - - - - - - - - + + + + + + + diff --git a/src/example/dual/project/build.xml b/src/example/dual/project/build.xml index bf550f30..6ef4b911 100644 --- a/src/example/dual/project/build.xml +++ b/src/example/dual/project/build.xml @@ -14,68 +14,68 @@ "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. --> - - - - - - + + + - + + + + - - - - - + - - - - - + - - - - - + - - - - - - - + + + + + - - - - - + + + diff --git a/src/example/go-ivy/build.xml b/src/example/go-ivy/build.xml index d92b11fa..cd7ec17c 100644 --- a/src/example/go-ivy/build.xml +++ b/src/example/go-ivy/build.xml @@ -14,100 +14,99 @@ "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. --> - - - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + We are now ready to execute our simple program with its dependency on commons-lang. Let's go! - - + + - - + + - + - - + package example; @@ -117,35 +116,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)); } } - - - - - + + + - - - - - - - clean the ivy installation"> + + + + - - - + + + diff --git a/src/example/hello-ivy/build.xml b/src/example/hello-ivy/build.xml index 1e94ea41..64a57431 100644 --- a/src/example/hello-ivy/build.xml +++ b/src/example/hello-ivy/build.xml @@ -14,67 +14,67 @@ "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. --> - - - - + + + + - - - - - + - - - - - - - + - + - - - + + + - - - - - - + + + + + - - - - - + + + diff --git a/src/example/multi-project/build.xml b/src/example/multi-project/build.xml index 200a4392..1b24813c 100644 --- a/src/example/multi-project/build.xml +++ b/src/example/multi-project/build.xml @@ -14,56 +14,53 @@ "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. --> - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - diff --git a/src/example/multi-project/common/common.xml b/src/example/multi-project/common/common.xml index 89cd5088..cdbd0daa 100644 --- a/src/example/multi-project/common/common.xml +++ b/src/example/multi-project/common/common.xml @@ -14,192 +14,187 @@ "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. --> - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + - - - - - - - - - - + + + - - - - - - - - - - - + + + + - - - + + + + + + - - - - - - - - - - + + + + - - - - - + + + - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + + - - + + + + + + + + + + + + diff --git a/src/java/org/apache/ivy/ant/antlib.xml b/src/java/org/apache/ivy/ant/antlib.xml index 0111f781..c93be30a 100644 --- a/src/java/org/apache/ivy/ant/antlib.xml +++ b/src/java/org/apache/ivy/ant/antlib.xml @@ -18,8 +18,8 @@ under the License. --> - - + + @@ -44,10 +44,10 @@ - - - - - - + + + + + + diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java index 72d216bc..79634072 100644 --- a/test/java/org/apache/ivy/TestHelper.java +++ b/test/java/org/apache/ivy/TestHelper.java @@ -131,7 +131,7 @@ public class TestHelper { } /** - * Parses a string represenation of a module descriptor in micro ivy format. + * Parses a string representation of a module descriptor in micro ivy format. *

* Examples: *