Skip to content

Feature/myfaces 4456 - New faces.js codebase (target 4.0.0 RC3) #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
werpu wants to merge 34 commits into from
Closed

Feature/myfaces 4456 - New faces.js codebase (target 4.0.0 RC3) #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c392c68
MYFACES-4466: Adding latest script version
werpu Sep 26, 2022
71807df
MYFACES-4466: Adding latest script version
werpu Sep 29, 2022
314c2ad
Merge remote-tracking branch 'myfaces_gitlab/main' into feature/MYFAC…
werpu Sep 29, 2022
f91f493
Merge remote-tracking branch 'myfaces_gitlab/main' into feature/MYFAC…
werpu Sep 29, 2022
4fd91ce
MYFACES-4468: Implement selectItemGroup (#326)
volosied Oct 4, 2022
b185dcf
Update myfaces-ci.yml
tandraschko Oct 4, 2022
9b7680a
fixed build
tandraschko Oct 4, 2022
9dbd455
MYFACES-4471
tandraschko Oct 4, 2022
a4ef26d
Correct COMPONENT_FAMILY string for _UISelectItemGroups
volosied Oct 5, 2022
0403f2e
MYFACES-4447: avoid UnsupportedOperationException
pnicolucci Oct 6, 2022
137670f
MYFACES-4459 Update imports javax -> jakarta
volosied Oct 3, 2022
bcbd68c
Update EE depdendencies to latest
volosied Oct 4, 2022
6015fd4
Downgrade org.apache.felix:maven-bundle-plugin to 4.0.0 to avoid miss…
volosied Oct 4, 2022
4de8047
Add versions to imports; remove jsp/jstl imports from bundle pom
volosied Oct 4, 2022
b11c3fe
MYFACES-4474: remove setType validation
pnicolucci Oct 6, 2022
1c317e9
MYFACES-4476: updating to the latest jsf_js.ts codebase
werpu Oct 11, 2022
a615762
MYFACES-4456: fixing checkstyle violation, and remove style warnings
werpu Oct 12, 2022
d5bb9e8
MYFACES-4456: fixing a build issue in the server maven build
werpu Oct 12, 2022
bb0500d
Merge branch 'main' into feature/MYFACES-4456
werpu Oct 12, 2022
5ccfef9
MYFACES-4456: fixing a build issue in the server maven build
werpu Oct 12, 2022
e7d06b9
MYFACES-4456: fixing a build issue in the server maven build
werpu Oct 12, 2022
9dd90a1
Merge branch 'main' into feature/MYFACES-4456
werpu Oct 12, 2022
bcf861c
https://issues.apache.org/jira/projects/MYFACES/issues/MYFACES-4479
werpu Oct 14, 2022
a3f95f8
https://issues.apache.org/jira/browse/MYFACES-4479: updating the
werpu Oct 14, 2022
abfdabc
https://issues.apache.org/jira/browse/MYFACES-4456:
werpu Oct 17, 2022
14d7841
https://issues.apache.org/jira/browse/MYFACES-4456:
werpu Oct 18, 2022
60a1bf2
MYFACES-4480: Fix NullPointerException in TagAttributeImpl#getBoolean
volosied Oct 14, 2022
9ace74a
MYFACES-4484: Add forward slash to composite namespace
volosied Oct 17, 2022
5b67cce
MYFACES-4466: Adding latest script version
werpu Sep 29, 2022
1320320
Merge remote-tracking branch 'origin/main' into feature/MYFACES-4456
werpu Oct 18, 2022
ce68e40
https://issues.apache.org/jira/browse/MYFACES-4456: downstreaming a f…
werpu Oct 19, 2022
612c37a
https://issues.apache.org/jira/browse/MYFACES-4466: downstreaming a f…
werpu Oct 19, 2022
d3ae573
Merge remote-tracking branch 'origin/feature/MYFACES-4456' into featu…
werpu Oct 19, 2022
7f89260
Merge branch 'apache:main' into feature/MYFACES-4456
werpu Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ target
.checkstyle
.DS_Store
.pmd
.eclipse-pmd
.eclipse-pmd
node_modules/
274 changes: 122 additions & 152 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,131 +64,6 @@
</configuration>
</plugin>

<!-- compilation and compression of our javascripts -->
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-javascript-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
<descriptor>${basedir}/src/assembler/jsfscripts-compiler.xml</descriptor>
<excludes>
<exclude>**/myfaces/_impl/core/faces-uncompressed.js</exclude>
</excludes>
</configuration>
</execution>

<execution>
<id>compile-uncompressed-full</id>
<goals>
<goal>compile</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
<descriptor>${basedir}/src/assembler/jsfscripts-uncompressed-full-compiler.xml</descriptor>
<outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
<excludes>
<exclude>**/myfaces/_impl/core/faces-uncompressed.js</exclude>
</excludes>
</configuration>
</execution>

<execution>
<id>compile-minimal</id>
<goals>
<goal>compile</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
<descriptor>${basedir}/src/assembler/jsfscripts-minimal-compiler.xml</descriptor>
<outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
<excludes>
<exclude>**/myfaces/_impl/core/faces-uncompressed.js</exclude>
</excludes>
</configuration>
</execution>

<execution>
<id>compile-i18n</id>
<goals>
<goal>compile</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
<descriptor>${basedir}/src/assembler/jsfscripts-i18n-compiler.xml</descriptor>
<outputDirectory>${basedir}/target/classes/META-INF/resources/myfaces/</outputDirectory>
<excludes>
<exclude>**/myfaces/_impl/core/faces-uncompressed.js</exclude>
</excludes>
</configuration>
</execution>

<execution>
<id>compress</id>
<goals>
<goal>compress</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<scripts>target/classes/META-INF/resources/jakarta.faces/</scripts>
<excludes>
<exclude>faces-uncompressed.js</exclude>
<exclude>faces-uncompressed-full.js</exclude>
</excludes>
<compressor>yahooUI</compressor>
</configuration>
</execution>

<execution>
<id>compress-extended</id>
<goals>
<goal>compress</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<scripts>target/classes/META-INF/resources/myfaces/</scripts>
<excludes>
<exclude>faces-uncompressed.js</exclude>
<exclude>faces-uncompressed-full.js</exclude>
</excludes>
<compressor>yahooUI</compressor>
</configuration>
</execution>

<execution>
<id>compress-alternatives</id>
<goals>
<goal>compress</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<scripts>target/classes/META-INF/internal-resources/jakarta.faces/</scripts>
<excludes>
<exclude>faces-uncompressed-full.js</exclude>
<exclude>META-INF/**/*.js</exclude>
</excludes>
<compressor>yahooUI</compressor>
</configuration>
</execution>
</executions>
<configuration>
<optimizationLevel>0</optimizationLevel>
<sourceDirectory>src/main/javascript</sourceDirectory>
<webappDirectory>${basedir}</webappDirectory>
<outputDirectory>${basedir}/target/classes/META-INF/resources/jakarta.faces/</outputDirectory>
</configuration>
</plugin>


<!-- we want to use the test cases also in myfacse-impl, thus creating a test-jar -->
<plugin>
Expand Down Expand Up @@ -323,8 +198,96 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>

<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/README.md</exclude>
<exclude>**/*/MANIFEST.MF</exclude>
<exclude>**/*.iml</exclude>
<exclude>src/main/resources/META-INF/licenses/*-LICENSE.txt</exclude>
<exclude>src/main/resources/META-INF/licenses/*-LICENSE.TXT</exclude>
<exclude>src/main/resources/META-INF/services/**</exclude>
<exclude>.git</exclude>
<exclude>.gitignore</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/dist/**/*</exclude>
<!-- node modules is only used by the build -->
<exclude>**/node_modules/**/*</exclude>
<exclude>**/client/**/*.md</exclude>
<exclude>**/client/package*.json</exclude>
<exclude>**/client/**/*.js.map</exclude>
<exclude>**/client/typescript/**/*.js</exclude>
<exclude>**/client/**/.mocharc.json</exclude>

<exclude>src/client/webpack.config.js</exclude>
<exclude>DEPENDENCIES</exclude>
</excludes>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<!-- Use the latest released version:
https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
<configuration>
<nodeVersion>v16.13.1</nodeVersion>
<npmVersion>8.1.2</npmVersion>
<installDirectory>./target/node</installDirectory>
<workingDirectory>src/client</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
</execution>
<execution>
<id>npm install</id>
<phase>generate-resources</phase>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run build</arguments>
</configuration>
</execution>
<execution>
<id>npm run test</id>
<goals>
<goal>npm</goal>
</goals>
<phase>test</phase>
<configuration>
<arguments>run test</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>


Expand Down Expand Up @@ -354,19 +317,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-jsdoc-plugin</artifactId>
<version>1.0-beta-1</version>
<executions>
<execution>
<id>attach-jsdoc</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down Expand Up @@ -429,19 +379,39 @@
<id>generateJsDoc</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-jsdoc-plugin</artifactId>
<version>1.0-beta-1</version>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>jsdoc</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<!-- Use the latest released version:
https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
<configuration>
<nodeVersion>v16.13.1</nodeVersion>
<npmVersion>8.1.2</npmVersion>
<installDirectory>./target/node</installDirectory>
<workingDirectory>src/client</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
</execution>

<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run doc</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
60 changes: 0 additions & 60 deletions api/src/assembler/jsdoc-compiler.xml
View file
Open in desktop

This file was deleted.

Loading