Skip to content

Commit

Permalink
Merge pull request #1974 from jakartaee/mojarra_issue_5398_move_vdldo…
Browse files Browse the repository at this point in the history 
…c_and_renderkitdoc_to_faces_project

Mojarra issue 5398 move vdldoc and renderkitdoc to faces project
  • Loading branch information
@BalusC
BalusC authored Sep 19, 2024
2 parents 6169574 + 7a36a3c commit 82e0bb5
Show file tree
Hide file tree
Showing 18 changed files with 31,909 additions and 1,388 deletions.
40 changes: 19 additions & 21 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,6 @@
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>META-INF/README</exclude>
<exclude>${findbugs.exclude}</exclude>
</excludes>
</resource>
</resources>

Expand Down Expand Up @@ -449,6 +445,8 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugins>
<!-- Create JS docs -->
<!-- result will be saved in /src/main/resources/META-INF/resources/META-INF/resources/jakarta.faces/out -->
<!-- TODO: this unfortunately only works in Mojarra project! We need to split faces-uncompressed.js into API+impl but that's only possible with TypeScript. -->
<!--
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
Expand Down Expand Up @@ -476,7 +474,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install --save-dev jsdoc</arguments>
<arguments>install -D jsdoc</arguments>
</configuration>
</execution>
Expand All @@ -487,7 +485,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>init --force --yes</arguments>
<arguments>init -f -y</arguments>
</configuration>
</execution>
Expand All @@ -514,7 +512,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</execution>
</executions>
</plugin>

-->

<!-- Create Renderkit docs -->
<!-- Result will be saved in /target/renderkitdoc -->
Expand All @@ -532,11 +530,11 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</execution>
</executions>
<configuration>
<facesConfig>${project.basedir}/src/main/resources/com/sun/faces/standard-html-renderkit.xml</facesConfig>
<schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
<facesConfig>${project.basedir}/src/main/renderkitdoc/standard-html-renderkit.xml</facesConfig>
<schemaDirectory>${project.basedir}/src/main/xsd</schemaDirectory>
</configuration>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
Expand All @@ -551,7 +549,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<configuration>
<resources>
<resource>
<directory>src/main/renderkitdoc</directory>
<directory>src/main/renderkitdoc/resources</directory>
</resource>
</resources>
<outputDirectory>${project.build.directory}/renderkitdoc</outputDirectory>
Expand All @@ -568,7 +566,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<configuration>
<resources>
<resource>
<directory>src/main/vdldoc</directory>
<directory>src/main/vdldoc/resources</directory>
</resource>
</resources>
<outputDirectory>${project.build.directory}/vdldoc</outputDirectory>
Expand Down Expand Up @@ -607,21 +605,21 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<argument>-css</argument>
<argument>faces-api.css</argument>
<argument>-f</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.facelets.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.core.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.html.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.passthrough.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/faces.composite.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/tags.core.taglib.xml</argument>
<argument>src/main/resources/com/sun/faces/metadata/taglib/tags.functions.taglib.xml</argument>
<argument>src/main/vdldoc/faces.taglib.xml</argument>
<argument>src/main/vdldoc/faces.facelets.taglib.xml</argument>
<argument>src/main/vdldoc/faces.core.taglib.xml</argument>
<argument>src/main/vdldoc/faces.html.taglib.xml</argument>
<argument>src/main/vdldoc/faces.passthrough.taglib.xml</argument>
<argument>src/main/vdldoc/faces.composite.taglib.xml</argument>
<argument>src/main/vdldoc/tags.core.taglib.xml</argument>
<argument>src/main/vdldoc/tags.functions.taglib.xml</argument>
</arguments>
</configuration>
<dependencies>
<dependency>
<groupId>org.omnifaces</groupId>
<artifactId>vdldoc</artifactId>
<version>3.1</version>
<version>3.2</version>
</dependency>
</dependencies>
</plugin>
Expand Down
0 api/src/main/renderkitdoc/stylesheet.css → ...ain/renderkitdoc/resources/stylesheet.css
View file
File renamed without changes.
Loading

0 comments on commit 82e0bb5

Please sign in to comment.