geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r676044 - in /geronimo/samples/branches/2.1/samples: ./ jsp-examples/jsp-examples-war/ jsp-examples/jsp-examples-war/src/main/webapp/ jsp-examples/jsp-examples-war/src/main/webapp/cal/ jsp-examples/jsp-examples-war/src/main/webapp/checkbox/...
Date Fri, 11 Jul 2008 18:39:23 GMT
Author: linsun
Date: Fri Jul 11 11:39:21 2008
New Revision: 676044

URL: http://svn.apache.org/viewvc?rev=676044&view=rev
Log:
part of GERONIMO-4194 - let's use the sample buildutil to generate the html files for jsp-examples

Removed:
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/Entries.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/Entry.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/JspCalendar.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/TableBean.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/colrs.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/dates/date.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/error/err.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/error/errorpge.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/forward/forward.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/forward/one.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/include/foo.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/include/include.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/Functions.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/basic-arithmetic.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/basic-comparisons.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/functions.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/FooBean.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/ShuffleSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/TileSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/EchoAttributesTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/BookBean.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/FindBookSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/Functions.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/HelloWorldSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/RepeatSimpleTag.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/displayProducts.tag.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/helloWorld.tag.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.tag.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/xhtmlbasic.tag.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/servletToJsp.java.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp.html
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp.html
Modified:
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
    geronimo/samples/branches/2.1/samples/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=676044&r1=676043&r2=676044&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 Jul 11
11:39:21 2008
@@ -32,4 +32,114 @@
     <name>Geronimo Samples :: JSP Examples WAR</name>
     <packaging>war</packaging>
 
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test-resources</id>
+                        <phase>generate-test-resources</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>
+                                <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">
+                                    <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"/>
+                                        <include name="HelloWorldSimpleTag.java"/>
+                                    </fileset>
+                                    <fileset dir="src/main/java/jsp2/examples/el">
+                                        <include name="Functions.java"/>
+                                    </fileset>
+                                </txt2html>
+    
+
+                                <txt2html todir="src/main/webapp/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">
+                                        <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">
+                                        <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">
+                                        <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">
+                                        <include name="**/*.jsp" />
+                                        <include name="**/*.jspx" />
+                                        <include name="**/*.jspf" />
+                                        <exclude name="error/errorpge.jsp"/>
+                                        <exclude name="forward/one.jsp"/>
+                                        <exclude name="include/foo.jsp"/>
+                                        <exclude name="jsptoserv/hello.jsp"/>
+                                        <exclude name="security/protected/error.jsp"/>
+                                        <exclude name="security/protected/index.jsp"/>
+                                        <exclude name="security/protected/login.jsp"/>
+                                        <exclude name="source.jsp"/>
+                                    </fileset>
+                                </txt2html>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>buildutil</artifactId>
+                        <version>${version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=676044&r1=676043&r2=676044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Jul 11 11:39:21 2008
@@ -55,6 +55,7 @@
         <module>sample-datasource</module>
         <module>customer-service</module>
         <module>bank</module>
+        <module>buildutil</module>
         <module>calculator-stateless-pojo</module>
         <module>dbtester</module>
         <module>inventory</module>



Mime
View raw message