You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/01/14 16:14:39 UTC

svn commit: r369033 - in /myfaces/sandbox/trunk: sandbox-assembly/ sandbox-assembly/src/main/assembly/ sandbox/ sandbox/src/main/tld/entities/ sandbox/src/main/tld/misc/

Author: bommel
Date: Sat Jan 14 07:14:29 2006
New Revision: 369033

URL: http://svn.apache.org/viewcvs?rev=369033&view=rev
Log:
added javadoc for assembly generate javadoc artifact with profile generate-assembly mvn -Pgenerate-assembly
added separate xsl for generate separate tld for the tlddoc
added tlddoc to site enable with profile generate-site mvn -Pgenerate-site
fixed missing java.lang in type of some attributes.xml in sandbox

Added:
    myfaces/sandbox/trunk/sandbox/src/main/tld/misc/resolve_entities-tlddoc.xsl
Modified:
    myfaces/sandbox/trunk/sandbox-assembly/pom.xml
    myfaces/sandbox/trunk/sandbox-assembly/src/main/assembly/dep.xml
    myfaces/sandbox/trunk/sandbox/pom.xml
    myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_planner_attributes.xml
    myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_schedule_attributes.xml
    myfaces/sandbox/trunk/sandbox/src/main/tld/entities/ui_schedule_attributes.xml

Modified: myfaces/sandbox/trunk/sandbox-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox-assembly/pom.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox-assembly/pom.xml (original)
+++ myfaces/sandbox/trunk/sandbox-assembly/pom.xml Sat Jan 14 07:14:29 2006
@@ -21,6 +21,53 @@
     <plugins>
 
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>dependency-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-javadoc</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.myfaces</groupId>
+                  <artifactId>sandbox</artifactId>
+                  <version>${version}</version>
+                  <classifier>javadoc</classifier>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+            </configuration>
+          </execution>
+
+          <!--execution>
+            <id>copy-tlddoc</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+
+                <artifactItem>
+                  <groupId>org.apache.myfaces</groupId>
+                  <artifactId>sandbox</artifactId>
+                  <version>${version}</version>
+                  <classifier>tlddoc</classifier>
+                </artifactItem>
+
+               </artifactItems>
+               <outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
+             </configuration>
+           </execution-->
+
+        </executions>
+      </plugin>
+
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.0-beta-1</version>
         <configuration>

Modified: myfaces/sandbox/trunk/sandbox-assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox-assembly/src/main/assembly/dep.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox-assembly/src/main/assembly/dep.xml (original)
+++ myfaces/sandbox/trunk/sandbox-assembly/src/main/assembly/dep.xml Sat Jan 14 07:14:29 2006
@@ -21,5 +21,19 @@
         <include>NOTICE*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>target/javadoc</directory>
+      <outputDirectory>javadoc</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <!--fileSet>
+      <directory>target/tlddoc</directory>
+      <outputDirectory>tlddoc</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet-->
   </fileSets>
 </assembly>

Modified: myfaces/sandbox/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/pom.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox/pom.xml (original)
+++ myfaces/sandbox/trunk/sandbox/pom.xml Sat Jan 14 07:14:29 2006
@@ -125,5 +125,76 @@
     </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>generate-site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xslt-maven-plugin</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <configuration>
