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 32c97029f reintroduced jsf-playground
32c97029f is described below
commit 32c97029f21b89bdaba8b471abeb015c0c95c9a2
Author: Thomas Andraschko <[email protected]>
AuthorDate: Wed Jan 17 16:05:50 2024 +0100
reintroduced jsf-playground
---
deltaspike/examples/jsf-playground/pom.xml | 148 ++-------------------
.../playground/PlaygroundJsfModuleConfig.java | 33 -----
.../deltaspike/playground/exception/Jsf.java | 36 -----
.../playground/exception/TestException.java | 24 ----
.../exception/TestExceptionController.java | 32 -----
.../playground/exception/TestExceptionHandler.java | 34 -----
.../windowhandling/ViewActionController.java | 9 +-
.../exceptionhandling/exceptionhandling.xhtml | 39 ------
.../webapp/views/windowhandling/lazy/test.xhtml | 4 +-
.../views/windowhandling/lazy/testWithoutJS.xhtml | 4 +-
.../views/windowhandling/lazy/viewAction.xhtml | 4 +-
deltaspike/examples/pom.xml | 31 ++---
deltaspike/pom.xml | 2 -
13 files changed, 34 insertions(+), 366 deletions(-)
diff --git a/deltaspike/examples/jsf-playground/pom.xml
b/deltaspike/examples/jsf-playground/pom.xml
index 5d7121b88..339d60c7c 100644
--- a/deltaspike/examples/jsf-playground/pom.xml
+++ b/deltaspike/examples/jsf-playground/pom.xml
@@ -63,7 +63,6 @@
<scope>compile</scope>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
@@ -77,144 +76,25 @@
<scope>compile</scope>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-jsf-module-impl</artifactId>
+ <scope>compile</scope>
+ <version>${project.version}</version>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>run-tomee-1.7.2</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomee.maven</groupId>
- <artifactId>tomee-maven-plugin</artifactId>
- <version>1.0.1</version>
- <configuration>
- <tomeeVersion>1.7.2</tomeeVersion>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-jsf-module-impl-ee6</artifactId>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>run-wildfly-8.0.0</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <version>1.0.1.Final</version>
- <configuration>
- <version>8.0.0.Final</version>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-jsf-module-impl</artifactId>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>run-jboss-7.1.1</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.7.Final</version>
- <configuration>
- <version>7.1.1.Final</version>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-jsf-module-impl-ee6</artifactId>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>run-glassfish-3.1.2.2</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.glassfish.embedded</groupId>
-
<artifactId>maven-embedded-glassfish-plugin</artifactId>
- <version>3.1.2.2</version>
- <configuration>
- <port>8080</port>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-jsf-module-impl-ee6</artifactId>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<build>
- <finalName>ds</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-embedded-maven-plugin</artifactId>
+ <version>10.0.0-M1-SNAPSHOT</version>
+ <configuration>
+ <context>/</context>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
deleted file mode 100644
index 9175dd71f..000000000
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.playground;
-
-import java.lang.annotation.Annotation;
-import jakarta.enterprise.inject.Specializes;
-import org.apache.deltaspike.playground.exception.Jsf;
-import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
-
-@Specializes
-public class PlaygroundJsfModuleConfig extends JsfModuleConfig
-{
- public Class<? extends Annotation> getExceptionQualifier()
- {
- return Jsf.class;
- }
-}
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
deleted file mode 100644
index 9d4d0632b..000000000
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.playground.exception;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import jakarta.inject.Qualifier;
-
-@Target( { TYPE, ElementType.PARAMETER } )
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface Jsf
-{
-
-}
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestException.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestException.java
deleted file mode 100644
index 4cbeedc86..000000000
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.playground.exception;
-
-public class TestException extends RuntimeException
-{
-
-}
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
deleted file mode 100644
index e95205b77..000000000
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.playground.exception;
-
-import jakarta.enterprise.context.RequestScoped;
-import jakarta.inject.Named;
-
-@Named
-@RequestScoped
-public class TestExceptionController
-{
- public void throwException()
- {
- throw new TestException();
- }
-}
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionHandler.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionHandler.java
deleted file mode 100644
index 1939da1a7..000000000
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.playground.exception;
-
-import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
-import org.apache.deltaspike.core.api.exception.control.Handles;
-import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-
-@ExceptionHandler
-public class TestExceptionHandler
-{
- public void handleTestException(@Handles @Jsf
ExceptionEvent<TestException> event)
- {
- System.err.println("TestException handled!");
-
- event.handled();
- }
-}
diff --git
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
index c245f42b6..0aaa95c2b 100644
---
a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
+++
b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
@@ -18,13 +18,14 @@
*/
package org.apache.deltaspike.playground.windowhandling;
-import java.util.Date;
import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.context.FacesContext;
+import jakarta.faces.lifecycle.ClientWindow;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.deltaspike.jsf.spi.scope.window.ClientWindow;
+
+import java.util.Date;
@Named
@RequestScoped
@@ -44,7 +45,7 @@ public class ViewActionController
public void action()
{
FacesContext context = FacesContext.getCurrentInstance();
- System.out.println("ViewActionController#action with windowId: " +
clientWindow.getWindowId(context));
+ System.out.println("ViewActionController#action with windowId: " +
clientWindow.getId());
}
public Date getLastTimeLinkAction()
@@ -55,7 +56,7 @@ public class ViewActionController
public void linkAction()
{
FacesContext context = FacesContext.getCurrentInstance();
- System.out.println("ViewActionController#linkAction with windowId: " +
clientWindow.getWindowId(context));
+ System.out.println("ViewActionController#linkAction with windowId: " +
clientWindow.getId());
lastTimeLinkAction = new Date();
}
}
diff --git
a/deltaspike/examples/jsf-playground/src/main/webapp/views/exceptionhandling/exceptionhandling.xhtml
b/deltaspike/examples/jsf-playground/src/main/webapp/views/exceptionhandling/exceptionhandling.xhtml
deleted file mode 100644
index 16ecc68c4..000000000
---
a/deltaspike/examples/jsf-playground/src/main/webapp/views/exceptionhandling/exceptionhandling.xhtml
+++ /dev/null
@@ -1,39 +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.
- -->
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-
-<html xmlns="http://www.w3.org/1999/xhtml";
- xmlns:h="http://java.sun.com/jsf/html";
xmlns:f="http://java.sun.com/jsf/core";
xmlns:ds="http://deltaspike.apache.org/jsf";>
-
-<h:head>
- <title>DeltaSpike JSF Playground</title>
-</h:head>
-
-<h:body>
- <h:form>
- <ds:windowId />
-
- <h:commandButton value="Throw Exception"
actionListener="#{testExceptionController.throwException}" />
- </h:form>
-</h:body>
-
-</html>
\ No newline at end of file
diff --git
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/test.xhtml
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/test.xhtml
index 4d8db8275..0f57e58f0 100644
---
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/test.xhtml
+++
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/test.xhtml
@@ -38,9 +38,7 @@
<h:link value="GET Link" outcome="test.xhtml" />
<br />
<br />
- <ds:disableClientWindow>
- <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="test.xhtml" />
- </ds:disableClientWindow>
+ <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="test.xhtml" disableClientWindow="true" />
<br />
<br />
<h:commandLink value="Postback">
diff --git
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/testWithoutJS.xhtml
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/testWithoutJS.xhtml
index 6384a951b..13e7d0be6 100644
---
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/testWithoutJS.xhtml
+++
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/testWithoutJS.xhtml
@@ -36,9 +36,7 @@
<h:link value="GET Link" outcome="test.xhtml" />
<br />
<br />
- <ds:disableClientWindow>
- <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="test.xhtml" />
- </ds:disableClientWindow>
+ <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="test.xhtml" disableClientWindow="true" />
<br />
<br />
<h:commandLink value="Postback">
diff --git
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/viewAction.xhtml
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/viewAction.xhtml
index f646c43cd..c37c37bb4 100644
---
a/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/viewAction.xhtml
+++
b/deltaspike/examples/jsf-playground/src/main/webapp/views/windowhandling/lazy/viewAction.xhtml
@@ -42,9 +42,7 @@
<h:link value="GET Link" outcome="viewAction.xhtml" />
<br />
<br />
- <ds:disableClientWindow>
- <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="viewAction.xhtml" />
- </ds:disableClientWindow>
+ <h:link value="GET Link - surrounded by ds:disableClientWindow"
outcome="viewAction.xhtml" disableClientWindow="true" />
<br />
<br />
<h:commandLink value="Postback">
diff --git a/deltaspike/examples/pom.xml b/deltaspike/examples/pom.xml
index 43d186bb4..a73edaf23 100644
--- a/deltaspike/examples/pom.xml
+++ b/deltaspike/examples/pom.xml
@@ -53,14 +53,18 @@
<name>Apache DeltaSpike Examples</name>
<modules>
+ <!--
<module>jse-examples</module>
<module>jsf-examples</module>
+ -->
<module>jsf-playground</module>
+ <!--
<module>security-requested-page-after-login-cdi</module>
<module>security-requested-page-after-login-picketlink</module>
<module>scheduler-playground</module>
<module>jpa-examples</module>
<module>data-examples</module>
+ -->
</modules>
<properties>
@@ -69,21 +73,16 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>jakartaee-api</artifactId>
+ <version>10.0-M2</version>
+ <scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>compile</scope>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>4.0.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -96,12 +95,6 @@
<skip>${deploy.skip}</skip> <!-- we don't deploy our
samples upstream -->
</configuration>
</plugin>
- <!-- run mvn wildfly:deploy to deploy the sample to wildfly -->
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <version>1.1.0.Alpha8</version>
- </plugin>
</plugins>
</build>
</project>
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 25353dc25..f494d9b2c 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -74,9 +74,7 @@
<module>core</module>
<module>cdictrl</module>
<module>modules</module>
-<!--
<module>examples</module>
--->
<module>dist</module>
</modules>
