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 2013/01/30 11:38:58 UTC
svn commit: r1440337 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi:
pom.xml src/main/webapp/WEB-INF/web.xml
Author: lofwyr
Date: Wed Jan 30 10:38:58 2013
New Revision: 1440337
URL: http://svn.apache.org/viewvc?rev=1440337&view=rev
Log:
addressbook with CDI
- not yet using Codi
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml
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=1440337&r1=1440336&r2=1440337&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 Wed Jan 30 10:38:58 2013
@@ -30,7 +30,9 @@
<properties>
<openjpa.version>1.0.4</openjpa.version>
<openwebbeans.version>1.1.6</openwebbeans.version>
+<!--
<myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
+-->
</properties>
<build>
<finalName>tobago-example-addressbook-cdi</finalName>
@@ -145,6 +147,7 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
@@ -171,6 +174,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
@@ -184,14 +188,17 @@
<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>
+-->
<dependency>
<groupId>org.tango-project</groupId>
<artifactId>tango-icon-theme</artifactId>
@@ -346,6 +353,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
@@ -359,6 +367,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
</dependencies>
</profile>
@@ -378,6 +387,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -391,6 +401,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -423,6 +434,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -436,6 +448,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -462,6 +475,7 @@
</property>
</activation>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -475,6 +489,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
</dependencies>
</profile>
@@ -494,6 +509,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
@@ -507,6 +523,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
</dependencies>
</profile>
@@ -526,6 +543,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -539,6 +557,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -571,6 +590,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -584,6 +604,7 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
+-->
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
<groupId>javax.el</groupId>
@@ -623,6 +644,7 @@
<version>${openwebbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
@@ -636,6 +658,7 @@
<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/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml?rev=1440337&r1=1440336&r2=1440337&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml Wed Jan 30 10:38:58 2013
@@ -94,9 +94,11 @@
</listener>
-->
+<!--
<listener>
<listener-class>org.apacheExtras.myfaces.codi.addon.openwebbeans.startup.OpenWebBeansAwareConfigurationListener</listener-class>
</listener>
+-->
<!-- servlet -->
@@ -111,13 +113,6 @@
<servlet-class>org.apache.myfaces.tobago.example.addressbook.web.PictureServlet</servlet-class>
</servlet>
- <!-- workaround for a bug in Bea Weblogic 8.1 SP 2 and older -->
- <servlet>
- <servlet-name>WeblogicWorkaroundServlet</servlet-name>
- <servlet-class>org.apache.myfaces.tobago.webapp.WeblogicWorkaroundServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
<servlet>
<servlet-name>ResourceServlet</servlet-name>
<servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>