You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/12/14 20:11:34 UTC
svn commit: r1049216 - in
/myfaces/extensions/cdi/trunk/examples/jsf-examples:
clientside_windowhandler_jsf12/
clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/
hello_myfaces-codi_jsf12/ hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/
hello_myf...
Author: jakobk
Date: Tue Dec 14 19:11:33 2010
New Revision: 1049216
URL: http://svn.apache.org/viewvc?rev=1049216&view=rev
Log:
clean up jsf 1.2 examples
- servlet version should be 2.5
- there is no project stage in jsf 1.2
- we don't need el 2.2
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/pom.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/pom.xml Tue Dec 14 19:11:33 2010
@@ -80,12 +80,11 @@
<scope>compile</scope>
</dependency>
- <!-- TODO -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${owb.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -102,14 +101,6 @@
<scope>runtime</scope>
</dependency>
- <!-- needed due to an owb bug in combination with jsf12 in v1 -->
- <dependency>
- <groupId>juel</groupId>
- <artifactId>juel-impl</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/web.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/clientside_windowhandler_jsf12/src/main/webapp/WEB-INF/web.xml Tue Dec 14 19:11:33 2010
@@ -18,17 +18,12 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>Hello MyFaces CODI Client-Side Window-Handler Demo</description>
-
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <description>Hello MyFaces CODI Client-Side Window-Handler Demo JSF 1.2</description>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml Tue Dec 14 19:11:33 2010
@@ -108,12 +108,11 @@
<scope>compile</scope>
</dependency>
- <!-- TODO -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${owb.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -122,7 +121,8 @@
<version>${owb.version}</version>
<scope>runtime</scope>
</dependency>
-
+
+ <!-- TODO jakobk: should be openwebbeans-jsf12, but this one does not support el 2.2 (owb bug) -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
@@ -220,7 +220,7 @@
<version>2.1.0</version>
<scope>compile</scope>
</dependency>
-
+
<!--dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel-impl</artifactId>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/web.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/webapp/WEB-INF/web.xml Tue Dec 14 19:11:33 2010
@@ -18,17 +18,12 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>Hello MyFaces CODI</description>
-
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <description>Hello MyFaces CODI JSF 1.2</description>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/pom.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/pom.xml Tue Dec 14 19:11:33 2010
@@ -91,12 +91,11 @@
<scope>compile</scope>
</dependency>
- <!-- TODO -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${owb.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -108,7 +107,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
+ <artifactId>openwebbeans-jsf12</artifactId>
<version>${owb.version}</version>
<scope>runtime</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/src/main/webapp/WEB-INF/web.xml?rev=1049216&r1=1049215&r2=1049216&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_trinidad12/src/main/webapp/WEB-INF/web.xml Tue Dec 14 19:11:33 2010
@@ -18,17 +18,12 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>Hello MyFaces CODI with Trinidad</description>
-
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <description>Hello MyFaces CODI with Trinidad and JSF 1.2</description>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>