You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by al...@apache.org on 2010/08/14 02:12:20 UTC

svn commit: r985409 - in /myfaces/gsoc/html5-comp-lib/trunk: html5-comp-lib-core/pom.xml myfaces-shared-html5/ pom.xml

Author: aliok
Date: Sat Aug 14 00:12:19 2010
New Revision: 985409

URL: http://svn.apache.org/viewvc?rev=985409&view=rev
Log:
Html5- Moving project site generation -back- to site phase

Modified:
    myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/pom.xml
    myfaces/gsoc/html5-comp-lib/trunk/myfaces-shared-html5/   (props changed)
    myfaces/gsoc/html5-comp-lib/trunk/pom.xml

Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/pom.xml?rev=985409&r1=985408&r2=985409&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/pom.xml (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/pom.xml Sat Aug 14 00:12:19 2010
@@ -178,8 +178,7 @@
                                 <shortname>hx</shortname>
                                 <uri>http://myfaces.apache.org/html5/html</uri>
                                 <displayname>HTML5 Html Comp Lib.</displayname>
-                                <description>HTML5 Html component
-                                    library for MyFaces.</description>
+                                <description>HTML5 Html component library for MyFaces.</description>
                             </params>
                             <modelIds>
                                 <modelId>html5-comp-lib-core</modelId>
@@ -224,8 +223,7 @@
                                 <shortname>fx</shortname>
                                 <uri>http://myfaces.apache.org/html5/core</uri>
                                 <displayname>HTML5 Core Comp Lib.</displayname>
-                                <description>HTML5 core component
-                                    library for MyFaces.</description>
+                                <description>HTML5 core component library for MyFaces.</description>
                             </params>
                             <modelIds>
                                 <modelId>html5-comp-lib-core</modelId>
@@ -256,62 +254,115 @@
                             <goal>make-config</goal>
                         </goals>
                     </execution>
-
-                    <execution>
-                        <id>generate-hx-tagdoc-content</id>
-                        <configuration>
-                            <metadataFile>META-INF/myfaces-html5-metadata.xml</metadataFile>
-                            <params>
-                                <shortname>hx</shortname>
-                                <uri>http://myfaces.apache.org/html5/html</uri>
-                            </params>
-                            <modelIds>
-                                <modelId>html5-comp-lib-core</modelId>
-                            </modelIds>
-                        </configuration>
-                        <goals>
-                            <goal>tagdoc-content</goal>
-                        </goals>
-                    </execution>
-
                 </executions>
             </plugin>
         </plugins>
     </build>   
 
     <profiles>
-            <profile>
-      <!--
-        - Whenever the facelets doc will be generated, need to use the command
-        -   mvn -Pgenerate-site install
-        -->
-      <id>generate-site</id>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- Facelets doc generation is on install phashe for now!. -->
-            <groupId>net.sourceforge.maven-taglib</groupId>
-            <artifactId>maven-taglib-plugin</artifactId>
-            <version>2.4</version>
-            <executions>
-               <execution>
-                    <id>tlddoc-facelets</id>
-                    <phase>install</phase>
-                    <goals>
-                      <goal>taglibdoc</goal>
-                    </goals>
-                    <inherited>false</inherited>
-                    <configuration>
-                      <title>${project.name} Tag library documentation for Facelets</title>
-                      <srcDir>${basedir}/target/tlddoc-facelets</srcDir>
-                      <tldDocDir>${basedir}/target/site/tlddoc-facelets</tldDocDir>
-                    </configuration>
-                </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+        <profile>
+            <!--
+            - Whenever the facelets doc will be generated, need to use the command
+            -   mvn -Pgenerate-site site
+            -->
+            <id>generate-site</id>
+            <build>
+                <plugins>
+                    <!-- 
+                        -Executions on this plugin is necessary to generate facelets tag doc. 
+                        -Running the install and site with generate-site profile fails since these executions is run already on install phase!
+                        -So, for facelets documentation, only need to run site goal!
+                    -->
+                    <plugin>
+                        <groupId>org.apache.myfaces.buildtools</groupId>
+                        <artifactId>myfaces-builder-plugin</artifactId>
+                        <version>1.0.6</version>
+                        <executions>
+                            <!-- first, build metadata. facelets tag documentation will be generated from this. -->
+                            <execution>
+                                <id>build-html5-metadata-forsite</id>
+                                <phase>site</phase>
+                                <goals>
+                                    <goal>build-metadata</goal>
+                                </goals>
+                                <configuration>
+                                    <outputFile>META-INF/myfaces-html5-metadata.xml</outputFile>
+                                </configuration>
+                            </execution>
+                            <!-- generate <hx> JSP tld file -->
+                            <execution>
+                                <id>make-html5-hx-tld-forsite</id>
+                                <phase>site</phase>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
+                                    <xmlFile>META-INF/html5-hx.tld</xmlFile>
+                                    <xmlBaseFile>src/main/resources/META-INF/jsp-tld-base.tld</xmlBaseFile>
+                                    <templateFile>jsp-tld.vm</templateFile>
+                                    <metadataFile>META-INF/myfaces-html5-metadata.xml</metadataFile>
+                                    <params>
+                                        <shortname>hx</shortname>
+                                        <uri>http://myfaces.apache.org/html5/html</uri>
+                                        <displayname>HTML5 Html Comp Lib.</displayname>
+                                        <description>HTML5 Html component library for MyFaces.</description>
+                                    </params>
+                                    <modelIds>
+                                        <modelId>html5-comp-lib-core</modelId>
+                                    </modelIds>
+                                </configuration>
+                                <goals>
+                                    <goal>make-config</goal>
+                                </goals>
+                            </execution>
+                            <!-- generate <fx> JSP tld file -->
+                            <execution>
+                                <id>make-html5-fx-tld-forsite</id>
+                                <phase>site</phase>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
+                                    <xmlFile>META-INF/html5-fx.tld</xmlFile>
+                                    <xmlBaseFile>src/main/resources/META-INF/jsp-tld-base.tld</xmlBaseFile>
+                                    <templateFile>jsp-tld.vm</templateFile>
+                                    <metadataFile>META-INF/myfaces-html5-metadata.xml</metadataFile>
+                                    <params>
+                                        <shortname>fx</shortname>
+                                        <uri>http://myfaces.apache.org/html5/core</uri>
+                                        <displayname>HTML5 Core Comp Lib.</displayname>
+                                        <description>HTML5 core component library for MyFaces.</description>
+                                    </params>
+                                    <modelIds>
+                                        <modelId>html5-comp-lib-core</modelId>
+                                    </modelIds>
+                                </configuration>
+                                <goals>
+                                    <goal>make-config</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Facelets doc generation! -->
+                    <plugin>
+                        <groupId>net.sourceforge.maven-taglib</groupId>
+                        <artifactId>maven-taglib-plugin</artifactId>
+                        <version>2.4</version>
+                        <executions>
+                            <execution>
+                                <id>tlddoc-facelets</id>
+                                <phase>site</phase>
+                                <goals>
+                                    <goal>taglibdoc</goal>
+                                </goals>
+                                <inherited>false</inherited>
+                                <configuration>
+                                    <title>${project.name} Tag library documentation for Facelets</title>
+                                    <srcDir>${basedir}/target/tlddoc-facelets</srcDir>
+                                    <tldDocDir>${basedir}/target/site/tlddoc-facelets</tldDocDir>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file

Propchange: myfaces/gsoc/html5-comp-lib/trunk/myfaces-shared-html5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 14 00:12:19 2010
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+META-INF

Modified: myfaces/gsoc/html5-comp-lib/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/pom.xml?rev=985409&r1=985408&r2=985409&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/pom.xml (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/pom.xml Sat Aug 14 00:12:19 2010
@@ -154,51 +154,51 @@
     </build>
     
     <profiles>
-            <profile>
-      <!--
-        - Whenever the facelets doc will be generated, need to use the command
-        -   mvn -Pgenerate-site install
-        -->
-      <id>generate-site</id>
-      <build>
-        <plugins>
-          <plugin>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>2.0-beta-6</version>
-            </plugin>
-        </plugins>
-      </build>
-        <reporting>
+        <profile>
+            <!--
+            - Whenever the site will be generated, need to use the command
+            -   mvn -Pgenerate-site site
+            -->
+            <id>generate-site</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <!-- this plugin will generate the project site. -->
+                        <artifactId>maven-site-plugin</artifactId>
+                        <version>2.0-beta-6</version>
+                    </plugin>
+                </plugins>
+            </build>
+            <reporting>
             <plugins>
-              <plugin>
+                <plugin>
+                    <!-- disable the plugin for this site project -->
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>2.2</version>
+                    <reportSets>
+                        <reportSet />
+                    </reportSets>
+                </plugin>
+                <plugin>
                 <!-- disable the plugin for this site project -->
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.2</version>
-                <reportSets>
-                  <reportSet />
-                </reportSets>
-              </plugin>
-              <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <version>1.2</version>
+                    <reportSets>
+                        <reportSet />
+                    </reportSets>
+                </plugin>
+                <plugin>
                 <!-- disable the plugin for this site project -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>1.2</version>
-                <reportSets>
-                  <reportSet />
-                </reportSets>
-              </plugin>
-              <plugin>
-                <!-- disable the plugin for this site project -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-1</version>
-                <reportSets>
-                  <reportSet />
-                </reportSets>
-              </plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jdepend-maven-plugin</artifactId>
+                    <version>2.0-beta-1</version>
+                    <reportSets>
+                        <reportSet />
+                    </reportSets>
+                </plugin>
             </plugins>
-            
-          </reporting>
+        </reporting>
     </profile>
     </profiles>