Author: lofwyr
Date: Thu Dec 1 15:21:50 2016
New Revision: 1772227
URL: http://svn.apache.org/viewvc?rev=1772227&view=rev
Log:
TOBAGO-1634 Generated TLD doc is empty
* TLD is now generated from tobago.taglib.xml
* add ID to tobago.taglib.xml for TLD generation
[developed by hnoeth]
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1772227&r1=1772226&r2=1772227&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Thu Dec 1 15:21:50 2016
@@ -877,9 +877,9 @@
<version>1.8</version>
</plugin>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- <version>2.4</version>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
+ <version>1.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1772227&r1=1772226&r2=1772227&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Thu Dec 1 15:21:50 2016
@@ -127,12 +127,18 @@
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
<configuration>
- <taglib.src.dir>${project.build.directory}/generated</taglib.src.dir>
- <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
- <parseHtml>true</parseHtml>
+ <destDir>tlddoc</destDir>
+ <documentTitle>Tag Library Documentation</documentTitle>
+ <excludes>
+ <exclude>target/classes/**</exclude>
+ </excludes>
+ <includes>
+ <include>target/generated/META-INF/tobago.taglib.xml</include>
+ </includes>
+ <reportOutputDirectory>target</reportOutputDirectory>
</configuration>
</plugin>
@@ -141,6 +147,11 @@
<dependencies>
<dependency>
+ <groupId>org.omnifaces</groupId>
+ <artifactId>vdldoc</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<optional>true</optional>
@@ -204,16 +215,26 @@
<build>
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
<configuration>
- <taglib.src.dir>${project.build.directory}/generated</taglib.src.dir>
- <tldDocDir>${project.build.directory}/tlddoc</tldDocDir>
+ <destDir>tlddoc</destDir>
+ <documentTitle>Tag Library Documentation</documentTitle>
+ <excludes>
+ <exclude>target/classes/**</exclude>
+ </excludes>
+ <includes>
+ <include>target/generated/META-INF/tobago.taglib.xml</include>
+ </includes>
+ <reportOutputDirectory>target</reportOutputDirectory>
</configuration>
<executions>
<execution>
<id>attach-tlddoc</id>
- <goals><goal>taglibdocjar</goal></goals>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>vdldoc</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -226,16 +247,26 @@
<build>
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
<configuration>
- <taglib.src.dir>${project.build.directory}/generated</taglib.src.dir>
- <tldDocDir>${project.build.directory}/tlddoc</tldDocDir>
+ <destDir>tlddoc</destDir>
+ <documentTitle>Tag Library Documentation</documentTitle>
+ <excludes>
+ <exclude>target/classes/**</exclude>
+ </excludes>
+ <includes>
+ <include>target/generated/META-INF/tobago.taglib.xml</include>
+ </includes>
+ <reportOutputDirectory>target</reportOutputDirectory>
</configuration>
<executions>
<execution>
<id>attach-tlddoc</id>
- <goals><goal>taglibdocjar</goal></goals>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>vdldoc</goal>
+ </goals>
</execution>
</executions>
</plugin>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1772227&r1=1772226&r2=1772227&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Thu Dec 1 15:21:50 2016
@@ -186,12 +186,18 @@
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
<configuration>
- <taglib.src.dir>${project.build.directory}/generated</taglib.src.dir>
- <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
- <parseHtml>true</parseHtml>
+ <destDir>tlddoc</destDir>
+ <documentTitle>Tag Library Documentation</documentTitle>
+ <excludes>
+ <exclude>target/classes/**</exclude>
+ </excludes>
+ <includes>
+ <include>target/generated/META-INF/tobago-sandbox.taglib.xml</include>
+ </includes>
+ <reportOutputDirectory>target</reportOutputDirectory>
</configuration>
</plugin>
@@ -240,16 +246,26 @@
<build>
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
+ <groupId>com.github.matinh.vdldoc</groupId>
+ <artifactId>vdldoc-maven-plugin</artifactId>
<configuration>
- <taglib.src.dir>${project.build.directory}/generated</taglib.src.dir>
- <tldDocDir>${project.build.directory}/tlddoc</tldDocDir>
+ <destDir>tlddoc</destDir>
+ <documentTitle>Tag Library Documentation</documentTitle>
+ <excludes>
+ <exclude>target/classes/**</exclude>
+ </excludes>
+ <includes>
+ <include>target/generated/META-INF/tobago.taglib.xml</include>
+ </includes>
+ <reportOutputDirectory>target</reportOutputDirectory>
</configuration>
<executions>
<execution>
<id>attach-tlddoc</id>
- <goals><goal>taglibdocjar</goal></goals>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>vdldoc</goal>
+ </goals>
</execution>
</executions>
</plugin>
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java?rev=1772227&r1=1772226&r2=1772227&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
Thu Dec 1 15:21:50 2016
@@ -111,7 +111,7 @@ public class TaglibGenerator extends Abs
final DocumentBuilder parser = dbf.newDocumentBuilder();
final Document document = parser.newDocument();
- final Element taglib = createTaglib(document);
+ final Element taglib = createTaglib(document, taglibAnnotation);
final String description = processingEnv.getElementUtils().getDocComment(packageElement);
addComment("The next tags are commented because of MYFACES-3537. "
@@ -438,9 +438,10 @@ public class TaglibGenerator extends Abs
parent.appendChild(element);
}
- protected Element createTaglib(final Document document) {
+ protected Element createTaglib(final Document document, Taglib taglibAnnotation) {
final Element taglib;
taglib = document.createElement("facelet-taglib");
+ taglib.setAttribute("id", taglibAnnotation.shortName());
taglib.setAttribute("xmlns", "http://java.sun.com/xml/ns/javaee");
taglib.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
taglib.setAttribute("xsi:schemaLocation",
|