You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/04/23 09:53:29 UTC
svn commit: r1675552 - in /myfaces/tobago/trunk/tobago-example:
tobago-example-addressbook-cdi/
tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/
tobago-example-demo/ tobago-example-demo/src/main/java/org/a...
Author: lofwyr
Date: Thu Apr 23 07:53:28 2015
New Revision: 1675552
URL: http://svn.apache.org/r1675552
Log:
change examples from Codi to Deltaspike
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Thu Apr 23 07:53:28 2015
@@ -30,7 +30,7 @@
<properties>
<openjpa.version>1.0.4</openjpa.version>
<openwebbeans.version>1.1.7</openwebbeans.version>
- <myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
+ <deltaspike.version>1.3.0</deltaspike.version>
</properties>
<build>
<finalName>tobago-example-addressbook-cdi</finalName>
@@ -53,6 +53,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
+ <!--<groupId>org.eclipse.jetty</groupId>-->
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<loginServices>
@@ -186,20 +187,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- which repository-->
<!--
<dependency>
@@ -366,6 +353,14 @@
<artifactId>standard</artifactId>
</dependency>
-->
+
+ <!-- DeltaSpike -->
+ <dependency>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-jsf-module-impl</artifactId>
+ <version>${deltaspike.version}</version>
+ </dependency>
+
</dependencies>
<profiles>
@@ -386,20 +381,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
</profile>
@@ -413,20 +394,6 @@
</activation>
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
</profile>
@@ -445,21 +412,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -492,21 +444,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -539,21 +476,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -586,21 +508,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -633,21 +540,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -680,21 +572,6 @@
<version>${openwebbeans.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Thu Apr 23 07:53:28 2015
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.example.addressbook.web;
import org.apache.commons.fileupload.FileItem;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
+import org.apache.deltaspike.core.api.scope.WindowScoped;
import org.apache.myfaces.tobago.component.UIColumn;
import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.config.TobagoConfig;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Thu Apr 23 07:53:28 2015
@@ -29,7 +29,7 @@
<properties>
<openwebbeans.version>1.1.7</openwebbeans.version>
- <myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
+ <deltaspike.version>1.3.0</deltaspike.version>
</properties>
<build>
<finalName>tobago-example-demo</finalName>
@@ -105,32 +105,6 @@
</build>
<dependencies>
- <!-- Codi -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example-data</artifactId>
@@ -208,6 +182,13 @@
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- DeltaSpike -->
+ <dependency>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-jsf-module-impl</artifactId>
+ <version>${deltaspike.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -311,14 +292,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -384,14 +357,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -458,14 +423,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -532,14 +489,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -606,14 +555,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -680,14 +621,6 @@
<version>${openwebbeans.version}</version>
</dependency>
- <!-- Codi for JavaEE5 -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules.jee5-support</groupId>
- <artifactId>myfaces-extcdi-jee5-openwebbeans-support</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java Thu Apr 23 07:53:28 2015
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.example.demo;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
+import org.apache.deltaspike.core.api.scope.WindowScoped;
import org.apache.myfaces.tobago.model.ExpandedState;
import org.apache.myfaces.tobago.model.SelectedState;
import org.apache.myfaces.tobago.model.TreeState;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java Thu Apr 23 07:53:28 2015
@@ -19,8 +19,7 @@
package org.apache.myfaces.tobago.example.demo.info;
-import org.apache.myfaces.extensions.cdi.core.api.Advanced;
-import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.JsfPhaseListener;
+import org.apache.deltaspike.jsf.api.listener.phase.JsfPhaseListener;
import org.apache.myfaces.tobago.ajax.AjaxUtils;
import javax.faces.context.FacesContext;
@@ -30,7 +29,6 @@ import javax.faces.event.PhaseListener;
import javax.inject.Inject;
import javax.servlet.http.HttpSession;
-@Advanced
@JsfPhaseListener
public class ActivityPhaseListener implements PhaseListener {
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java Thu Apr 23 07:53:28 2015
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.example.demo.info;
-import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
+import org.apache.deltaspike.core.api.provider.BeanProvider;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
@@ -29,14 +29,14 @@ public class ActivitySessionListener imp
public void sessionCreated(final HttpSessionEvent event) {
final HttpSession session = event.getSession();
- final ActivityList activityList = BeanManagerProvider.getInstance().getContextualReference(ActivityList.class);
+ final ActivityList activityList = BeanProvider.getContextualReference(ActivityList.class);
activityList.add(new Activity(session));
}
public void sessionDestroyed(final HttpSessionEvent event) {
final HttpSession session = event.getSession();
- final ActivityList activityList = BeanManagerProvider.getInstance().getContextualReference(ActivityList.class);
+ final ActivityList activityList = BeanProvider.getContextualReference(ActivityList.class);
activityList.remove(session.getId());
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=1675552&r1=1675551&r2=1675552&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Thu Apr 23 07:53:28 2015
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.example.demo.overview;
import org.apache.commons.lang.StringUtils;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
+import org.apache.deltaspike.core.api.scope.WindowScoped;
import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;