maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
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 GMT
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.
 <c:set var="app_mainStyleSheet" value="${app.mainStyleSheet}"/>
 
 <c:if test="${app_version}">
-	<c:set var="app_version" value="X.X.X.X"/>	
+  <c:set var="app_version" value="X.X.X.X"/>
 </c:if>
 <c:if test="${app_mainStyleSheet}">
-	<c:set var="app_mainStyleSheet" value="app_global.css"/>	
+  <c:set var="app_mainStyleSheet" value="app_global.css"/>
 </c:if>
\ 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( "<c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>"
);
     if ( indexOf < 0)
     {
-    	System.err.println( "param.jsp not contains <c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>"
);
-    	return false;
+        System.err.println( "param.jsp not contains <c:set var=\"app_version\" value=\"1.0-SNAPSHOT\"/>"
);
+        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( "<text>hallo @@ hallo</text>" );
     if ( indexOf < 0)
     {
-    	System.err.println( "filterme.xml does not contains <text>hallo @@ hallo</text>"
);
-    	return false;
+        System.err.println( "filterme.xml does not contains <text>hallo @@ hallo</text>"
);
+        return false;
     }
     
-	indexOf = paramContent.indexOf( "<text2>start-${}-end</text2>" );
+    indexOf = paramContent.indexOf( "<text2>start-${}-end</text2>" );
     if ( indexOf < 0)
     {
-    	System.err.println( "filterme.xml does not contains <text2>start-${}-end</text2>"
);
-    	return false;
+        System.err.println( "filterme.xml does not contains <text2>start-${}-end</text2>"
);
+        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 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	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">
+         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">
 
 </web-app>

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 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	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">
+         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">
 
 
 </web-app>

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( "<td>java version : " + javaVersion + "</td>"
);
     if ( indexOf < 0)
     {
-    	System.err.println( "index.jsp not contains <td>java version : " + javaVersion
+ "</td>" );
-    	return false;
+        System.err.println( "index.jsp not contains <td>java version : " + javaVersion
+ "</td>" );
+        return false;
     }
     
     indexOf = paramContent.indexOf("<td>okitworks</td>");
     if ( indexOf < 0)
     {
-    	System.err.println( "index.jsp not contains <td>okitworks</td>" );
-    	return false;
+        System.err.println( "index.jsp not contains <td>okitworks</td>" );
+        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.
 -->
 <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">
+         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>
 

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.
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-		  <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub" />
+          <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"
/>
           <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main</warSourceDirectory>
         </configuration>
       </plugin>

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.
             </manifest>
             <manifestEntries>
               <Custom-Version>2.0</Custom-Version>
-	        </manifestEntries>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>

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.
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-		  <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"
/>
+          <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"
/>
           <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/manifest-with-main-class/src/main</warSourceDirectory>
-		  <archive>
-		    <manifest>
-			  <mainClass>org.dummy.test.SomeClass</mainClass>
-			</manifest>
-		  </archive>
+          <archive>
+            <manifest>
+              <mainClass>org.dummy.test.SomeClass</mainClass>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

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.
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-        	  <primaryArtifact>false</primaryArtifact>
+          <primaryArtifact>false</primaryArtifact>
         </configuration>
       </plugin>
     </plugins>

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.
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-        	  <primaryArtifact>true</primaryArtifact>
+          <primaryArtifact>true</primaryArtifact>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message