You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/09/29 15:57:38 UTC
svn commit: r700133 -
/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
Author: jbohn
Date: Mon Sep 29 06:57:37 2008
New Revision: 700133
URL: http://svn.apache.org/viewvc?rev=700133&view=rev
Log:
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/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=700133&r1=700132&r2=700133&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 Mon Sep 29 06:57:37 2008
@@ -41,22 +41,23 @@
<executions>
<execution>
<id>generate-source-html</id>
- <phase>prepare-package</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>
-
<fileset dir="src/main/java/jsp2/examples/simpletag">
<include name="FindBookSimpleTag.java" />
<include name="RepeatSimpleTag.java" />
@@ -67,19 +68,28 @@
</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" />
@@ -87,25 +97,43 @@
</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" />
@@ -123,32 +151,6 @@
</tasks>
</configuration>
</execution>
-
- <execution>
- <id>remove-source-html</id>
- <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>
- <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>