You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2016/08/27 15:01:45 UTC
svn commit: r1758048 - in /myfaces/current23/test-webapp-cdi: ./
src/main/webapp/ src/main/webapp/META-INF/
src/main/webapp/META-INF/templates/ src/main/webapp/WEB-INF/ src/test/
src/test/jetty/
Author: lu4242
Date: Sat Aug 27 15:01:45 2016
New Revision: 1758048
URL: http://svn.apache.org/viewvc?rev=1758048&view=rev
Log:
replace tomcat with tomee, use jetty 9 and CDI 2.0 (OWB 1.6.3)
Added:
myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/
myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/
myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example.xhtml
myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example_iso.xhtml
myfaces/current23/test-webapp-cdi/src/main/webapp/WEB-INF/jetty-context.xml
myfaces/current23/test-webapp-cdi/src/main/webapp/home.xhtml
myfaces/current23/test-webapp-cdi/src/test/
myfaces/current23/test-webapp-cdi/src/test/jetty/
myfaces/current23/test-webapp-cdi/src/test/jetty/override-mojarra-web.xml
myfaces/current23/test-webapp-cdi/src/test/jetty/override-myfaces-web.xml
Modified:
myfaces/current23/test-webapp-cdi/ (props changed)
myfaces/current23/test-webapp-cdi/pom.xml
myfaces/current23/test-webapp-cdi/src/main/webapp/helloWorld.xhtml
myfaces/current23/test-webapp-cdi/src/main/webapp/index.html
myfaces/current23/test-webapp-cdi/src/main/webapp/page2.xhtml
Propchange: myfaces/current23/test-webapp-cdi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 27 15:01:45 2016
@@ -0,0 +1 @@
+target
Modified: myfaces/current23/test-webapp-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/pom.xml?rev=1758048&r1=1758047&r2=1758048&view=diff
==============================================================================
--- myfaces/current23/test-webapp-cdi/pom.xml (original)
+++ myfaces/current23/test-webapp-cdi/pom.xml Sat Aug 27 15:01:45 2016
@@ -28,7 +28,7 @@
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>test-webapp-cdi</name>
- <description>A custom project using MyFaces 2.3 and OpenWebBeans</description>
+ <description>A custom project using MyFaces 2.3 and CDI 2.0 (OpenWebBeans)</description>
<url>http://www.myorganization.org</url>
<!-- Instructions
@@ -37,10 +37,10 @@
mvn clean -Dcontainer=jetty-mojarra jetty:run
Set your browser to http://localhost:8080/test-webapp-cdi
- Run using tomcat
- mvn clean -Dcontainer=tomcat7 tomcat:run
+ mvn clean -Dcontainer=tomee tomee:run
Set your browser to http://localhost:8080/test-webapp-cdi
- Run war using tomcat
- mvn clean -Dcontainer=tomcat7 tomcat:run-war
+ mvn clean -Dcontainer=tomee tomee:run-war
Set your browser to http://localhost:8080/test-webapp-cdi
- Run war using jetty (remove <webApp> config inside plugin config first)
mvn clean jetty:run-war
@@ -53,9 +53,9 @@
<properties>
<jsf-myfaces.version>2.3.0-SNAPSHOT</jsf-myfaces.version>
- <jsf-mojarra.version>2.1.7</jsf-mojarra.version>
+ <jsf-mojarra.version>2.3.0-m06</jsf-mojarra.version>
<jetty.maven.plugin.version>8.1.3.v20120416</jetty.maven.plugin.version>
- <openwebbeans.version>1.1.4</openwebbeans.version>
+ <openwebbeans.version>1.6.3</openwebbeans.version>
</properties>
<build>
@@ -65,8 +65,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
@@ -91,8 +91,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -175,13 +175,19 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -193,7 +199,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -247,24 +253,18 @@
<build>
<plugins>
<plugin>
- <!--This plugin allows to run the war using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.maven.plugin.version}</version>
- <configuration>
- <systemProperties>
- <systemProperty>
- <!-- optional to use the ecj compiler -->
- <name>org.apache.jasper.compiler.disablejsr199</name>
- <value>true</value>
- </systemProperty>
- </systemProperties>
- <webApp>
- <contextPath>/${artifactId}</contextPath>
- </webApp>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- </configuration>
- <dependencies>
+ <!--This plugin allows to run the war using mvn jetty:run -->
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.3.7.v20160115</version>
+ <configuration>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ <overrideDescriptor>src/test/jetty/override-myfaces-web.xml</overrideDescriptor>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
<!-- Tld scanning only works when JSF is included
as container dependency. Add other jsf libraries
here, so jetty:run goal can find and process them -->
@@ -282,13 +282,19 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -300,7 +306,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -364,13 +370,19 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -382,7 +394,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -420,7 +432,7 @@
<repositories>
<repository>
<id>java.net</id>
- <url>http://download.java.net/maven/2</url>
+ <url>https://maven.java.net/content/repositories/releases</url>
</repository>
</repositories>
</profile>
@@ -444,22 +456,16 @@
<plugins>
<plugin>
<!--This plugin allows to run the war using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.maven.plugin.version}</version>
- <configuration>
- <systemProperties>
- <systemProperty>
- <!-- optional to use the ecj compiler -->
- <name>org.apache.jasper.compiler.disablejsr199</name>
- <value>true</value>
- </systemProperty>
- </systemProperties>
- <webApp>
- <contextPath>/${artifactId}</contextPath>
- </webApp>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- </configuration>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.3.7.v20160115</version>
+ <configuration>
+ <webApp>
+ <contextPath>/${artifactId}</contextPath>
+ <overrideDescriptor>src/test/jetty/override-mojarra-web.xml</overrideDescriptor>
+ </webApp>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
<dependencies>
<!-- Tld scanning only works when JSF is included
as container dependency. Add other jsf libraries
@@ -484,7 +490,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -496,7 +502,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
@@ -537,98 +543,75 @@
<repositories>
<repository>
<id>java.net</id>
- <url>http://download.java.net/maven/2</url>
+ <url>https://maven.java.net/content/repositories/releases</url>
</repository>
</repositories>
</profile>
<profile>
- <id>maven-tomcat7</id>
+ <id>maven-tomee</id>
<activation>
<property>
<name>container</name>
- <value>tomcat7</value>
+ <value>tomee</value>
</property>
</activation>
<build>
<plugins>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-maven-plugin</artifactId>
+ <version>7.0.1</version>
+ <configuration>
+ <tomeeVersion>7.0.1</tomeeVersion>
+ <tomeeClassifier>plus</tomeeClassifier>
+ <libs>
+ <lib>remove:myfaces-</lib>
+ <lib>org.apache.myfaces.core:myfaces-api:2.3.0-SNAPSHOT</lib>
+ <lib>org.apache.myfaces.core:myfaces-impl:2.3.0-SNAPSHOT</lib>
+ </libs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>maven-tomee-embedded</id>
+ <activation>
+ <property>
+ <name>container</name>
+ <value>tomee2</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-embedded-maven-plugin</artifactId>
+ <version>7.0.1</version>
+ <configuration>
+ <tomeeVersion>7.0.1</tomeeVersion>
+ <tomeeClassifier>plus</tomeeClassifier>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${jsf-myfaces.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${jsf-myfaces.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</profile>
-
</profiles>
</project>
Added: myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example.xhtml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example.xhtml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example.xhtml (added)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example.xhtml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<h:head>
+ <title>Hello World</title>
+</h:head>
+<h:body>
+ <h:outputStylesheet name="style.css" library="css"/>
+ <div id="container">
+ <ui:insert name="container"/>
+ <br/>
+ <br/>
+ <h:link outcome="/home" value="Index"/>
+ </div>
+</h:body>
+</html>
Added: myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example_iso.xhtml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example_iso.xhtml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example_iso.xhtml (added)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/META-INF/templates/example_iso.xhtml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view encoding="ISO-8859-1" >
+<h:head>
+ <title>Hello World</title>
+</h:head>
+<h:body>
+ <h:outputStylesheet name="style.css" library="css"/>
+ <div id="container">
+ <ui:insert name="container"/>
+ <br/>
+ <br/>
+ <h:link outcome="/home" value="Index"/>
+ </div>
+</h:body>
+</f:view>
+</html>
Added: myfaces/current23/test-webapp-cdi/src/main/webapp/WEB-INF/jetty-context.xml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/WEB-INF/jetty-context.xml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/WEB-INF/jetty-context.xml (added)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/WEB-INF/jetty-context.xml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,8 @@
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <Set name="serverClasses">
+ <Array type="java.lang.String">
+ <Item>-org.eclipse.jetty.servlet.ServletContextHandler.Decorator</Item>
+ </Array>
+ </Set>
+</Configure>
\ No newline at end of file
Modified: myfaces/current23/test-webapp-cdi/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/helloWorld.xhtml?rev=1758048&r1=1758047&r2=1758048&view=diff
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/helloWorld.xhtml Sat Aug 27 15:01:45 2016
@@ -1,42 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
- <title>Hello World</title>
-</h:head>
-<h:body>
- <h:outputStylesheet name="style.css" library="css"/>
- <div id="container">
- <h1>MyFaces Hello World</h1>
- <h:form id="mainForm">
- <h:panelGrid columns="2">
- <h:outputLabel for="name" value="Please enter your name"/>
- <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
- <h:commandButton value="Press me" action="#{helloWorld.send}"/>
- <h:messages showDetail="true" showSummary="false"/>
- </h:panelGrid>
- </h:form>
- </div>
-</h:body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<body>
+<ui:composition template="/META-INF/templates/example.xhtml">
+ <ui:define name="container">
+ <f:view>
+ <h1>MyFaces Hello World</h1>
+ <h:form id="mainForm">
+ <h:panelGrid columns="2">
+ <h:outputLabel for="name" value="Please enter your name"/>
+ <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
+ <h:commandLink value="Press me" action="#{helloWorld.send}"/>
+ <h:commandButton value="PostBack"/>
+ <h:commandButton value="Submit Ajax">
+ <f:ajax execute="@form" render="@form" />
+ </h:commandButton>
+ <h:outputText value="#{helloWorld.name}"/>
+ <h:messages showDetail="true" showSummary="false"/>
+ </h:panelGrid>
+ </h:form>
+ </f:view>
+ </ui:define>
+</ui:composition>
+</body>
+</html>
Added: myfaces/current23/test-webapp-cdi/src/main/webapp/home.xhtml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/home.xhtml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/home.xhtml (added)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/home.xhtml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+ <title>Hello World</title>
+</h:head>
+<h:body>
+ <h:outputStylesheet name="style.css" library="css"/>
+ <div id="container">
+ <h1>MyFaces Hello World</h1>
+
+ <h:panelGrid columns="1">
+
+ <h:link outcome="helloWorld" value="helloWorld"/>
+
+ </h:panelGrid>
+ </div>
+</h:body>
+</html>
Modified: myfaces/current23/test-webapp-cdi/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/index.html?rev=1758048&r1=1758047&r2=1758048&view=diff
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/index.html (original)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/index.html Sat Aug 27 15:01:45 2016
@@ -1,23 +1,24 @@
-<!--
- 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.
--->
-<html>
-<head>
- <meta http-equiv="refresh" content="0; URL=helloWorld.jsf">
-</head>
-</html>
\ No newline at end of file
+<!--
+ 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.
+-->
+<html>
+<head>
+ <meta http-equiv="refresh" content="0; URL=home.jsf">
+</head>
+</html>
+
Modified: myfaces/current23/test-webapp-cdi/src/main/webapp/page2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/main/webapp/page2.xhtml?rev=1758048&r1=1758047&r2=1758048&view=diff
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/main/webapp/page2.xhtml (original)
+++ myfaces/current23/test-webapp-cdi/src/main/webapp/page2.xhtml Sat Aug 27 15:01:45 2016
@@ -1,37 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
- <title>Hello World</title>
-</h:head>
-<h:body>
- <h:outputStylesheet name="style.css" library="css"/>
- <div id="container">
- <h1>MyFaces Hello World</h1>
- <h:outputText value="#{helloWorld.greeting}"/>
- <br/>
- <h:link value="Home" outcome="helloWorld"/>
- </div>
-</h:body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<body>
+<ui:composition template="/META-INF/templates/example.xhtml">
+ <ui:define name="container">
+ <h1>MyFaces Hello World</h1>
+ <h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces!"/>
+ <br/>
+ <h:link value="Home" outcome="helloWorld"/>
+ </ui:define>
+</ui:composition>
+</body>
+</html>
Added: myfaces/current23/test-webapp-cdi/src/test/jetty/override-mojarra-web.xml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/test/jetty/override-mojarra-web.xml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/test/jetty/override-mojarra-web.xml (added)
+++ myfaces/current23/test-webapp-cdi/src/test/jetty/override-mojarra-web.xml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+* 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.
+-->
+
+<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_3_0.xsd"
+ version="3.0">
+
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ <!--<param-value>Production</param-value>-->
+ </context-param>
+
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+
+</web-app>
\ No newline at end of file
Added: myfaces/current23/test-webapp-cdi/src/test/jetty/override-myfaces-web.xml
URL: http://svn.apache.org/viewvc/myfaces/current23/test-webapp-cdi/src/test/jetty/override-myfaces-web.xml?rev=1758048&view=auto
==============================================================================
--- myfaces/current23/test-webapp-cdi/src/test/jetty/override-myfaces-web.xml (added)
+++ myfaces/current23/test-webapp-cdi/src/test/jetty/override-myfaces-web.xml Sat Aug 27 15:01:45 2016
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+* 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.
+-->
+
+<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_3_0.xsd"
+ version="3.0">
+
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ <!--<param-value>Production</param-value>-->
+ </context-param>
+
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+</web-app>