This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new d021d2d1e readded JSF API
d021d2d1e is described below
commit d021d2d1eb0cd0945396019ba42e5e84af081d6c
Author: Thomas Andraschko <[email protected]>
AuthorDate: Thu Mar 30 16:17:30 2023 +0200
readded JSF API
---
deltaspike/modules/jsf/api/pom.xml | 18 +--
.../deltaspike/jsf/api/config/JsfModuleConfig.java | 4 +-
.../deltaspike/jsf/api/config/view/View.java | 2 +-
.../jsf/api/listener/phase/AfterPhase.java | 4 +-
.../jsf/api/listener/phase/BeforePhase.java | 4 +-
.../jsf/api/listener/phase/JsfPhaseId.java | 22 +--
.../jsf/api/listener/phase/JsfPhaseListener.java | 2 +-
.../jsf/spi/scope/window/ClientWindow.java | 4 +-
.../scope/window/DefaultClientWindowConfig.java | 2 +-
.../ValueExpressionEvaluationInputStreamTest.java | 2 +-
deltaspike/modules/jsf/impl-ee6/pom.xml | 155 ---------------------
deltaspike/modules/jsf/pom.xml | 15 +-
deltaspike/modules/pom.xml | 4 -
13 files changed, 29 insertions(+), 209 deletions(-)
diff --git a/deltaspike/modules/jsf/api/pom.xml
b/deltaspike/modules/jsf/api/pom.xml
index 8f6395e2a..886002fd9 100644
--- a/deltaspike/modules/jsf/api/pom.xml
+++ b/deltaspike/modules/jsf/api/pom.xml
@@ -38,32 +38,22 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test20</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
--->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-test</artifactId>
+ <version>${myfaces.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
index c2fdd5079..832cff960 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
@@ -33,8 +33,8 @@ import jakarta.faces.context.FacesContext;
@ApplicationScoped
public class JsfModuleConfig implements DeltaSpikeConfig
{
- public static final String CLIENT_WINDOW_CONFIG_KEY =
"javax.faces.CLIENT_WINDOW_MODE";
- public static final String CLIENT_WINDOW_CLASS_NAME =
"javax.faces.lifecycle.ClientWindow";
+ public static final String CLIENT_WINDOW_CONFIG_KEY =
"jakarta.faces.CLIENT_WINDOW_MODE";
+ public static final String CLIENT_WINDOW_CLASS_NAME =
"jakarta.faces.lifecycle.ClientWindow";
private static final long serialVersionUID = -487295181899986237L;
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
index 795010eb2..78dd7107d 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
@@ -123,7 +123,7 @@ public @interface View
}
/**
- * Type of the navigation which should be used by the {@link
javax.faces.application.NavigationHandler}
+ * Type of the navigation which should be used by the {@link
jakarta.faces.application.NavigationHandler}
*/
enum NavigationMode
{
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/AfterPhase.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/AfterPhase.java
index ec6910667..75d878450 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/AfterPhase.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/AfterPhase.java
@@ -42,12 +42,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* - for request-observer-methods
* //TODO - for lifecycle callbacks in view-definitions
*
- * Parameter-type of the observer: {@link javax.faces.event.PhaseEvent}
+ * Parameter-type of the observer: {@link jakarta.faces.event.PhaseEvent}
*/
public @interface AfterPhase
{
/**
- * {@link JsfPhaseId} which is the equivalent for the {@link
javax.faces.event.PhaseId} value.
+ * {@link JsfPhaseId} which is the equivalent for the {@link
jakarta.faces.event.PhaseId} value.
* For more details see {@link JsfPhaseId}
*
* @return request-id which defines the jsf-lifecycle-request to
completely define this qualifier
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/BeforePhase.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/BeforePhase.java
index b38ea4bee..003ad3cab 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/BeforePhase.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/BeforePhase.java
@@ -38,12 +38,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* - for request-observer-methods
* //TODO - for lifecycle callbacks in view-definitions
*
- * Parameter-type of the observer: {@link javax.faces.event.PhaseEvent}
+ * Parameter-type of the observer: {@link jakarta.faces.event.PhaseEvent}
*/
public @interface BeforePhase
{
/**
- * {@link JsfPhaseId} which is the equivalent for the {@link
javax.faces.event.PhaseId} value.
+ * {@link JsfPhaseId} which is the equivalent for the {@link
jakarta.faces.event.PhaseId} value.
* For more details see {@link JsfPhaseId}
*
* @return request-id which defines the jsf-lifecycle-request to
completely define this qualifier
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseId.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseId.java
index d54d86859..75b110afd 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseId.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseId.java
@@ -23,17 +23,17 @@ package org.apache.deltaspike.jsf.api.listener.phase;
*/
public enum JsfPhaseId
{
- RESTORE_VIEW(javax.faces.event.PhaseId.RESTORE_VIEW),
- APPLY_REQUEST_VALUES(javax.faces.event.PhaseId.APPLY_REQUEST_VALUES),
- PROCESS_VALIDATIONS(javax.faces.event.PhaseId.PROCESS_VALIDATIONS),
- UPDATE_MODEL_VALUES(javax.faces.event.PhaseId.UPDATE_MODEL_VALUES),
- INVOKE_APPLICATION(javax.faces.event.PhaseId.INVOKE_APPLICATION),
- RENDER_RESPONSE(javax.faces.event.PhaseId.RENDER_RESPONSE),
- ANY_PHASE(javax.faces.event.PhaseId.ANY_PHASE);
+ RESTORE_VIEW(jakarta.faces.event.PhaseId.RESTORE_VIEW),
+ APPLY_REQUEST_VALUES(jakarta.faces.event.PhaseId.APPLY_REQUEST_VALUES),
+ PROCESS_VALIDATIONS(jakarta.faces.event.PhaseId.PROCESS_VALIDATIONS),
+ UPDATE_MODEL_VALUES(jakarta.faces.event.PhaseId.UPDATE_MODEL_VALUES),
+ INVOKE_APPLICATION(jakarta.faces.event.PhaseId.INVOKE_APPLICATION),
+ RENDER_RESPONSE(jakarta.faces.event.PhaseId.RENDER_RESPONSE),
+ ANY_PHASE(jakarta.faces.event.PhaseId.ANY_PHASE);
- private javax.faces.event.PhaseId phaseId;
+ private jakarta.faces.event.PhaseId phaseId;
- JsfPhaseId(javax.faces.event.PhaseId phaseId)
+ JsfPhaseId(jakarta.faces.event.PhaseId phaseId)
{
this.phaseId = phaseId;
}
@@ -44,7 +44,7 @@ public enum JsfPhaseId
* @param phaseId current request-id which has to be converted
* @return ds implementation for the given request-id
*/
- public static JsfPhaseId convertFromFacesClass(javax.faces.event.PhaseId
phaseId)
+ public static JsfPhaseId convertFromFacesClass(jakarta.faces.event.PhaseId
phaseId)
{
if (RESTORE_VIEW.getPhaseId().equals(phaseId))
{
@@ -79,7 +79,7 @@ public enum JsfPhaseId
return null;
}
- javax.faces.event.PhaseId getPhaseId()
+ jakarta.faces.event.PhaseId getPhaseId()
{
return phaseId;
}
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseListener.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseListener.java
index 62397cb14..4831deb99 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseListener.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/JsfPhaseListener.java
@@ -28,7 +28,7 @@ import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- * Annotation for implementations of {@link javax.faces.event.PhaseListener}.
+ * Annotation for implementations of {@link jakarta.faces.event.PhaseListener}.
*/
@Target(TYPE)
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindow.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindow.java
index 7fafcea2f..1c4a5fc86 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindow.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindow.java
@@ -29,7 +29,7 @@ import jakarta.faces.context.FacesContext;
* easier to provide this feature for JSF-2.0, JSF-2.1 and also
* JSF-2.2 JSF implementations.</p>
*
- * <p>Please not that in JSF-2.2 a
<code>javax.faces.lifecycle.ClientWindow</code>
+ * <p>Please not that in JSF-2.2 a
<code>jakarta.faces.lifecycle.ClientWindow</code>
* instance gets created for each and every request, but in DeltaSpike our
* ClientWindow instances are most likely @ApplicationScoped.
* </p>
@@ -51,7 +51,7 @@ public interface ClientWindow
/**
* Can be called to disable the window-id for an URL.
- * Don't forget to call {@link
#enableClientWindowRenderMode(javax.faces.context.FacesContext)}
+ * Don't forget to call {@link
#enableClientWindowRenderMode(jakarta.faces.context.FacesContext)}
* after rendering the markup for the current component, if {@link
#isClientWindowRenderModeEnabled}
* returned <code>true</code> before calling this method.
*/
diff --git
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
index 96598db86..3f5385bb1 100644
---
a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
+++
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
@@ -54,7 +54,7 @@ public class DefaultClientWindowConfig implements
ClientWindowConfig
private volatile Boolean javaScriptEnabled = null;
/**
- * lazily initiated via {@link
#getUserAgent(javax.faces.context.FacesContext)}
+ * lazily initiated via {@link
#getUserAgent(jakarta.faces.context.FacesContext)}
*/
private volatile String userAgent = null;
diff --git
a/deltaspike/modules/jsf/api/src/test/java/org/apache/deltaspike/jsf/util/ValueExpressionEvaluationInputStreamTest.java
b/deltaspike/modules/jsf/api/src/test/java/org/apache/deltaspike/jsf/util/ValueExpressionEvaluationInputStreamTest.java
index f466d9df5..c19a0c78b 100644
---
a/deltaspike/modules/jsf/api/src/test/java/org/apache/deltaspike/jsf/util/ValueExpressionEvaluationInputStreamTest.java
+++
b/deltaspike/modules/jsf/api/src/test/java/org/apache/deltaspike/jsf/util/ValueExpressionEvaluationInputStreamTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.deltaspike.jsf.util;
-import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Assert;
import org.junit.Test;
import jakarta.faces.context.FacesContext;
import java.io.ByteArrayInputStream;
+import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
/**
* Tests for {@link ValueExpressionEvaluationInputStream}.
diff --git a/deltaspike/modules/jsf/impl-ee6/pom.xml
b/deltaspike/modules/jsf/impl-ee6/pom.xml
deleted file mode 100644
index 8d32a464a..000000000
--- a/deltaspike/modules/jsf/impl-ee6/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>jsf-module-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>deltaspike-jsf-module-impl-ee6</artifactId>
-
- <name>Apache DeltaSpike JSF-Module Impl (EE6 only)</name>
-
- <!-- TODO remove workaround and refactor it back to the shade-plugin (+
javadoc) -->
- <build>
-
<sourceDirectory>${project.basedir}/../impl/src/main/java</sourceDirectory>
- <resources>
- <resource>
-
<directory>${project.basedir}/../impl/src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
-
<exclude>org/apache/deltaspike/jsf/impl/scope/window/ClientWindowAdapter.class</exclude>
-
<exclude>org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandlerWrapper.class</exclude>
-
<exclude>org/apache/deltaspike/jsf/impl/listener/request/JsfClientWindowAwareLifecycleWrapper.class</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
-
<outputDirectory>${project.build.directory}/classes/META-INF/resources/deltaspike-uncompressed</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.build.directory}/classes/META-INF/resources/deltaspike</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.primefaces.extensions</groupId>
- <artifactId>resources-optimizer-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>optimize</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<inputDir>${project.build.directory}/classes/META-INF/resources/deltaspike/</inputDir>
- <resourceSets>
- <resourcesSet>
- <includes>
- <include>**/*.js</include>
- <include>**/*.css</include>
- </includes>
- </resourcesSet>
- </resourceSets>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-impl</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-security-module-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-security-module-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-jsf-module-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-proxy-module-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-proxy-module-impl-asm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.owasp.encoder</groupId>
- <artifactId>encoder</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/deltaspike/modules/jsf/pom.xml b/deltaspike/modules/jsf/pom.xml
index c675ca540..9f4935508 100644
--- a/deltaspike/modules/jsf/pom.xml
+++ b/deltaspike/modules/jsf/pom.xml
@@ -36,8 +36,9 @@
<modules>
<module>api</module>
+ <!--
<module>impl</module>
- <module>impl-ee6</module>
+ -->
</modules>
<dependencies>
@@ -45,20 +46,8 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <!-- just needed for compiling >optional< classes for jsf 2.2 jsf
2.0 and 2.1 compatibility is ensured via test-cases -->
<version>${myfaces.version}</version>
<scope>provided</scope>
- <exclusions>
- <!-- Exclude transitive CDI API dependencies -->
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/deltaspike/modules/pom.xml b/deltaspike/modules/pom.xml
index 4bde3019c..a5884e9d7 100644
--- a/deltaspike/modules/pom.xml
+++ b/deltaspike/modules/pom.xml
@@ -37,15 +37,11 @@
<modules>
<module>proxy</module>
<module>security</module>
-<!--
- <module>security</module>
<module>jsf</module>
- -->
<module>partial-bean</module>
<module>jpa</module>
<module>data</module>
<!--
-
<module>scheduler</module>
-->
<module>test-control</module>
