geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r695660 - /geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
Date Mon, 15 Sep 2008 22:11:18 GMT
Author: jbohn
Date: Mon Sep 15 15:11:18 2008
New Revision: 695660

URL: http://svn.apache.org/viewvc?rev=695660&view=rev
Log:
merge 695627 from branches/2.1 - remove generated html under the /src/ tree after the build
has included it in the target war

Modified:
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml?rev=695660&r1=695659&r2=695660&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml Mon Sep 15 15:11:18
2008
@@ -40,7 +40,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>test-resources</id>
+                        <id>generate-source-html</id>
                         <phase>generate-test-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -130,6 +130,37 @@
                             </tasks>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>remove-source-html</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!-- Remove sources for examples from /src - they have
already been included in the war -->
+                                <echo>Remove view source html files based on .java
and .jsp files from src</echo>
+                                <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                                <echo message="plugin classpath:  ${plugin_classpath}"/>
+                                <delete>
+                                    <fileset dir="src/main/webapp/jsp2/simpletag"
+                                        includes="**/*.java.html"/>
+                                    <fileset dir="src/main/webapp/jsp2/jspattribute"
+                                        includes="**/*.java.html"/>
+                                    <fileset dir="src/main/webapp/cal"
+                                        includes="**/*.java.html"/>
+                                    <fileset dir="src/main/webapp/jsptoserv"
+                                        includes="**/*.java.html"/>
+                                    <fileset dir="src/main/webapp/jsp2/misc"
+                                        includes="**/*.java.html"/>
+                                    <fileset dir="src/main/webapp/jsp2/tagfiles"
+                                        includes="**/*.tag.html"/>
+                                    <fileset dir="src/main/webapp"
+                                        includes="**/*.jsp.html,**/*.jspx.html,**/*.jspf.html"/>
+                                </delete>
+                            </tasks>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>



Mime
View raw message