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/02/03 13:03:16 UTC
svn commit: r1656703 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example:
tobago-example-addressbook/pom.xml
tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
tobago-example-demo/pom.xml
Author: lofwyr
Date: Tue Feb 3 12:03:16 2015
New Revision: 1656703
URL: http://svn.apache.org/r1656703
Log:
Using DeltaSpike in Demo
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1656703&r1=1656702&r2=1656703&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml Tue Feb 3 12:03:16 2015
@@ -30,7 +30,7 @@
<properties>
<openjpa.version>2.3.0</openjpa.version>
<openwebbeans.version>1.1.7</openwebbeans.version>
- <myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
+ <deltaspike.version>1.2.1</deltaspike.version>
</properties>
<build>
@@ -193,29 +193,14 @@
-->
</dependency>
+ <!-- DeltaSpike -->
<dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-api</artifactId>
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-jsf-module-impl</artifactId>
+ <version>${deltaspike.version}</version>
</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>
- <groupId>org.apacheExtras.myfaces.codi.addon</groupId>
- <artifactId>controlled-owb-bootstrapping-addon</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
--->
+ <!-- which repository-->
<dependency>
<groupId>org.tango-project</groupId>
<artifactId>tango-icon-theme</artifactId>
@@ -326,20 +311,6 @@
<value>provided</value>
</property>
</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>
<profile>
@@ -390,21 +361,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>
-
</dependencies>
</profile>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=1656703&r1=1656702&r2=1656703&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Tue Feb 3 12:03:16 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/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml?rev=1656703&r1=1656702&r2=1656703&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml Tue Feb 3 12:03:16 2015
@@ -30,7 +30,7 @@
<properties>
<openwebbeans.version>1.1.7</openwebbeans.version>
- <myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
+ <deltaspike.version>1.2.1</deltaspike.version>
</properties>
<build>
<finalName>tobago-example-demo</finalName>
@@ -148,11 +148,11 @@
<artifactId>commons-io</artifactId>
</dependency>
- <!-- Codi -->
+ <!-- DeltaSpike -->
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-jsf-module-impl</artifactId>
- <version>1.2.1</version>
+ <version>${deltaspike.version}</version>
</dependency>
<dependency>