+              <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
+              <srcIncludes>**/*.tld</srcIncludes>
+              <srcDir>src/main/tld</srcDir>
+              <destDir>target/tlddoc-site</destDir>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>transform</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+
+      </build>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>net.sourceforge.maven-taglib</groupId>
+            <artifactId>maven-taglib-plugin</artifactId>
+            <configuration>
+              <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
+              <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+    <profile>
+      <id>generate-assembly</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-javadoc-plugin</artifactId>
+             <executions>
+               <execution>
+                 <id>attach-javadoc</id>
+                 <goals><goal>jar</goal></goals>
+               </execution>
+             </executions>
+           </plugin>
+           <!--plugin>
+             <groupId>net.sourceforge.maven-taglib</groupId>
+             <artifactId>maven-taglib-plugin</artifactId>
+             <configuration>
+               <taglib.src.dir>${basedir}/target/classes/META-INF</taglib.src.dir>
+               <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+             </configuration>
+             <executions>
+               <execution>
+                 <id>attach-javadoc</id>
+                 <goals><goal>taglibdocjar</goal></goals>
+               </execution>
+             </executions>
+           </plugin-->
+         </plugins>
+       </build>
+     </profile>
+   </profiles>
 
 </project>

Modified: myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_planner_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_planner_attributes.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_planner_attributes.xml (original)
+++ myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_planner_attributes.xml Sat Jan 14 07:14:29 2006
@@ -1,36 +1,36 @@
-    <attribute>
+      <attribute>
          <name>gutterWidthInPixels</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Integer</type>
+         <type>java.lang.Integer</type>
       </attribute>
       <attribute>
          <name>headerDateFormat</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>String</type>
+         <type>java.lang.String</type>
       </attribute>
       <attribute>
          <name>legend</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Boolean</type>
+         <type>java.lang.Boolean</type>
       </attribute>
       <attribute>
          <name>theme</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>String</type>
+         <type>java.lang.String</type>
       </attribute>
       <attribute>
          <name>tooltip</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Boolean</type>
+         <type>java.lang.Boolean</type>
       </attribute>
       <attribute>
          <name>value</name>
          <required>true</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>String</type>
+         <type>java.lang.String</type>
       </attribute>

Modified: myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_schedule_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_schedule_attributes.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_schedule_attributes.xml (original)
+++ myfaces/sandbox/trunk/sandbox/src/main/tld/entities/html_schedule_attributes.xml Sat Jan 14 07:14:29 2006
@@ -1,180 +1,180 @@
-	<attribute>
-		<name>compactMonthRowHeight</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>Integer</type>
-	</attribute>
-	<attribute>
-		<name>compactWeekRowHeight</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>Integer</type>
-	</attribute>
-	<attribute>
-		<name>headerDateFormat</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>readonly</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>Boolean</type>
-	</attribute>
-	<attribute>
-		<name>theme</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>tooltip</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>Boolean</type>
-	</attribute>
-	<attribute>
-		<name>columnClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>backgroundClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>freeClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>evenClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>unevenClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>gutterClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>headerClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>dateClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>holidayClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>hoursClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>minutesClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>selectedEntryClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>textClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>titleClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>subtitleClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>entryClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>foregroundClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>dayClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>inactiveDayClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>contentClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>selectedClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>monthClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>weekClass</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
-	<attribute>
-		<name>entryRenderer</name>
-		<required>false</required>
-		<rtexprvalue>false</rtexprvalue>
-		<type>String</type>
-	</attribute>
+      <attribute>
+         <name>compactMonthRowHeight</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.Integer</type>
+      </attribute>
+      <attribute>
+         <name>compactWeekRowHeight</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.Integer</type>
+      </attribute>
+      <attribute>
+         <name>headerDateFormat</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+         <name>readonly</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.Boolean</type>
+      </attribute>
+      <attribute>
+         <name>theme</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.Boolean</type>
+      </attribute>
+      <attribute>
+        <name>columnClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>backgroundClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>freeClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>evenClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>unevenClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>gutterClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>headerClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>dateClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>holidayClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>hoursClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>minutesClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>selectedEntryClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>textClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>titleClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>subtitleClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>entryClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>foregroundClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>dayClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>inactiveDayClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>contentClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+       <type>java.lang.String</type>
+      </attribute>
+      <attribute>
+        <name>selectedClass</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+        <type>java.lang.String</type>
+       </attribute>
+       <attribute>
+         <name>monthClass</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.String</type>
+       </attribute>
+       <attribute>
+         <name>weekClass</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.String</type>
+       </attribute>
+       <attribute>
+         <name>entryRenderer</name>
+         <required>false</required>
+         <rtexprvalue>false</rtexprvalue>
+         <type>java.lang.String</type>
+        </attribute>

Modified: myfaces/sandbox/trunk/sandbox/src/main/tld/entities/ui_schedule_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/src/main/tld/entities/ui_schedule_attributes.xml?rev=369033&r1=369032&r2=369033&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox/src/main/tld/entities/ui_schedule_attributes.xml (original)
+++ myfaces/sandbox/trunk/sandbox/src/main/tld/entities/ui_schedule_attributes.xml Sat Jan 14 07:14:29 2006
@@ -1,24 +1,24 @@
-    <attribute>
+      <attribute>
          <name>visibleEndHour</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Integer</type>
+         <type>java.lang.Integer</type>
       </attribute>
       <attribute>
          <name>visibleStartHour</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Integer</type>
+         <type>java.lang.Integer</type>
       </attribute>
       <attribute>
          <name>workingEndHour</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Integer</type>
+         <type>java.lang.Integer</type>
       </attribute>
       <attribute>
          <name>workingStartHour</name>
          <required>false</required>
          <rtexprvalue>false</rtexprvalue>
-           <type>Integer</type>
+         <type>java.lang.Integer</type>
       </attribute>

Added: myfaces/sandbox/trunk/sandbox/src/main/tld/misc/resolve_entities-tlddoc.xsl
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/src/main/tld/misc/resolve_entities-tlddoc.xsl?rev=369033&view=auto
==============================================================================
--- myfaces/sandbox/trunk/sandbox/src/main/tld/misc/resolve_entities-tlddoc.xsl (added)
+++ myfaces/sandbox/trunk/sandbox/src/main/tld/misc/resolve_entities-tlddoc.xsl Sat Jan 14 07:14:29 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  - Stylesheet to expand xml entity references inline. 
+  - 
+  -->
+<xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:output method="xml"
+      encoding="ISO-8859-1"
+      doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+      doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
+      indent="yes"/>
+
+  <xsl:template match="*" priority="2">
+    <!-- avoiding copy to get get rid of namespace attribute -->
+    <xsl:element name="{name(.)}">
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>