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 066be0f52 removed pre Faces 2.3 stuff
066be0f52 is described below
commit 066be0f5281b870a143772ce8a67aaf9824c592b
Author: Thomas Andraschko <[email protected]>
AuthorDate: Thu Mar 30 16:28:44 2023 +0200
removed pre Faces 2.3 stuff
---
.../ViewConfigAwareNavigationHandler.java | 2 +-
.../impl/scope/mapped/MappedJsfContextTest.java | 84 ----------------------
.../beans/JsfApplicationScopedBackingBean.java | 45 ------------
.../mapped/beans/JsfRequestScopedBackingBean.java | 45 ------------
.../mapped/beans/JsfSessionScopedBackingBean.java | 45 ------------
.../scope/view/beans/ViewScopedBackingBean.java | 2 +-
6 files changed, 2 insertions(+), 221 deletions(-)
diff --git
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
index 99a30f103..8027c7bdb 100644
---
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
+++
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
@@ -243,7 +243,7 @@ public class ViewConfigAwareNavigationHandler extends
NavigationHandler
ViewRef.Manual.class,
newViewConfigDescriptor.getConfigClass());
}
- this.beanManager.fireEvent(navigateEvent);
+ this.beanManager.getEvent().fire(navigateEvent);
return navigateEvent;
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
deleted file mode 100644
index dde1d7b37..000000000
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/MappedJsfContextTest.java
+++ /dev/null
@@ -1,84 +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.test.jsf.impl.scope.mapped;
-
-
-import java.net.URL;
-
-import org.apache.deltaspike.test.category.WebProfileCategory;
-import org.apache.deltaspike.test.jsf.impl.config.TestJsfModuleConfig;
-import
org.apache.deltaspike.test.jsf.impl.scope.mapped.beans.JsfApplicationScopedBackingBean;
-import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-
-
-/**
- * Test for the DeltaSpike ViewScoped context
- */
-@RunWith(Arquillian.class)
-@Category(WebProfileCategory.class)
-public class MappedJsfContextTest
-{
- @Drone
- private WebDriver driver;
-
- @ArquillianResource
- private URL contextPath;
-
- @Deployment
- public static WebArchive deploy()
- {
- return ShrinkWrap
- .create(WebArchive.class, "mappedJsfContetxtTest.war")
- .addPackage(JsfApplicationScopedBackingBean.class.getPackage())
- .addClass(TestJsfModuleConfig.class)
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
- .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
- .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
- .addAsWebResource("mappedJsfContextTest/page.xhtml",
"page.xhtml")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
-
-
- @Test
- @RunAsClient
- public void testViewScopedContext() throws Exception
- {
- driver.get(new URL(contextPath,
"page.xhtml?req=47&sess=48&app=49").toString());
-
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("test:reqValue"),
"47").apply(driver));
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("test:sessValue"),
"48").apply(driver));
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("test:appValue"),
"49").apply(driver));
- }
-
-}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java
deleted file mode 100644
index 9e365dac1..000000000
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfApplicationScopedBackingBean.java
+++ /dev/null
@@ -1,45 +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.test.jsf.impl.scope.mapped.beans;
-
-import jakarta.faces.bean.ApplicationScoped;
-import jakarta.inject.Named;
-import java.io.Serializable;
-
-/**
- * JSF ApplicationScoped sample backing bean.
- * This Bean will get mapped to it's corresponding CDI scope
- * via our {@link
org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
- */
-@ApplicationScoped
-@Named
-public class JsfApplicationScopedBackingBean implements Serializable
-{
- private int i = 0;
-
- public int getI()
- {
- return i;
- }
-
- public void setI(int i)
- {
- this.i = i;
- }
-}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java
deleted file mode 100644
index 28bf0e595..000000000
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfRequestScopedBackingBean.java
+++ /dev/null
@@ -1,45 +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.test.jsf.impl.scope.mapped.beans;
-
-import jakarta.faces.bean.RequestScoped;
-import jakarta.inject.Named;
-import java.io.Serializable;
-
-/**
- * JSF RequestScoped sample backing bean.
- * This Bean will get mapped to it's corresponding CDI scope
- * via our {@link
org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
- */
-@RequestScoped
-@Named
-public class JsfRequestScopedBackingBean implements Serializable
-{
- private int i = 0;
-
- public int getI()
- {
- return i;
- }
-
- public void setI(int i)
- {
- this.i = i;
- }
-}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java
deleted file mode 100644
index a87c1a5f4..000000000
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/mapped/beans/JsfSessionScopedBackingBean.java
+++ /dev/null
@@ -1,45 +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.test.jsf.impl.scope.mapped.beans;
-
-import jakarta.faces.bean.SessionScoped;
-import jakarta.inject.Named;
-import java.io.Serializable;
-
-/**
- * JSF SessionScoped sample backing bean.
- * This Bean will get mapped to it's corresponding CDI scope
- * via our {@link
org.apache.deltaspike.jsf.impl.scope.mapped.MappedJsf2ScopeExtension}
- */
-@SessionScoped
-@Named
-public class JsfSessionScopedBackingBean implements Serializable
-{
- private int i = 0;
-
- public int getI()
- {
- return i;
- }
-
- public void setI(int i)
- {
- this.i = i;
- }
-}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/beans/ViewScopedBackingBean.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/beans/ViewScopedBackingBean.java
index 39434a56e..e592591cb 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/beans/ViewScopedBackingBean.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/beans/ViewScopedBackingBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.jsf.impl.scope.view.beans;
-import jakarta.faces.bean.ViewScoped;
+import jakarta.faces.view.ViewScoped;
import jakarta.inject.Named;
import java.io.Serializable;
