Author: snicoll
Date: Tue Feb 5 22:03:48 2008
New Revision: 618905
URL: http://svn.apache.org/viewvc?rev=618905&view=rev
Log:
MWAR-139: Added IT to reproduce the issue.
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/ (with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 5 22:03:48 2008
@@ -0,0 +1,2 @@
+build.log
+target
Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml?rev=618905&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/pom.xml Tue Feb 5
22:03:48 2008
@@ -0,0 +1,48 @@
+<?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: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='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>testwar</groupId>
+ <artifactId>MWAR-139</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>MWAR-139 Maven Webapp</name>
+ <url>http://maven.apache.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <warSourceDirectory>src/main/webapp</warSourceDirectory>
+ <webResources>
+ <resource>
+ <directory>src/main/webresources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml?rev=618905&view=auto
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml
(added)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml
Tue Feb 5 22:03:48 2008
@@ -0,0 +1,24 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd"; >
+<!--
+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.
+-->
+<web-app>
+ <display-name>Archetype Created Web Application</display-name>
+</web-app>
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml?rev=618905&view=auto
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml
(added)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/src/main/webresources/filterme.xml
Tue Feb 5 22:03:48 2008
@@ -0,0 +1,4 @@
+<foo>
+ <text>${foo.url}</text>
+ <text> hallo @@ hallo</text>
+</foo>
Added: 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=618905&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-139/verify.bsh Tue Feb 5
22:03:48 2008
@@ -0,0 +1,66 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File webappDirectory = new File( target, "MWAR-139-1.0-SNAPSHOT" );
+ if ( !webappDirectory.exists() || !webappDirectory.isDirectory() )
+ {
+ System.err.println( "webappDirectory is missing or not a directory." );
+ return false;
+ }
+
+ File param = new File ( webappDirectory, "filterme.xml" );
+ if ( !param.exists() || param.isDirectory() )
+ {
+ System.err.println( "filterme.xml file is missing or a directory." );
+ return false;
+ }
+ /* TODO - Uncomment to reproduce
+ FileInputStream fis = new FileInputStream ( param );
+ String paramContent = IOUtil.toString ( fis );
+
+ int indexOf = paramContent.indexOf( "@@" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "filterme.xml does not contains @@" );
+ return false;
+ }*/
+
+}
+catch( Throwable e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
