geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r699485 - /geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
Date Fri, 26 Sep 2008 20:20:52 GMT
Author: jbohn
Date: Fri Sep 26 13:20:52 2008
New Revision: 699485

URL: http://svn.apache.org/viewvc?rev=699485&view=rev
Log:
make the window as small as possible for the source corruption caused by the txt2html generated
content - looking now to see if we can put these in generaeted-sources or somewhere so that
the src tree is not corrupted

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

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml?rev=699485&r1=699484&r2=699485&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml Fri Sep 26
13:20:52 2008
@@ -41,7 +41,7 @@
                 <executions>
                     <execution>
                         <id>generate-source-html</id>
-                        <phase>generate-test-resources</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -56,6 +56,7 @@
                                     <fileset dir="src/main/java/jsp2/examples">
                                         <include name="BookBean.java" />
                                     </fileset>
+
                                     <fileset dir="src/main/java/jsp2/examples/simpletag">
                                         <include name="FindBookSimpleTag.java" />
                                         <include name="RepeatSimpleTag.java" />
@@ -65,7 +66,6 @@
                                         <include name="Functions.java" />
                                     </fileset>
                                 </txt2html>
-    
 
                                 <txt2html todir="src/main/webapp/jsp2/jspattribute">
                                     <fileset dir="src/main/java/jsp2/examples">
@@ -77,7 +77,6 @@
                                         <include name="HelloWorldSimpleTag.java" />
                                     </fileset>
                                 </txt2html>
-    
 
                                 <txt2html todir="src/main/webapp/cal">
                                     <fileset dir="src/main/webapp/WEB-INF/classes/cal">
@@ -87,28 +86,24 @@
                                         <include name="TableBean.java" />
                                     </fileset>
                                 </txt2html>
-    
 
                                 <txt2html todir="src/main/webapp/jsptoserv">
                                     <fileset dir="src/main/webapp/WEB-INF/classes">
                                         <include name="servletToJsp.java" />
                                     </fileset>
                                 </txt2html>
-                  
 
                                 <txt2html todir="src/main/webapp/jsp2/misc">
                                     <fileset dir="src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag">
                                         <include name="EchoAttributesTag.java" />
                                     </fileset>
                                 </txt2html>
-    
 
                                 <txt2html todir="src/main/webapp/jsp2/tagfiles">
                                     <fileset dir="src/main/webapp/WEB-INF/tags">
                                         <include name="**/*.tag" />
                                     </fileset>
                                 </txt2html>
-    
 
                                 <txt2html todir="src/main/webapp">
                                     <fileset dir="src/main/webapp">
@@ -128,18 +123,19 @@
                             </tasks>
                         </configuration>
                     </execution>
+
                     <execution>
                         <id>remove-source-html</id>
-                        <phase>pre-integration-test</phase>
+                        <phase>package</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"
/>
@@ -152,6 +148,7 @@
                             </tasks>
                         </configuration>
                     </execution>
+
                 </executions>
             </plugin>
         </plugins>



Mime
View raw message