Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 52472 invoked from network); 14 Aug 2010 21:50:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Aug 2010 21:50:34 -0000 Received: (qmail 55733 invoked by uid 500); 14 Aug 2010 21:50:34 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 55663 invoked by uid 500); 14 Aug 2010 21:50:33 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 55656 invoked by uid 99); 14 Aug 2010 21:50:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Aug 2010 21:50:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Aug 2010 21:50:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 94E7E238890B; Sat, 14 Aug 2010 21:49:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r985586 - in /maven/plugins/trunk/maven-war-plugin/src: it/MWAR-129/ it/MWAR-129/src/main/webapp/ it/MWAR-133/ it/MWAR-139/ it/MWAR-143/ it/MWAR-143/war-common/src/main/webapp/WEB-INF/ it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/... Date: Sat, 14 Aug 2010 21:49:11 -0000 To: commits@maven.apache.org From: dennisl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100814214911.94E7E238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sat Aug 14 21:49:10 2010 New Revision: 985586 URL: http://svn.apache.org/viewvc?rev=985586&view=rev Log: o Replace tabs with spaces. Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/parent/pom.xml maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/not-primary-artifact.xml maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/plugin-config-primary-artifact.xml Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/src/main/webapp/param.jsp Sat Aug 14 21:49:10 2010 @@ -20,8 +20,8 @@ under the License. - + - + \ No newline at end of file Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-129/verify.bsh Sat Aug 14 21:49:10 2010 @@ -53,8 +53,8 @@ try int indexOf = paramContent.indexOf( "" ); if ( indexOf < 0) { - System.err.println( "param.jsp not contains " ); - return false; + System.err.println( "param.jsp not contains " ); + return false; } } Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh Sat Aug 14 21:49:10 2010 @@ -53,8 +53,8 @@ try int indexOf = paramContent.indexOf( "app.version=${node.version}" ); if ( indexOf < 0) { - System.err.println( "filtered.properties was not filtered with the value of ${node.version}" ); - return false; + System.err.println( "filtered.properties was not filtered with the value of ${node.version}" ); + return false; } } Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh Sat Aug 14 21:49:10 2010 @@ -52,15 +52,15 @@ try int indexOf = paramContent.indexOf( "hallo @@ hallo" ); if ( indexOf < 0) { - System.err.println( "filterme.xml does not contains hallo @@ hallo" ); - return false; + System.err.println( "filterme.xml does not contains hallo @@ hallo" ); + return false; } - indexOf = paramContent.indexOf( "start-${}-end" ); + indexOf = paramContent.indexOf( "start-${}-end" ); if ( indexOf < 0) { - System.err.println( "filterme.xml does not contains start-${}-end" ); - return false; + System.err.println( "filterme.xml does not contains start-${}-end" ); + return false; } } Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh Sat Aug 14 21:49:10 2010 @@ -60,9 +60,9 @@ filesAreIdentical( File expected, File c try { - File originalImg = new File( basedir, "war-common/src/main/images/duke-beer.jpg" ); - - File targetImg = new File( basedir, "war-common/target/common-overlay-1.0-SNAPSHOT/duke-beer.jpg" ); + File originalImg = new File( basedir, "war-common/src/main/images/duke-beer.jpg" ); + + File targetImg = new File( basedir, "war-common/target/common-overlay-1.0-SNAPSHOT/duke-beer.jpg" ); boolean identical = filesAreIdentical( originalImg, targetImg ); @@ -100,11 +100,11 @@ try int indexOf = paramContent.indexOf( "debug.test = hello world !" ); if ( indexOf < 0) { - System.err.println( "filter.properties does not contains debug.test = hello world !" ); - return false; + System.err.println( "filter.properties does not contains debug.test = hello world !" ); + return false; } - targetImg = new File( basedir, "war-filter-overlay/target/custom-manifest-1.0-SNAPSHOT/duke-beer.jpg" ); + targetImg = new File( basedir, "war-filter-overlay/target/custom-manifest-1.0-SNAPSHOT/duke-beer.jpg" ); boolean identical = filesAreIdentical( originalImg, targetImg ); Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/webapp/WEB-INF/web.xml Sat Aug 14 21:49:10 2010 @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-filter-overlay/src/main/webapp/WEB-INF/web.xml Sat Aug 14 21:49:10 2010 @@ -1,8 +1,8 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-62/verify.bsh Sat Aug 14 21:49:10 2010 @@ -41,14 +41,14 @@ try if ( devProperties.exists() ) { System.err.println( "dev.properties has not been excluded." ); - return false; + return false; } File testProperties = new File ( webAppDirectory, "test.properties" ); if ( testProperties.exists() ) { System.err.println( "test.properties has not been excluded." ); - return false; + return false; } } Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Sat Aug 14 21:49:10 2010 @@ -52,15 +52,15 @@ try int indexOf = paramContent.indexOf( "java version : " + javaVersion + "" ); if ( indexOf < 0) { - System.err.println( "index.jsp not contains java version : " + javaVersion + "" ); - return false; + System.err.println( "index.jsp not contains java version : " + javaVersion + "" ); + return false; } indexOf = paramContent.indexOf("okitworks"); if ( indexOf < 0) { - System.err.println( "index.jsp not contains okitworks" ); - return false; + System.err.println( "index.jsp not contains okitworks" ); + return false; } } Modified: maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/parent/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/parent/pom.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/parent/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/parent/pom.xml Sat Aug 14 21:49:10 2010 @@ -18,8 +18,8 @@ specific language governing permissions under the License. --> + 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"> 4.0.0 Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml Sat Aug 14 21:49:10 2010 @@ -24,7 +24,7 @@ under the License. maven-war-plugin - + ${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml Sat Aug 14 21:49:10 2010 @@ -35,7 +35,7 @@ under the License. 2.0 - + Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml Sat Aug 14 21:49:10 2010 @@ -24,13 +24,13 @@ under the License. maven-war-plugin - + ${basedir}/target/test-classes/unit/manifest/manifest-with-main-class/src/main - - - org.dummy.test.SomeClass - - + + + org.dummy.test.SomeClass + + Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/not-primary-artifact.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/not-primary-artifact.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/not-primary-artifact.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/not-primary-artifact.xml Sat Aug 14 21:49:10 2010 @@ -24,7 +24,7 @@ under the License. maven-war-plugin - false + false Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/plugin-config-primary-artifact.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/plugin-config-primary-artifact.xml?rev=985586&r1=985585&r2=985586&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/plugin-config-primary-artifact.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warmojotest/plugin-config-primary-artifact.xml Sat Aug 14 21:49:10 2010 @@ -24,7 +24,7 @@ under the License. maven-war-plugin - true + true