This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to annotated tag maven-ant-plugin-2.1 in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 7a39f78cc7e4fd2afaab60aba3754c62ed00193b Author: Benjamin Bentmann <bentm...@apache.org> AuthorDate: Fri Mar 21 13:42:22 2008 +0000 o Added svn:eol-style=native git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@639638 13f79535-47bb-0310-9956-ffa450edef68 --- src/it/ear-it/verify.bsh | 322 +++++++++++++++---------------- src/it/plugin-it/verify.bsh | 64 +++--- src/it/webapp-it/verify.bsh | 64 +++--- src/test/resources/unit/ant-test/pom.xml | 114 +++++------ 4 files changed, 282 insertions(+), 282 deletions(-) diff --git a/src/it/ear-it/verify.bsh b/src/it/ear-it/verify.bsh index e364317..d25f40b 100644 --- a/src/it/ear-it/verify.bsh +++ b/src/it/ear-it/verify.bsh @@ -1,161 +1,161 @@ -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; - -import org.codehaus.plexus.util.IOUtil; - -File build; -File mavenBuild; -File mavenBuildProperties; - -// Root project - -build = new File( basedir, "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir, "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// EAR project - -build = new File( basedir + "/ear", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/ear", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir + "/ear", "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// EJBS project - -build = new File( basedir + "/ejbs", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/ejbs", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir + "/ejbs", "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// PRImARY-SOURCE project - -build = new File( basedir + "/primary-source", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/primary-source", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir + "/primary-source", "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// PROJECTS project - -build = new File( basedir + "/projects", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/projects", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// LOGGING project - -build = new File( basedir + "/projects/logging", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/projects/logging", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir + "/projects/logging", "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// SERVLETS project - -build = new File( basedir + "/servlets", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/servlets", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -// SERVLET project - -build = new File( basedir + "/servlets/servlet", "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir + "/servlets/servlet", "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir + "/servlets/servlet", "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -return true; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; + +import org.codehaus.plexus.util.IOUtil; + +File build; +File mavenBuild; +File mavenBuildProperties; + +// Root project + +build = new File( basedir, "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir, "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// EAR project + +build = new File( basedir + "/ear", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/ear", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir + "/ear", "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// EJBS project + +build = new File( basedir + "/ejbs", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/ejbs", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir + "/ejbs", "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// PRImARY-SOURCE project + +build = new File( basedir + "/primary-source", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/primary-source", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir + "/primary-source", "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// PROJECTS project + +build = new File( basedir + "/projects", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/projects", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// LOGGING project + +build = new File( basedir + "/projects/logging", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/projects/logging", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir + "/projects/logging", "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// SERVLETS project + +build = new File( basedir + "/servlets", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/servlets", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +// SERVLET project + +build = new File( basedir + "/servlets/servlet", "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir + "/servlets/servlet", "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir + "/servlets/servlet", "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +return true; diff --git a/src/it/plugin-it/verify.bsh b/src/it/plugin-it/verify.bsh index 9ab46b7..0df8538 100644 --- a/src/it/plugin-it/verify.bsh +++ b/src/it/plugin-it/verify.bsh @@ -1,32 +1,32 @@ -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; - -import org.codehaus.plexus.util.IOUtil; - -File build; -File mavenBuild; -File mavenBuildProperties; - -// Plugin project - -build = new File( basedir, "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir, "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir, "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -return true; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; + +import org.codehaus.plexus.util.IOUtil; + +File build; +File mavenBuild; +File mavenBuildProperties; + +// Plugin project + +build = new File( basedir, "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir, "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir, "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +return true; diff --git a/src/it/webapp-it/verify.bsh b/src/it/webapp-it/verify.bsh index ae12bda..f002a32 100644 --- a/src/it/webapp-it/verify.bsh +++ b/src/it/webapp-it/verify.bsh @@ -1,32 +1,32 @@ -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; - -import org.codehaus.plexus.util.IOUtil; - -File build; -File mavenBuild; -File mavenBuildProperties; - -// Webapp project - -build = new File( basedir, "build.xml" ); -if ( build.isDirectory() || !build.exists() ) -{ - System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuild = new File( basedir, "maven-build.xml" ); -if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) -{ - System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} -mavenBuildProperties = new File( basedir, "maven-build.properties" ); -if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) -{ - System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); - return false; -} - -return true; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; + +import org.codehaus.plexus.util.IOUtil; + +File build; +File mavenBuild; +File mavenBuildProperties; + +// Webapp project + +build = new File( basedir, "build.xml" ); +if ( build.isDirectory() || !build.exists() ) +{ + System.err.println( "The file '" + build.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuild = new File( basedir, "maven-build.xml" ); +if ( mavenBuild.isDirectory() || !mavenBuild.exists() ) +{ + System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} +mavenBuildProperties = new File( basedir, "maven-build.properties" ); +if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() ) +{ + System.err.println( "The file '" + mavenBuildProperties.getAbsolutePath() + "' is a directory or doesn't exist." ); + return false; +} + +return true; diff --git a/src/test/resources/unit/ant-test/pom.xml b/src/test/resources/unit/ant-test/pom.xml index cff0734..3e33c1d 100644 --- a/src/test/resources/unit/ant-test/pom.xml +++ b/src/test/resources/unit/ant-test/pom.xml @@ -1,57 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -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 -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId> - <artifactId>ant-test</artifactId> - <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> - <inceptionYear>2006</inceptionYear> - <name>Maven Ant Plugin Test</name> - <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ant-plugin</artifactId> - <configuration> - <project implementation="org.apache.maven.plugin.ant.stubs.AntTestMavenProjectStub"/> - <settings implementation="org.apache.maven.plugin.ant.stubs.SettingsStub"/> - <localRepository>${localRepository}</localRepository> - </configuration> - </plugin> - </plugins> - </build> - <properties> - <myKey>myValue</myKey> - </properties> -</project> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +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 +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId> + <artifactId>ant-test</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <inceptionYear>2006</inceptionYear> + <name>Maven Ant Plugin Test</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ant-plugin</artifactId> + <configuration> + <project implementation="org.apache.maven.plugin.ant.stubs.AntTestMavenProjectStub"/> + <settings implementation="org.apache.maven.plugin.ant.stubs.SettingsStub"/> + <localRepository>${localRepository}</localRepository> + </configuration> + </plugin> + </plugins> + </build> + <properties> + <myKey>myValue</myKey> + </properties> +</project> -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.