geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r700137 - /geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
Date Mon, 29 Sep 2008 14:27:42 GMT
Author: jbohn
Date: Mon Sep 29 07:27:41 2008
New Revision: 700137

URL: http://svn.apache.org/viewvc?rev=700137&view=rev
Log:
merge 699485 & 700133 from samples/branches/2.1 - GERONIMO-4194 - create html files in
target for war, build html directly from source, remove deletion of html from src repo now
that content is built in target, build src in last possible lifecycle phase prior to package

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=700137&r1=700136&r2=700137&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 29 07:27:41
2008
@@ -41,18 +41,20 @@
                 <executions>
                     <execution>
                         <id>generate-source-html</id>
-                        <phase>generate-test-resources</phase>
+                        <phase>test</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
                                 <!-- Add sources for examples -->
-                                <echo>Generating view source html files based on .java
and .jsp files</echo>
+                                <echo>#### Generating view source html files based
on .java and .jsp files ####</echo>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath"
/>
                                 <echo message="plugin classpath: ${plugin_classpath}"
/>
                                 <taskdef name="txt2html" classname="org.apache.geronimo.samples.buildutil.Txt2Html"
classpath="${plugin_classpath}" />
-                                <txt2html todir="src/main/webapp/jsp2/simpletag">
+
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/simpletag"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/simpletag">
                                     <fileset dir="src/main/java/jsp2/examples">
                                         <include name="BookBean.java" />
                                     </fileset>
@@ -65,52 +67,73 @@
                                         <include name="Functions.java" />
                                     </fileset>
                                 </txt2html>
-    
 
-                                <txt2html todir="src/main/webapp/jsp2/jspattribute">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/el"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/el">
+                                    <fileset dir="src/main/java/jsp2/examples/el">
+                                        <include name="Functions.java" />
+                                    </fileset>
+                                </txt2html>
+
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/jspattribute"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/jspattribute">
                                     <fileset dir="src/main/java/jsp2/examples">
                                         <include name="FooBean.java" />
                                     </fileset>
-                                    <fileset dir="src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag">
+                                    <fileset dir="src/main/java/jsp2/examples/simpletag">
                                         <include name="ShuffleSimpleTag.java" />
                                         <include name="TileSimpleTag.java" />
                                         <include name="HelloWorldSimpleTag.java" />
                                     </fileset>
                                 </txt2html>
-    
 
-                                <txt2html todir="src/main/webapp/cal">
-                                    <fileset dir="src/main/webapp/WEB-INF/classes/cal">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/cal"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/cal">
+                                    <fileset dir="src/main/java/cal">
                                         <include name="Entries.java" />
                                         <include name="Entry.java" />
                                         <include name="JspCalendar.java" />
                                         <include name="TableBean.java" />
                                     </fileset>
                                 </txt2html>
-    
 
-                                <txt2html todir="src/main/webapp/jsptoserv">
-                                    <fileset dir="src/main/webapp/WEB-INF/classes">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsptoserv"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsptoserv">
+                                    <fileset dir="src/main/java">
                                         <include name="servletToJsp.java" />
                                     </fileset>
                                 </txt2html>
-                  
 
-                                <txt2html todir="src/main/webapp/jsp2/misc">
-                                    <fileset dir="src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/misc"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/misc">
+                                    <fileset dir="src/main/java/jsp2/examples/simpletag">
                                         <include name="EchoAttributesTag.java" />
                                     </fileset>
                                 </txt2html>
-    
 
-                                <txt2html todir="src/main/webapp/jsp2/tagfiles">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/tagfiles"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/tagfiles">
                                     <fileset dir="src/main/webapp/WEB-INF/tags">
                                         <include name="**/*.tag" />
                                     </fileset>
                                 </txt2html>
-    
 
-                                <txt2html todir="src/main/webapp">
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/checkbox"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/colors"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/dates"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/error"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/forward"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/include"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/el"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/jsp2/jspx"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/num"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/plugin"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/sessions"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/simpletag"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/snp"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/tagplugin"/>
+                                <mkdir dir="${project.build.directory}/${pom.artifactId}-${pom.version}/xml"/>
+                                <txt2html todir="${project.build.directory}/${pom.artifactId}-${pom.version}">
                                     <fileset dir="src/main/webapp">
                                         <include name="**/*.jsp" />
                                         <include name="**/*.jspx" />
@@ -128,30 +151,6 @@
                             </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