This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into wfk20

  • Loading branch information...
ppitonak committed Jun 22, 2012
2 parents 774177e + 4ea1af5 commit 6e81940225df35269617d0f80f4fc292091cf121
View
@@ -9,7 +9,8 @@
software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the
FSF site: http://www.fsf.org. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -151,20 +152,16 @@
<build>
<finalName>metamer</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
+ <filters>
+ <filter>${basedir}/src/main/filters/default.properties</filter>
+ </filters>
<attachClasses>true</attachClasses>
<attachSources>true</attachSources>
- <useCache>true</useCache>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -182,34 +179,6 @@
<id>default-war</id>
<phase>none</phase>
</execution>
- <execution>
- <id>exploded-war</id>
- <phase>package</phase>
- <goals>
- <goal>exploded</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>maven-replacer-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- <configuration>
- <file>target/${project.build.finalName}/WEB-INF/web.xml</file>
- <regex>true</regex>
- <regexFlags>
- <regexFlag>MULTILINE</regexFlag>
- </regexFlags>
- <token>&lt;param-name&gt;org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL&lt;/param-name&gt;\s*&lt;param-value&gt;false&lt;/param-value&gt;</token>
- <value>&lt;param-name&gt;org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL&lt;/param-name&gt;&lt;param-value&gt;true&lt;/param-value&gt;</value>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -293,11 +262,14 @@
<executions>
<execution>
<id>jee6-bundled-mojarra</id>
- <phase>integration-test</phase>
+ <phase>package</phase>
<goals>
<goal>war</goal>
</goals>
<configuration>
+ <filters>
+ <filter>${basedir}/src/main/filters/bundles-jsf.properties</filter>
+ </filters>
<classifier>jee6-bundled-mojarra</classifier>
<packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
@@ -316,35 +288,45 @@
<executions>
<execution>
<id>jee6-bundled-myfaces</id>
- <phase>integration-test</phase>
+ <phase>package</phase>
<goals>
<goal>war</goal>
</goals>
<configuration>
+ <filters>
+ <filter>${basedir}/src/main/filters/bundles-jsf.properties</filter>
+ </filters>
<classifier>jee6-bundled-myfaces</classifier>
- <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
+ <packagingExcludes>WEB-INF/web.xml,WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>war-mojarra</id>
- <activation>
- <property>
- <name>!jsf_profile</name>
- </property>
- </activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>mojarra</id>
- <phase>integration-test</phase>
+ <phase>package</phase>
<goals>
<goal>war</goal>
</goals>
@@ -360,32 +342,38 @@
</profile>
<profile>
<id>war-myfaces</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>myfaces</value>
- </property>
- </activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>myfaces</id>
- <phase>integration-test</phase>
+ <phase>package</phase>
<goals>
<goal>war</goal>
</goals>
<configuration>
<classifier>myfaces</classifier>
- <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+ <packagingExcludes>WEB-INF/web.xml,WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>myfaces-development</id>
@@ -400,7 +388,6 @@
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
@@ -439,6 +426,80 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>release</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>mojarra</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <classifier>mojarra</classifier>
+ <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>myfaces</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <classifier>myfaces</classifier>
+ <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jee6-bundled-mojarra</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <filters>
+ <filter>${basedir}/src/main/filters/bundles-jsf.properties</filter>
+ </filters>
+ <classifier>jee6-bundled-mojarra</classifier>
+ <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jee6-bundled-myfaces</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <filters>
+ <filter>${basedir}/src/main/filters/bundles-jsf.properties</filter>
+ </filters>
+ <classifier>jee6-bundled-myfaces</classifier>
+ <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
@@ -0,0 +1 @@
+org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL=true
@@ -0,0 +1 @@
+org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL=false
@@ -1,25 +1,28 @@
-/**
- * JBoss, Home of Professional Open Source Copyright 2012, Red Hat, Inc. and
- * individual contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2012, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
*
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
package org.richfaces.tests.metamer.bean;
+import java.io.Serializable;
+
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
@@ -29,8 +32,9 @@
*/
@ManagedBean(name = "responseDelayBean")
@ViewScoped
-public class ResponseDelayBean {
+public class ResponseDelayBean implements Serializable {
+ private static final long serialVersionUID = -8116123004872799500L;
private int delay;
public int getDelay() {
@@ -56,7 +56,7 @@
private static Logger logger;
private Attributes attributes;
private Attributes ajaxAttributes;
- @ManagedProperty(value = "#{model.capitals}")
+ @ManagedProperty("#{model.capitals}")
private List<Capital> capitals;
// properties for jsr303 validations
@@ -29,13 +29,13 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
import javax.faces.bean.ViewScoped;
import org.richfaces.component.UICollapsibleSubTable;
import org.richfaces.component.UIDataTableBase;
import org.richfaces.tests.metamer.Attributes;
import org.richfaces.tests.metamer.ColumnSortingMap;
-import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.model.Employee;
import org.richfaces.tests.metamer.model.Employee.Sex;
import org.slf4j.Logger;
@@ -54,8 +54,8 @@
private static final long serialVersionUID = -1L;
private static Logger logger;
private Attributes attributes;
- // FIXME: @ManagedProperty(value = "#{model.employees}")
- private List<Employee> employees = Model.unmarshallEmployees();
+ @ManagedProperty("#{model.employees}")
+ private List<Employee> employees;
private List<List<Employee>> lists;
private transient UICollapsibleSubTable binding;
// true = model, false = empty table
@@ -27,11 +27,11 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
import javax.faces.bean.ViewScoped;
import org.richfaces.component.UICollapsibleSubTableToggleControl;
import org.richfaces.tests.metamer.Attributes;
-import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.model.Employee;
import org.richfaces.tests.metamer.model.Employee.Sex;
import org.slf4j.Logger;
@@ -50,8 +50,8 @@
private static final long serialVersionUID = -1L;
private static Logger logger;
private Attributes attributes;
- // FIXME: @ManagedProperty(value = "#{model.employees}")
- private List<Employee> employees = Model.unmarshallEmployees();
+ @ManagedProperty("#{model.employees}")
+ private List<Employee> employees;
private List<List<Employee>> lists;
// true = model, false = empty table
private boolean state;
Oops, something went wrong.

0 comments on commit 6e81940

Please sign in to comment.