[richfaces-svn-commits] JBoss Rich Faces SVN: r22443 - in branches/4.0.X/examples/richfaces-showcase: src/main/java/org/richfaces/demo and 10 other directories.

Author: nbelaevski Date: 2011-04-27 07:15:12 -0400 (Wed, 27 Apr 2011) New Revision: 22443 Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/JPADataModel.java branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycle.java branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycleFactory.java branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceService.java branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/Person.java branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersonBean.java branches/4.0.X/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/arrangeablemodel/ branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/arrangeablemodel/data.xml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/arrangeableModel.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/arrangeableModel-sample.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/jpaColumn.xhtml Removed: branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml Modified: branches/4.0.X/examples/richfaces-showcase/pom.xml branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/faces-config.xml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/WEB-INF/faces-config.xml Log: RF-10845 Modified: branches/4.0.X/examples/richfaces-showcase/pom.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/pom.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/pom.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -59,16 +59,30 @@ <artifactId>validation-api</artifactId> <version>1.0.0.GA</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.5.6</version> + <version>1.5.8</version> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> - + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb-j5</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.6.3.Final</version> + </dependency> </dependencies> <build> @@ -151,15 +165,8 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> <version>1.1.1</version> - <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_3.0_spec</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.1</version> Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/JPADataModel.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/JPADataModel.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/JPADataModel.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,251 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + +import java.util.List; + +import javax.faces.context.FacesContext; +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Expression; +import javax.persistence.criteria.Order; +import javax.persistence.criteria.Path; +import javax.persistence.criteria.Root; + +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceRange; +import org.richfaces.component.SortOrder; +import org.richfaces.model.Arrangeable; +import org.richfaces.model.ArrangeableState; +import org.richfaces.model.FilterField; +import org.richfaces.model.SortField; + +import com.google.common.base.Strings; +import com.google.common.collect.Lists; + +public abstract class JPADataModel<T> extends ExtendedDataModel<T> implements Arrangeable { + + private EntityManager entityManager; + + private Object rowKey; + + private ArrangeableState arrangeableState; + + private Class<T> entityClass; + + public JPADataModel(EntityManager entityManager, Class<T> entityClass) { + super(); + + this.entityManager = entityManager; + this.entityClass = entityClass; + } + + public void arrange(FacesContext context, ArrangeableState state) { + arrangeableState = state; + } + + @Override + public void setRowKey(Object key) { + rowKey = key; + } + + @Override + public Object getRowKey() { + return rowKey; + } + + private CriteriaQuery<Long> createCountCriteriaQuery() { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class); + Root<T> root = criteriaQuery.from(entityClass); + + Expression<Boolean> filterCriteria = createFilterCriteria(criteriaBuilder, root); + if (filterCriteria != null) { + criteriaQuery.where(filterCriteria); + } + + Expression<Long> count = criteriaBuilder.count(root); + criteriaQuery.select(count); + + return criteriaQuery; + } + + private CriteriaQuery<T> createSelectCriteriaQuery() { + CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); + CriteriaQuery<T> criteriaQuery = criteriaBuilder.createQuery(entityClass); + Root<T> root = criteriaQuery.from(entityClass); + + if (arrangeableState != null) { + + List<Order> orders = createOrders(criteriaBuilder, root); + if (!orders.isEmpty()) { + criteriaQuery.orderBy(orders); + } + + Expression<Boolean> filterCriteria = createFilterCriteria(criteriaBuilder, root); + if (filterCriteria != null) { + criteriaQuery.where(filterCriteria); + } + } + + return criteriaQuery; + } + + private List<Order> createOrders(CriteriaBuilder criteriaBuilder, Root<T> root) { + List<Order> orders = Lists.newArrayList(); + List<SortField> sortFields = arrangeableState.getSortFields(); + if (sortFields != null && !sortFields.isEmpty()) { + + FacesContext facesContext = FacesContext.getCurrentInstance(); + + for (SortField sortField: sortFields) { + String propertyName = (String) sortField.getSortBy().getValue(facesContext.getELContext()); + + Path<Object> expression = root.get(propertyName); + + Order jpaOrder; + SortOrder sortOrder = sortField.getSortOrder(); + if (sortOrder == SortOrder.ascending) { + jpaOrder = criteriaBuilder.asc(expression); + } else if (sortOrder == SortOrder.descending) { + jpaOrder = criteriaBuilder.desc(expression); + } else { + throw new IllegalArgumentException(sortOrder.toString()); + } + + orders.add(jpaOrder); + } + } + + return orders; + } + + protected ArrangeableState getArrangeableState() { + return arrangeableState; + } + + protected Class<T> getEntityClass() { + return entityClass; + } + + protected Expression<Boolean> createFilterCriteriaForField(String propertyName, Object filterValue, Root<T> root, CriteriaBuilder criteriaBuilder) { + String stringFilterValue = (String) filterValue; + if (Strings.isNullOrEmpty(stringFilterValue)) { + return null; + } + + stringFilterValue = stringFilterValue.toLowerCase(arrangeableState.getLocale()); + + Path<String> expression = root.get(propertyName); + Expression<Integer> locator = criteriaBuilder.locate(criteriaBuilder.lower(expression), stringFilterValue, 1); + return criteriaBuilder.gt(locator, 0); + } + + + private Expression<Boolean> createFilterCriteria(CriteriaBuilder criteriaBuilder, Root<T> root) { + Expression<Boolean> filterCriteria = null; + List<FilterField> filterFields = arrangeableState.getFilterFields(); + if (filterFields != null && !filterFields.isEmpty()) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + + for (FilterField filterField : filterFields) { + String propertyName = (String) filterField.getFilterExpression().getValue(facesContext.getELContext()); + Object filterValue = filterField.getFilterValue(); + + Expression<Boolean> predicate = createFilterCriteriaForField(propertyName, filterValue, root, criteriaBuilder); + + if (predicate == null) { + continue; + } + + if (filterCriteria == null) { + filterCriteria = predicate.as(Boolean.class); + } else { + filterCriteria = criteriaBuilder.and(filterCriteria, predicate.as(Boolean.class)); + } + } + + } + return filterCriteria; + } + + @Override + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) { + CriteriaQuery<T> criteriaQuery = createSelectCriteriaQuery(); + TypedQuery<T> query = entityManager.createQuery(criteriaQuery); + + SequenceRange sequenceRange = (SequenceRange) range; + if (sequenceRange.getFirstRow() >= 0 && sequenceRange.getRows() > 0) { + query.setFirstResult(sequenceRange.getFirstRow()); + query.setMaxResults(sequenceRange.getRows()); + } + + List<T> data = query.getResultList(); + for (T t : data) { + visitor.process(context, getId(t), argument); + } + } + + + @Override + public boolean isRowAvailable() { + return rowKey != null; + } + + @Override + public int getRowCount() { + CriteriaQuery<Long> criteriaQuery = createCountCriteriaQuery(); + return entityManager.createQuery(criteriaQuery).getSingleResult().intValue(); + } + + @Override + public T getRowData() { + return entityManager.find(entityClass, rowKey); + } + + @Override + public int getRowIndex() { + return -1; + } + + @Override + public void setRowIndex(int rowIndex) { + throw new UnsupportedOperationException(); + } + + @Override + public Object getWrappedData() { + throw new UnsupportedOperationException(); + } + + @Override + public void setWrappedData(Object data) { + throw new UnsupportedOperationException(); + } + + //TODO - implement using metadata + protected abstract Object getId(T t); +} \ No newline at end of file Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycle.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycle.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycle.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + +import javax.faces.FacesException; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +class PersistenceLifecycle extends Lifecycle { + + private static final class PersistenceServiceRef { + + static final PersistenceService PERSISTENCE_SERVICE = (PersistenceService) FacesContext.getCurrentInstance(). + getExternalContext().getApplicationMap().get("persistenceService"); + + private PersistenceServiceRef() { + } + + } + + private Lifecycle lifecycle; + + public PersistenceLifecycle(Lifecycle lifecycle) { + this.lifecycle = lifecycle; + } + + public void addPhaseListener(PhaseListener listener) { + lifecycle.addPhaseListener(listener); + } + + public PhaseListener[] getPhaseListeners() { + return lifecycle.getPhaseListeners(); + } + + public void removePhaseListener(PhaseListener listener) { + lifecycle.removePhaseListener(listener); + } + + public void execute(FacesContext context) throws FacesException { + try { + lifecycle.execute(context); + } finally { + PersistenceServiceRef.PERSISTENCE_SERVICE.closeEntityManager(); + } + } + + public void render(FacesContext context) throws FacesException { + try { + lifecycle.render(context); + } finally { + PersistenceServiceRef.PERSISTENCE_SERVICE.closeEntityManager(); + } + } + + +} \ No newline at end of file Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycleFactory.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycleFactory.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceLifecycleFactory.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + +import java.util.Iterator; + +import javax.faces.FacesWrapper; +import javax.faces.lifecycle.Lifecycle; +import javax.faces.lifecycle.LifecycleFactory; + +/** + * @author Nick Belaevski + * + */ +public class PersistenceLifecycleFactory extends LifecycleFactory implements FacesWrapper<LifecycleFactory> { + + private LifecycleFactory lifecycleFactory; + + private Lifecycle defaultLifecycle; + + public PersistenceLifecycleFactory(LifecycleFactory lifecycleFactory) { + super(); + this.lifecycleFactory = lifecycleFactory; + } + + @Override + public void addLifecycle(String lifecycleId, Lifecycle lifecycle) { + getWrapped().addLifecycle(lifecycleId, lifecycle); + } + + @Override + public Lifecycle getLifecycle(String lifecycleId) { + if (LifecycleFactory.DEFAULT_LIFECYCLE.equals(lifecycleId)) { + if (defaultLifecycle == null) { + createDefaultLifecycle(); + } + + return defaultLifecycle; + } + + return lifecycleFactory.getLifecycle(lifecycleId); + } + + private void createDefaultLifecycle() { + defaultLifecycle = new PersistenceLifecycle(lifecycleFactory.getLifecycle(DEFAULT_LIFECYCLE)); + } + + @Override + public Iterator<String> getLifecycleIds() { + return lifecycleFactory.getLifecycleIds(); + } + +} Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceService.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceService.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersistenceService.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,165 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.faces.bean.ApplicationScoped; +import javax.faces.bean.ManagedBean; +import javax.faces.context.FacesContext; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Persistence; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.w3c.dom.Node; + +import com.google.common.collect.Lists; +import com.google.common.io.Closeables; + +/** + * @author Nick Belaevski + * + */ +@ManagedBean(eager = true) +@ApplicationScoped +public class PersistenceService { + + private static final Logger LOGGER = Logger.getLogger(PersistenceService.class.getName()); + + private EntityManagerFactory entityManagerFactory; + + public EntityManager getEntityManager() { + Map<Object, Object> attributes = FacesContext.getCurrentInstance().getAttributes(); + + EntityManager manager = (EntityManager) attributes.get(PersistenceService.class); + + if (manager == null) { + manager = entityManagerFactory.createEntityManager(); + attributes.put(PersistenceService.class, manager); + manager.getTransaction().begin(); + } + + return manager; + } + + void closeEntityManager() { + Map<Object, Object> attributes = FacesContext.getCurrentInstance().getAttributes(); + + EntityManager entityManager = (EntityManager) attributes.remove(PersistenceService.class); + + if (entityManager != null) { + try { + entityManager.getTransaction().commit(); + } catch (Exception e) { + LOGGER.log(Level.SEVERE, e.getMessage(), e); + try { + entityManager.getTransaction().rollback(); + } catch (Exception e1) { + LOGGER.log(Level.SEVERE, e1.getMessage(), e1); + } + } finally { + entityManager.close(); + } + } + } + + @PostConstruct + public void init() { + entityManagerFactory = Persistence.createEntityManagerFactory("richfaces-showcase", new Properties()); + + EntityManager em = entityManagerFactory.createEntityManager(); + + EntityTransaction transaction = em.getTransaction(); + + try { + transaction.begin(); + + for (Person person: parseTestData()) { + em.persist(person); + } + + transaction.commit(); + } catch (Exception e) { + transaction.rollback(); + e.printStackTrace(); + } finally { + em.close(); + } + } + + private List<Person> parseTestData() throws Exception { + InputStream dataStream = null; + try { + dataStream = PersistenceService.class.getResourceAsStream("data.xml"); + DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + Node node = documentBuilder.parse(dataStream).getDocumentElement(); + + List<Person> persons = Lists.newArrayList(); + + for (Node personNode = node.getFirstChild(); personNode != null; personNode = personNode.getNextSibling()) { + if (personNode.getNodeType() != Node.ELEMENT_NODE) { + continue; + } + + Person person = new Person(); + persons.add(person); + + for (Node personDataNode = personNode.getFirstChild(); personDataNode != null; personDataNode = personDataNode.getNextSibling()) { + if (personDataNode.getNodeType() != Node.ELEMENT_NODE) { + continue; + } + + String nodeName = personDataNode.getNodeName(); + String text = personDataNode.getTextContent(); + if ("name".equals(nodeName)) { + person.setName(text); + } else if ("surname".equals(nodeName)) { + person.setSurname(text); + } else if ("email".equals(nodeName)) { + person.setEmail(text); + } + } + } + + return persons; + } finally { + Closeables.closeQuietly(dataStream); + } + } + + @PreDestroy + public void destroy() { + entityManagerFactory.close(); + entityManagerFactory = null; + } + +} Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/Person.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/Person.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/Person.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @author Nick Belaevski + * + */ +@Entity +public class Person { + + private String name; + + private String surname; + + private String email; + + @Id + @GeneratedValue + private Long id; + + public Person() { + } + + public Person(String name) { + super(); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSurname() { + return surname; + } + + public void setSurname(String surname) { + this.surname = surname; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } +} Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersonBean.java =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersonBean.java (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/arrangeablemodel/PersonBean.java 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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 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. + */ +package org.richfaces.demo.arrangeablemodel; + + +import java.io.Serializable; +import java.util.Map; +import java.util.Map.Entry; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; +import javax.faces.context.FacesContext; +import javax.persistence.EntityManager; + +import org.richfaces.component.SortOrder; + +import com.google.common.collect.Maps; + + + +/** + * @author Nick Belaevski + * + */ +@ManagedBean +@SessionScoped +public class PersonBean implements Serializable { + + private static final long serialVersionUID = -5156711102367948040L; + + private static final class PersonDataModel extends JPADataModel<Person> { + + private PersonDataModel(EntityManager entityManager) { + super(entityManager, Person.class); + } + + @Override + protected Object getId(Person t) { + return t.getId(); + } + } + + private Map<String, SortOrder> sortOrders = Maps.newHashMapWithExpectedSize(1); + + private Map<String, String> filterValues = Maps.newHashMap(); + + private String sortProperty; + + public PersonBean() { + sortOrders.put("name", SortOrder.unsorted); + sortOrders.put("surname", SortOrder.unsorted); + sortOrders.put("email", SortOrder.unsorted); + } + + private EntityManager lookupEntityManager() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + PersistenceService persistenceService = facesContext.getApplication().evaluateExpressionGet(facesContext, "#{persistenceService}", PersistenceService.class); + return persistenceService.getEntityManager(); + } + + public Map<String, SortOrder> getSortOrders() { + return sortOrders; + } + + public Map<String, String> getFilterValues() { + return filterValues; + } + + public String getSortProperty() { + return sortProperty; + } + + public void setSortProperty(String sortPropety) { + this.sortProperty = sortPropety; + } + + public void toggleSort() { + for (Entry<String, SortOrder> entry : sortOrders.entrySet()) { + SortOrder newOrder; + + if (entry.getKey().equals(sortProperty)) { + if (entry.getValue() == SortOrder.ascending) { + newOrder = SortOrder.descending; + } else { + newOrder = SortOrder.ascending; + } + } else { + newOrder = SortOrder.unsorted; + } + + entry.setValue(newOrder); + } + } + + public Object getDataModel() { + return new PersonDataModel(lookupEntityManager()); + } +} \ No newline at end of file Added: branches/4.0.X/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence version="1.0" + xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + <persistence-unit name="richfaces-showcase" + transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <class>org.richfaces.demo.arrangeablemodel.Person</class> + <properties> + <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> + <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:richfaces_showcase" /> + <property name="javax.persistence.jdbc.user" value="sa" /> + <property name="javax.persistence.jdbc.password" value=""/> + + <property name="javax.persistence.validation.mode" value="NONE" /> + <property name="hibernate.validator.apply_to_ddl" value="false" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + <property name="hibernate.hbm2ddl.auto" value="create-drop" /> + </properties> + </persistence-unit> +</persistence> \ No newline at end of file Added: branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/arrangeablemodel/data.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/arrangeablemodel/data.xml (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/arrangeablemodel/data.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,1003 @@ +<persons> + <person> + <name>Savannah</name> + <surname>Dickerson</surname> + <email&gt;ac.sem(a)Phasellus.com&lt;/email&gt; + </person> + <person> + <name>Melyssa</name> + <surname>Scott</surname> + <email&gt;orci(a)at.com&lt;/email&gt; + </person> + <person> + <name>Jemima</name> + <surname>Workman</surname> + <email&gt;ac.mattis.semper(a)eget.org&lt;/email&gt; + </person> + <person> + <name>Evelyn</name> + <surname>Santiago</surname> + <email&gt;consectetuer.cursus(a)nonmagna.com&lt;/email&gt; + </person> + <person> + <name>Blossom</name> + <surname>Diaz</surname> + <email&gt;non.leo(a)mattisvelit.ca&lt;/email&gt; + </person> + <person> + <name>Miriam</name> + <surname>Gonzales</surname> + <email&gt;velit(a)urna.com&lt;/email&gt; + </person> + <person> + <name>Jada</name> + <surname>Dennis</surname> + <email&gt;lectus.ante(a)lectus.com&lt;/email&gt; + </person> + <person> + <name>Jessica</name> + <surname>Cotton</surname> + <email&gt;in(a)purus.com&lt;/email&gt; + </person> + <person> + <name>Henry</name> + <surname>Blackburn</surname> + <email&gt;amet.risus.Donec(a)semper.com&lt;/email&gt; + </person> + <person> + <name>Raymond</name> + <surname>Estrada</surname> + <email&gt;vitae(a)eutellus.ca&lt;/email&gt; + </person> + <person> + <name>Rhiannon</name> + <surname>Dodson</surname> + <email&gt;dictum(a)Nullamscelerisque.edu&lt;/email&gt; + </person> + <person> + <name>Nigel</name> + <surname>Ferrell</surname> + <email&gt;dictum.Phasellus(a)velitin.ca&lt;/email&gt; + </person> + <person> + <name>Kane</name> + <surname>Cook</surname> + <email&gt;massa.Vestibulum(a)eu.com&lt;/email&gt; + </person> + <person> + <name>Leandra</name> + <surname>Macias</surname> + <email&gt;erat.Vivamus.nisi(a)NullainterdumCurabitur.ca&lt;/email&gt; + </person> + <person> + <name>Ivory</name> + <surname>Sanchez</surname> + <email&gt;Cras.lorem(a)non.org&lt;/email&gt; + </person> + <person> + <name>Kelly</name> + <surname>Palmer</surname> + <email&gt;dolor.egestas.rhoncus(a)risusDonecegestas.com&lt;/email&gt; + </person> + <person> + <name>Jenna</name> + <surname>Willis</surname> + <email&gt;ipsum.dolor(a)luctus.ca&lt;/email&gt; + </person> + <person> + <name>Ivana</name> + <surname>Wolf</surname> + <email&gt;ac(a)infelis.com&lt;/email&gt; + </person> + <person> + <name>Graiden</name> + <surname>Hall</surname> + <email&gt;purus(a)Integer.edu&lt;/email&gt; + </person> + <person> + <name>Daria</name> + <surname>Petty</surname> + <email&gt;tortor.dictum(a)egestasrhoncus.edu&lt;/email&gt; + </person> + <person> + <name>Holmes</name> + <surname>Lang</surname> + <email&gt;adipiscing.enim(a)Nullamscelerisque.ca&lt;/email&gt; + </person> + <person> + <name>Michelle</name> + <surname>Miranda</surname> + <email&gt;Nam.consequat.dolor(a)Naminterdum.edu&lt;/email&gt; + </person> + <person> + <name>Calista</name> + <surname>Everett</surname> + <email&gt;Donec.nibh(a)laoreetlibero.com&lt;/email&gt; + </person> + <person> + <name>September</name> + <surname>Nicholson</surname> + <email&gt;iaculis.odio(a)sollicitudincommodo.ca&lt;/email&gt; + </person> + <person> + <name>Rosalyn</name> + <surname>Cline</surname> + <email&gt;Fusce.fermentum.fermentum(a)gravidanuncsed.edu&lt;/email&gt; + </person> + <person> + <name>Christen</name> + <surname>Cleveland</surname> + <email&gt;Duis.volutpat.nunc(a)metusvitaevelit.ca&lt;/email&gt; + </person> + <person> + <name>Igor</name> + <surname>Sears</surname> + <email&gt;non(a)eu.edu&lt;/email&gt; + </person> + <person> + <name>Plato</name> + <surname>Johnston</surname> + <email&gt;suscipit.est(a)Lorem.org&lt;/email&gt; + </person> + <person> + <name>Kelsie</name> + <surname>Peterson</surname> + <email&gt;lacus.Aliquam(a)dolorelitpellentesque.org&lt;/email&gt; + </person> + <person> + <name>Lionel</name> + <surname>Puckett</surname> + <email&gt;mi.lacinia.mattis(a)lacusEtiambibendum.org&lt;/email&gt; + </person> + <person> + <name>Orlando</name> + <surname>Hayes</surname> + <email&gt;Mauris.quis(a)fringilla.org&lt;/email&gt; + </person> + <person> + <name>Fuller</name> + <surname>Keller</surname> + <email&gt;In.nec.orci(a)utmolestiein.org&lt;/email&gt; + </person> + <person> + <name>Brandon</name> + <surname>Woodward</surname> + <email&gt;eget.magna(a)etnuncQuisque.edu&lt;/email&gt; + </person> + <person> + <name>Lyle</name> + <surname>George</surname> + <email&gt;lacus.Mauris(a)risus.edu&lt;/email&gt; + </person> + <person> + <name>Abbot</name> + <surname>Valdez</surname> + <email&gt;tincidunt.Donec.vitae(a)velit.ca&lt;/email&gt; + </person> + <person> + <name>Kessie</name> + <surname>Carr</surname> + <email&gt;Suspendisse.commodo(a)nonbibendum.ca&lt;/email&gt; + </person> + <person> + <name>Louis</name> + <surname>Mitchell</surname> + <email&gt;condimentum.Donec(a)convallisconvallis.com&lt;/email&gt; + </person> + <person> + <name>Francesca</name> + <surname>Walters</surname> + <email&gt;non.leo(a)eu.edu&lt;/email&gt; + </person> + <person> + <name>Giacomo</name> + <surname>Cross</surname> + <email&gt;Morbi(a)nunc.edu&lt;/email&gt; + </person> + <person> + <name>Iris</name> + <surname>Curtis</surname> + <email&gt;nec.euismod.in(a)Nullamsuscipit.ca&lt;/email&gt; + </person> + <person> + <name>Abdul</name> + <surname>Atkins</surname> + <email&gt;Donec.non.justo(a)lobortismauris.com&lt;/email&gt; + </person> + <person> + <name>Dominique</name> + <surname>Knight</surname> + <email&gt;suscipit.est.ac(a)odioNam.org&lt;/email&gt; + </person> + <person> + <name>Odysseus</name> + <surname>Barnett</surname> + <email&gt;nisi.a.odio(a)tempor.com&lt;/email&gt; + </person> + <person> + <name>Hammett</name> + <surname>Ray</surname> + <email&gt;eu.sem(a)purusactellus.ca&lt;/email&gt; + </person> + <person> + <name>Gage</name> + <surname>Branch</surname> + <email&gt;ac.libero(a)neque.ca&lt;/email&gt; + </person> + <person> + <name>Quinn</name> + <surname>Wilcox</surname> + <email&gt;Fusce(a)ipsumdolor.org&lt;/email&gt; + </person> + <person> + <name>Ursa</name> + <surname>Bishop</surname> + <email&gt;montes(a)tempor.org&lt;/email&gt; + </person> + <person> + <name>Gray</name> + <surname>Riddle</surname> + <email&gt;Suspendisse(a)magnanec.org&lt;/email&gt; + </person> + <person> + <name>Jorden</name> + <surname>Christensen</surname> + <email&gt;a.feugiat(a)id.edu&lt;/email&gt; + </person> + <person> + <name>Hashim</name> + <surname>Knight</surname> + <email&gt;Mauris(a)aliquetProin.edu&lt;/email&gt; + </person> + <person> + <name>Whitney</name> + <surname>Hansen</surname> + <email&gt;nibh.Phasellus.nulla(a)ullamcorperDuis.org&lt;/email&gt; + </person> + <person> + <name>Lacy</name> + <surname>Thompson</surname> + <email&gt;justo(a)egestasurnajusto.org&lt;/email&gt; + </person> + <person> + <name>Chelsea</name> + <surname>Blanchard</surname> + <email&gt;magna(a)dictum.org&lt;/email&gt; + </person> + <person> + <name>Kaseem</name> + <surname>Melendez</surname> + <email&gt;sem.semper.erat(a)mattis.edu&lt;/email&gt; + </person> + <person> + <name>Lillian</name> + <surname>Conway</surname> + <email&gt;mattis(a)egetmetus.com&lt;/email&gt; + </person> + <person> + <name>Allistair</name> + <surname>Britt</surname> + <email&gt;tellus.faucibus.leo(a)Aenean.org&lt;/email&gt; + </person> + <person> + <name>Merritt</name> + <surname>Melton</surname> + <email&gt;blandit(a)enimdiamvel.org&lt;/email&gt; + </person> + <person> + <name>Vivien</name> + <surname>Baker</surname> + <email&gt;accumsan(a)velitegestas.com&lt;/email&gt; + </person> + <person> + <name>Quinn</name> + <surname>Lowery</surname> + <email&gt;vitae.erat(a)ridiculusmusDonec.ca&lt;/email&gt; + </person> + <person> + <name>Fleur</name> + <surname>Rios</surname> + <email&gt;ullamcorper.viverra(a)egetvolutpatornare.ca&lt;/email&gt; + </person> + <person> + <name>Suki</name> + <surname>Leach</surname> + <email&gt;luctus.Curabitur(a)nibh.com&lt;/email&gt; + </person> + <person> + <name>Scarlet</name> + <surname>Cannon</surname> + <email&gt;dictum.eu.placerat(a)imperdiet.edu&lt;/email&gt; + </person> + <person> + <name>Ross</name> + <surname>Reid</surname> + <email&gt;in.hendrerit(a)tincidunt.ca&lt;/email&gt; + </person> + <person> + <name>Amethyst</name> + <surname>Pennington</surname> + <email&gt;Mauris.nulla.Integer(a)Fuscemollis.org&lt;/email&gt; + </person> + <person> + <name>Gregory</name> + <surname>Lyons</surname> + <email&gt;nisl.sem.consequat(a)Phasellus.ca&lt;/email&gt; + </person> + <person> + <name>Constance</name> + <surname>Thomas</surname> + <email&gt;accumsan(a)ipsum.ca&lt;/email&gt; + </person> + <person> + <name>Cleo</name> + <surname>Chandler</surname> + <email&gt;massa(a)penatibusetmagnis.org&lt;/email&gt; + </person> + <person> + <name>Cruz</name> + <surname>Paul</surname> + <email&gt;ornare.In(a)temporbibendum.org&lt;/email&gt; + </person> + <person> + <name>Tyrone</name> + <surname>Nunez</surname> + <email&gt;arcu.Nunc(a)nisi.org&lt;/email&gt; + </person> + <person> + <name>Evan</name> + <surname>Erickson</surname> + <email&gt;Etiam(a)nibh.org&lt;/email&gt; + </person> + <person> + <name>Claudia</name> + <surname>Nash</surname> + <email&gt;Cras.sed(a)estacmattis.com&lt;/email&gt; + </person> + <person> + <name>Pascale</name> + <surname>Cherry</surname> + <email&gt;mi(a)nonjustoProin.edu&lt;/email&gt; + </person> + <person> + <name>Evelyn</name> + <surname>Baxter</surname> + <email&gt;ante.ipsum.primis(a)adlitoratorquent.org&lt;/email&gt; + </person> + <person> + <name>Wing</name> + <surname>Gill</surname> + <email&gt;per(a)semperet.ca&lt;/email&gt; + </person> + <person> + <name>Raja</name> + <surname>Smith</surname> + <email&gt;euismod.in(a)Duisa.com&lt;/email&gt; + </person> + <person> + <name>Gail</name> + <surname>Fisher</surname> + <email&gt;Integer.mollis.Integer(a)nullaInteger.edu&lt;/email&gt; + </person> + <person> + <name>Garth</name> + <surname>Kaufman</surname> + <email&gt;Suspendisse(a)conguea.ca&lt;/email&gt; + </person> + <person> + <name>Donna</name> + <surname>Holman</surname> + <email&gt;orci.luctus(a)Integerinmagna.com&lt;/email&gt; + </person> + <person> + <name>Harriet</name> + <surname>Rhodes</surname> + <email&gt;eu(a)ametultricies.edu&lt;/email&gt; + </person> + <person> + <name>Brody</name> + <surname>Jacobs</surname> + <email&gt;magna.sed(a)Vivamusmolestiedapibus.org&lt;/email&gt; + </person> + <person> + <name>Colton</name> + <surname>Duffy</surname> + <email&gt;id.magna(a)nullaIntegervulputate.edu&lt;/email&gt; + </person> + <person> + <name>Edan</name> + <surname>Baxter</surname> + <email&gt;Cras(a)orciUt.ca&lt;/email&gt; + </person> + <person> + <name>Desirae</name> + <surname>Thomas</surname> + <email&gt;et(a)hendreritDonec.ca&lt;/email&gt; + </person> + <person> + <name>Drew</name> + <surname>Dixon</surname> + <email&gt;lectus.a.sollicitudin(a)rutrumurnanec.ca&lt;/email&gt; + </person> + <person> + <name>Jasper</name> + <surname>Stein</surname> + <email&gt;Nunc.commodo(a)Duis.edu&lt;/email&gt; + </person> + <person> + <name>Stacy</name> + <surname>Taylor</surname> + <email&gt;turpis.non(a)maurisblanditmattis.org&lt;/email&gt; + </person> + <person> + <name>Indigo</name> + <surname>Ballard</surname> + <email&gt;pellentesque.massa(a)odioEtiamligula.com&lt;/email&gt; + </person> + <person> + <name>Leroy</name> + <surname>Golden</surname> + <email&gt;ultrices(a)Aliquamnec.com&lt;/email&gt; + </person> + <person> + <name>Erasmus</name> + <surname>Mcguire</surname> + <email&gt;fermentum(a)Donecporttitor.com&lt;/email&gt; + </person> + <person> + <name>Lev</name> + <surname>Mccray</surname> + <email&gt;lectus.convallis.est(a)blanditenim.org&lt;/email&gt; + </person> + <person> + <name>Ima</name> + <surname>Petersen</surname> + <email&gt;egestas(a)acmieleifend.org&lt;/email&gt; + </person> + <person> + <name>Murphy</name> + <surname>Mcintosh</surname> + <email&gt;tempus.risus.Donec(a)dolorquamelementum.edu&lt;/email&gt; + </person> + <person> + <name>Kelsie</name> + <surname>Cantrell</surname> + <email&gt;ut.aliquam(a)commodohendreritDonec.org&lt;/email&gt; + </person> + <person> + <name>Claudia</name> + <surname>Carlson</surname> + <email&gt;fringilla(a)fermentumconvallisligula.com&lt;/email&gt; + </person> + <person> + <name>Cole</name> + <surname>Walsh</surname> + <email&gt;quis.pede.Praesent(a)intempus.org&lt;/email&gt; + </person> + <person> + <name>Hu</name> + <surname>Baker</surname> + <email&gt;Aliquam(a)Vivamusnibh.com&lt;/email&gt; + </person> + <person> + <name>Lara</name> + <surname>Wong</surname> + <email&gt;a.dui(a)leo.ca&lt;/email&gt; + </person> + <person> + <name>Simone</name> + <surname>Lancaster</surname> + <email&gt;netus.et(a)egettincidunt.ca&lt;/email&gt; + </person> + <person> + <name>Heather</name> + <surname>Harrison</surname> + <email&gt;tellus(a)lacus.edu&lt;/email&gt; + </person> + <person> + <name>Zenia</name> + <surname>Curtis</surname> + <email&gt;faucibus.lectus.a(a)fringilla.org&lt;/email&gt; + </person> + <person> + <name>Stuart</name> + <surname>Pugh</surname> + <email&gt;nulla.Cras.eu(a)asollicitudinorci.org&lt;/email&gt; + </person> + <person> + <name>Shelley</name> + <surname>Goodman</surname> + <email&gt;quam.dignissim(a)habitantmorbitristique.ca&lt;/email&gt; + </person> + <person> + <name>Keegan</name> + <surname>Olson</surname> + <email&gt;dolor.dapibus(a)tortor.org&lt;/email&gt; + </person> + <person> + <name>Hop</name> + <surname>Rodriguez</surname> + <email&gt;vitae.semper.egestas(a)natoque.ca&lt;/email&gt; + </person> + <person> + <name>Deanna</name> + <surname>Frye</surname> + <email&gt;Vivamus(a)risus.org&lt;/email&gt; + </person> + <person> + <name>Rebecca</name> + <surname>Medina</surname> + <email&gt;sociis(a)etmagnisdis.com&lt;/email&gt; + </person> + <person> + <name>Sarah</name> + <surname>Patton</surname> + <email&gt;ullamcorper(a)ettristique.com&lt;/email&gt; + </person> + <person> + <name>Jenette</name> + <surname>Martin</surname> + <email&gt;tempor.lorem.eget(a)etrutrum.com&lt;/email&gt; + </person> + <person> + <name>Gil</name> + <surname>Brady</surname> + <email&gt;tellus(a)inmagna.org&lt;/email&gt; + </person> + <person> + <name>Jena</name> + <surname>Merritt</surname> + <email&gt;litora(a)eu.ca&lt;/email&gt; + </person> + <person> + <name>Christine</name> + <surname>Brennan</surname> + <email&gt;ac(a)lectusasollicitudin.com&lt;/email&gt; + </person> + <person> + <name>Clark</name> + <surname>Contreras</surname> + <email&gt;natoque.penatibus.et(a)orciUtsagittis.org&lt;/email&gt; + </person> + <person> + <name>Bo</name> + <surname>Becker</surname> + <email&gt;est.vitae.sodales(a)Fusce.edu&lt;/email&gt; + </person> + <person> + <name>Lacey</name> + <surname>Guerrero</surname> + <email&gt;Fusce.dolor.quam(a)Aliquamvulputateullamcorper.com&lt;/email&gt; + </person> + <person> + <name>Cullen</name> + <surname>Mason</surname> + <email&gt;bibendum(a)purusin.com&lt;/email&gt; + </person> + <person> + <name>Jenette</name> + <surname>Stuart</surname> + <email&gt;sociis.natoque.penatibus(a)penatibus.com&lt;/email&gt; + </person> + <person> + <name>Selma</name> + <surname>Zamora</surname> + <email&gt;pede.Suspendisse.dui(a)fermentum.com&lt;/email&gt; + </person> + <person> + <name>Clinton</name> + <surname>Peterson</surname> + <email&gt;odio.Etiam(a)ornare.ca&lt;/email&gt; + </person> + <person> + <name>Axel</name> + <surname>Henderson</surname> + <email&gt;a(a)pedeCumsociis.org&lt;/email&gt; + </person> + <person> + <name>Margaret</name> + <surname>Roy</surname> + <email&gt;Sed(a)vehicularisusNulla.ca&lt;/email&gt; + </person> + <person> + <name>Price</name> + <surname>Lyons</surname> + <email&gt;magna(a)habitantmorbi.org&lt;/email&gt; + </person> + <person> + <name>Logan</name> + <surname>Sharp</surname> + <email&gt;In.at.pede(a)auctorodio.org&lt;/email&gt; + </person> + <person> + <name>Marvin</name> + <surname>Ramirez</surname> + <email&gt;Donec.tincidunt(a)et.edu&lt;/email&gt; + </person> + <person> + <name>Briar</name> + <surname>Short</surname> + <email&gt;nunc.interdum.feugiat(a)sedhendrerit.ca&lt;/email&gt; + </person> + <person> + <name>Flynn</name> + <surname>York</surname> + <email&gt;non.nisi(a)purusmauris.org&lt;/email&gt; + </person> + <person> + <name>Benjamin</name> + <surname>Stevenson</surname> + <email&gt;consectetuer(a)Aeneaneuismodmauris.org&lt;/email&gt; + </person> + <person> + <name>Dieter</name> + <surname>Nicholson</surname> + <email&gt;risus(a)enimgravida.org&lt;/email&gt; + </person> + <person> + <name>Lacy</name> + <surname>Baker</surname> + <email&gt;eu.neque.pellentesque(a)duiFuscealiquam.com&lt;/email&gt; + </person> + <person> + <name>Kaseem</name> + <surname>Holder</surname> + <email&gt;non.quam(a)Loremipsum.ca&lt;/email&gt; + </person> + <person> + <name>Yeo</name> + <surname>Sanchez</surname> + <email&gt;nisi.a(a)Namnullamagna.ca&lt;/email&gt; + </person> + <person> + <name>Heidi</name> + <surname>Black</surname> + <email&gt;tempus(a)faucibuslectusa.org&lt;/email&gt; + </person> + <person> + <name>Cameron</name> + <surname>Vang</surname> + <email&gt;turpis(a)tinciduntnuncac.com&lt;/email&gt; + </person> + <person> + <name>Ryan</name> + <surname>Harris</surname> + <email&gt;nec.ligula.consectetuer(a)risusInmi.edu&lt;/email&gt; + </person> + <person> + <name>Debra</name> + <surname>Cortez</surname> + <email&gt;luctus(a)pede.com&lt;/email&gt; + </person> + <person> + <name>Neville</name> + <surname>Mcintyre</surname> + <email&gt;egestas(a)placeratvelitQuisque.ca&lt;/email&gt; + </person> + <person> + <name>Hope</name> + <surname>Romero</surname> + <email&gt;dignissim.tempor(a)nonmagnaNam.com&lt;/email&gt; + </person> + <person> + <name>Mechelle</name> + <surname>Kidd</surname> + <email&gt;orci.Ut.sagittis(a)nonenimcommodo.ca&lt;/email&gt; + </person> + <person> + <name>Nora</name> + <surname>Rivera</surname> + <email&gt;gravida(a)consequatdolorvitae.edu&lt;/email&gt; + </person> + <person> + <name>Zeph</name> + <surname>Snyder</surname> + <email&gt;Donec.est(a)enimEtiam.ca&lt;/email&gt; + </person> + <person> + <name>Britanni</name> + <surname>Williamson</surname> + <email&gt;nulla.ante(a)sempereratin.edu&lt;/email&gt; + </person> + <person> + <name>Jermaine</name> + <surname>Jones</surname> + <email&gt;sapien.Aenean(a)Quisquenonummyipsum.org&lt;/email&gt; + </person> + <person> + <name>Steel</name> + <surname>Newton</surname> + <email&gt;cursus.et(a)Curabiturut.org&lt;/email&gt; + </person> + <person> + <name>Hyatt</name> + <surname>Manning</surname> + <email&gt;eget.massa.Suspendisse(a)aptenttaciti.edu&lt;/email&gt; + </person> + <person> + <name>Stone</name> + <surname>Sloan</surname> + <email&gt;adipiscing.elit.Curabitur(a)estvitaesodales.org&lt;/email&gt; + </person> + <person> + <name>Lewis</name> + <surname>Guthrie</surname> + <email&gt;neque.Nullam(a)Nuncpulvinararcu.edu&lt;/email&gt; + </person> + <person> + <name>Sandra</name> + <surname>Cannon</surname> + <email&gt;lobortis.nisi.nibh(a)luctuslobortisClass.com&lt;/email&gt; + </person> + <person> + <name>Daria</name> + <surname>Page</surname> + <email&gt;Aenean.sed.pede(a)facilisis.edu&lt;/email&gt; + </person> + <person> + <name>Mohammad</name> + <surname>Soto</surname> + <email&gt;blandit(a)aliquamarcuAliquam.org&lt;/email&gt; + </person> + <person> + <name>Kerry</name> + <surname>Lowery</surname> + <email&gt;vitae(a)mauriserateget.edu&lt;/email&gt; + </person> + <person> + <name>Quinlan</name> + <surname>Roy</surname> + <email&gt;est.ac(a)mollisvitaeposuere.com&lt;/email&gt; + </person> + <person> + <name>Patricia</name> + <surname>Kirkland</surname> + <email&gt;ipsum.dolor(a)orci.org&lt;/email&gt; + </person> + <person> + <name>Janna</name> + <surname>Banks</surname> + <email&gt;id.mollis.nec(a)eteuismodet.org&lt;/email&gt; + </person> + <person> + <name>Lucius</name> + <surname>William</surname> + <email&gt;sem(a)Nullamlobortis.com&lt;/email&gt; + </person> + <person> + <name>Ira</name> + <surname>Buck</surname> + <email&gt;pede.nonummy(a)dapibusgravidaAliquam.ca&lt;/email&gt; + </person> + <person> + <name>Shellie</name> + <surname>Charles</surname> + <email&gt;est(a)lobortisultricesVivamus.org&lt;/email&gt; + </person> + <person> + <name>Stewart</name> + <surname>Cabrera</surname> + <email&gt;libero(a)feugiat.com&lt;/email&gt; + </person> + <person> + <name>April</name> + <surname>Sheppard</surname> + <email&gt;sit(a)seddictumeleifend.ca&lt;/email&gt; + </person> + <person> + <name>Gail</name> + <surname>Rollins</surname> + <email&gt;odio(a)Proinnonmassa.ca&lt;/email&gt; + </person> + <person> + <name>Ross</name> + <surname>Levy</surname> + <email&gt;sit.amet.ultricies(a)Quisqueliberolacus.com&lt;/email&gt; + </person> + <person> + <name>Hadley</name> + <surname>Mccormick</surname> + <email&gt;vitae.posuere.at(a)enimnonnisi.org&lt;/email&gt; + </person> + <person> + <name>Susan</name> + <surname>Banks</surname> + <email&gt;interdum(a)nislsemconsequat.org&lt;/email&gt; + </person> + <person> + <name>Nash</name> + <surname>Nolan</surname> + <email&gt;convallis.dolor(a)enimSed.ca&lt;/email&gt; + </person> + <person> + <name>Gretchen</name> + <surname>Carson</surname> + <email&gt;elit.dictum.eu(a)temporarcuVestibulum.ca&lt;/email&gt; + </person> + <person> + <name>Harper</name> + <surname>Hull</surname> + <email&gt;eget(a)imperdiet.edu&lt;/email&gt; + </person> + <person> + <name>Porter</name> + <surname>Benson</surname> + <email&gt;tempus.non(a)Aenean.org&lt;/email&gt; + </person> + <person> + <name>Xenos</name> + <surname>Tate</surname> + <email&gt;blandit(a)antebibendum.org&lt;/email&gt; + </person> + <person> + <name>Ali</name> + <surname>Carver</surname> + <email&gt;Nulla.aliquet(a)ornare.org&lt;/email&gt; + </person> + <person> + <name>Zachery</name> + <surname>Shepherd</surname> + <email&gt;vitae.erat(a)sed.edu&lt;/email&gt; + </person> + <person> + <name>Garrett</name> + <surname>Leach</surname> + <email&gt;risus(a)quisurna.org&lt;/email&gt; + </person> + <person> + <name>Mufutau</name> + <surname>Greer</surname> + <email&gt;bibendum(a)luctus.com&lt;/email&gt; + </person> + <person> + <name>Ryan</name> + <surname>Bryant</surname> + <email&gt;turpis(a)purus.edu&lt;/email&gt; + </person> + <person> + <name>Lacey</name> + <surname>Riley</surname> + <email&gt;sed.turpis.nec(a)molestieSed.ca&lt;/email&gt; + </person> + <person> + <name>Tiger</name> + <surname>Ryan</surname> + <email&gt;lorem(a)vel.com&lt;/email&gt; + </person> + <person> + <name>Upton</name> + <surname>Sullivan</surname> + <email&gt;amet(a)Proin.com&lt;/email&gt; + </person> + <person> + <name>Juliet</name> + <surname>Tate</surname> + <email&gt;pede.Cum(a)eu.edu&lt;/email&gt; + </person> + <person> + <name>Dieter</name> + <surname>Bowman</surname> + <email&gt;lorem.eu(a)pellentesqueegetdictum.com&lt;/email&gt; + </person> + <person> + <name>Jelani</name> + <surname>Knapp</surname> + <email&gt;Nulla(a)Morbi.org&lt;/email&gt; + </person> + <person> + <name>Martena</name> + <surname>Leblanc</surname> + <email&gt;arcu.Vestibulum.ut(a)quamquis.edu&lt;/email&gt; + </person> + <person> + <name>Megan</name> + <surname>Hull</surname> + <email&gt;eu.nulla(a)amalesuada.com&lt;/email&gt; + </person> + <person> + <name>Ginger</name> + <surname>Mcpherson</surname> + <email&gt;dui.augue(a)Innecorci.com&lt;/email&gt; + </person> + <person> + <name>Kylan</name> + <surname>Gilmore</surname> + <email&gt;urna.Ut.tincidunt(a)aliquetsemut.com&lt;/email&gt; + </person> + <person> + <name>Carlos</name> + <surname>King</surname> + <email&gt;fermentum(a)lacus.com&lt;/email&gt; + </person> + <person> + <name>Irma</name> + <surname>Blake</surname> + <email&gt;Aliquam.nec(a)adipiscingelit.com&lt;/email&gt; + </person> + <person> + <name>Tad</name> + <surname>Allen</surname> + <email&gt;rhoncus.Proin.nisl(a)vehiculaaliquet.ca&lt;/email&gt; + </person> + <person> + <name>Fiona</name> + <surname>Kline</surname> + <email&gt;risus(a)gravidasagittisDuis.ca&lt;/email&gt; + </person> + <person> + <name>Nell</name> + <surname>Franco</surname> + <email&gt;blandit(a)viverraMaecenasiaculis.org&lt;/email&gt; + </person> + <person> + <name>Scarlet</name> + <surname>Hall</surname> + <email&gt;tincidunt(a)Nullamsuscipit.com&lt;/email&gt; + </person> + <person> + <name>Zane</name> + <surname>Mccray</surname> + <email&gt;volutpat.Nulla(a)malesuadafringilla.edu&lt;/email&gt; + </person> + <person> + <name>Connor</name> + <surname>Salas</surname> + <email&gt;Sed.nulla.ante(a)eu.com&lt;/email&gt; + </person> + <person> + <name>Carlos</name> + <surname>Hunt</surname> + <email&gt;Nam(a)nequevenenatislacus.org&lt;/email&gt; + </person> + <person> + <name>Lane</name> + <surname>Andrews</surname> + <email&gt;a.sollicitudin(a)inconsequat.org&lt;/email&gt; + </person> + <person> + <name>Shana</name> + <surname>Ballard</surname> + <email&gt;elementum(a)nibhlacinia.org&lt;/email&gt; + </person> + <person> + <name>Conan</name> + <surname>Bradshaw</surname> + <email&gt;vel.arcu.Curabitur(a)eratnonummyultricies.ca&lt;/email&gt; + </person> + <person> + <name>Colleen</name> + <surname>Brooks</surname> + <email&gt;erat.volutpat(a)cubiliaCurae;.edu&lt;/email&gt; + </person> + <person> + <name>Francis</name> + <surname>Hardy</surname> + <email&gt;sit.amet.luctus(a)dignissimlacus.com&lt;/email&gt; + </person> + <person> + <name>Reuben</name> + <surname>Rodriguez</surname> + <email&gt;natoque.penatibus.et(a)euaccumsansed.com&lt;/email&gt; + </person> + <person> + <name>Iris</name> + <surname>Reid</surname> + <email&gt;sed(a)Quisquepurussapien.edu&lt;/email&gt; + </person> + <person> + <name>Phillip</name> + <surname>Schmidt</surname> + <email&gt;ut(a)tortornibhsit.com&lt;/email&gt; + </person> + <person> + <name>Jonas</name> + <surname>Crane</surname> + <email&gt;ac.mi(a)luctusCurabitur.org&lt;/email&gt; + </person> + <person> + <name>Abbot</name> + <surname>Terry</surname> + <email&gt;fringilla(a)Crasconvallisconvallis.com&lt;/email&gt; + </person> +</persons> + \ No newline at end of file Modified: branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -265,6 +265,10 @@ <id>dataTableEdit</id> <name>Data Table Edit</name> </sample> + <sample new="true"> + <id>arrangeableModel</id> + <name>Arrangeable Model Sample</name> + </sample> </samples> </demo> <demo> Deleted: branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdocon... - - <persistence-manager-factory name="transactions-optional"> - <property name="javax.jdo.PersistenceManagerFactoryClass" - value="org.datanucleus.store.appengine.jdo.DatastoreJDOPersistenceManagerFactory"/> - <property name="javax.jdo.option.ConnectionURL" value="appengine"/> - <property name="javax.jdo.option.NontransactionalRead" value="true"/> - <property name="javax.jdo.option.NontransactionalWrite" value="true"/> - <property name="javax.jdo.option.RetainValues" value="true"/> - <property name="datanucleus.appengine.autoCreateDatastoreTxns" value="true"/> - </persistence-manager-factory> -</jdoconfig> Deleted: branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="transactions-optional"> - <provider>org.datanucleus.store.appengine.jpa.DatastorePersistenceProvider</provider> - <properties> - <property name="datanucleus.NontransactionalRead" value="true"/> - <property name="datanucleus.NontransactionalWrite" value="true"/> - <property name="datanucleus.ConnectionURL" value="appengine"/> - </properties> - </persistence-unit> - -</persistence> \ No newline at end of file Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/WEB-INF/faces-config.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/WEB-INF/faces-config.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -3,13 +3,9 @@ <faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> - <application> - <!-- system-event-listener> - <system-event-listener-class>org.richfaces.resource.MapBasedResourceCodecListener</system-event-listener-class> - <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class> - </system-event-listener --> - </application> - + <factory> + <lifecycle-factory>org.richfaces.demo.arrangeablemodel.PersistenceLifecycleFactory</lifecycle-factory> + </factory> <managed-bean> <managed-bean-name>opBean1</managed-bean-name> <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/arrangeableModel.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/arrangeableModel.xhtml (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/arrangeableModel.xhtml 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,11 @@ +<!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"> + +<ui:composition> + <p>DESC</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> +</ui:composition> +</html> Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/arrangeableModel-sample.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/arrangeableModel-sample.xhtml (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/arrangeableModel-sample.xhtml 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition 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" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <rich:dataTable keepSaved="true" id="richTable" var="record" value="#{personBean.dataModel}" rows="20"> + <ui:include src="jpaColumn.xhtml"> + <ui:param name="bean" value="#{personBean}" /> + <ui:param name="property" value="name" /> + </ui:include> + <ui:include src="jpaColumn.xhtml"> + <ui:param name="bean" value="#{personBean}" /> + <ui:param name="property" value="surname" /> + </ui:include> + <ui:include src="jpaColumn.xhtml"> + <ui:param name="bean" value="#{personBean}" /> + <ui:param name="property" value="email" /> + </ui:include> + + <f:facet name="footer"> + <rich:dataScroller id="scroller" /> + </f:facet> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/jpaColumn.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/jpaColumn.xhtml (rev 0) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/jpaColumn.xhtml 2011-04-27 11:15:12 UTC (rev 22443) @@ -0,0 +1,31 @@ +<!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" + xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:c="http://java.sun.com/jsp/jstl/core"> +<ui:composition> + <rich:column sortBy="#{property}" + sortOrder="#{bean.sortOrders[property]}" + filterValue="#{bean.filterValues[property]}" + filterExpression="#{property}"> + + <f:facet name="header"> + <h:commandLink style="color: white;" action="#{bean.toggleSort}"> + #{bean.sortOrders[property]} + <a4j:ajax render="richTable" /> + <f:setPropertyActionListener target="#{bean.sortProperty}" value="#{property}" /> + </h:commandLink> + <br /> + <h:inputText value="#{bean.filterValues[property]}"> + <a4j:ajax render="richTable@body scroller" event="keyup" /> + </h:inputText> + </f:facet> + + <h:outputText value="#{record[property]}" /> + </rich:column> +</ui:composition> +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> <application>richfaces-showcase</application> - <version>42</version> + <version>49</version> <sessions-enabled>true</sessions-enabled> <system-properties> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/faces-config.xml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/faces-config.xml 2011-04-26 15:33:37 UTC (rev 22442) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/faces-config.xml 2011-04-27 11:15:12 UTC (rev 22443) @@ -1,256 +1,260 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - version="2.0" metadata-complete="true"> - - <application> - <!-- system-event-listener> - <system-event-listener-class>org.richfaces.resource.MapBasedResourceCodecListener</system-event-listener-class> - <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class> - </system-event-listener --> - </application> - +<?xml version="1.0" encoding="UTF-8"?> +<faces-config metadata-complete="true" version="2.0" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude" + 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-facesconfig_2_0.xsd"> <component> <component-type>syntaxHighlighter</component-type> <component-class>org.richfaces.demo.components.sh.SyntaxHighlighter</component-class> - </component> - - <managed-bean> - <managed-bean-name>functionBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.function.FunctionBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>validationBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.validation.ValidationBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>passwordValidationBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.validation.PasswordValidationBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>mediaData</managed-bean-name> - <managed-bean-class>org.richfaces.demo.mediaOutput.MediaData</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>mediaBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.mediaOutput.MediaBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>pollBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.poll.PollBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>profile</managed-bean-name> - <managed-bean-class>org.richfaces.demo.togglepanel.Profile</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>progressBarBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.progressBar.ProgressBarBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>tooltipData</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tooltip.TooltipData</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>calendarBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>calendarModel</managed-bean-name> - <managed-bean-class>org.richfaces.demo.calendar.model.CalendarModel</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>queueBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.queue.QueueBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>regionBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.region.RegionBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>autocompleteBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.autocomplete.AutocompleteBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>capitals</property-name> - <value>#{capitalsParser.capitalsList}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>inplaceSelectBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.inplaces.InplaceSelectBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>capitals</property-name> - <value>#{capitalsParser.capitalsList}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>panelMenuBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.panelmenu.PanelMenuBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>capitalsBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.CapitalsBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>capitals</property-name> - <value>#{capitalsParser.capitalsList}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>carsBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.CarsBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>carsFilteringBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.CarsFilteringBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>capitalsSortingBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.CapitalsSortingBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>extTableSelectionBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.ExtTableSelectionBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - <managed-property> - <property-name>inventoryItems</property-name> - <value>#{carsBean.allInventoryItems}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>capitalsParser</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.model.capitals.CapitalsParser</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>slidesBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.SlidesBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>reportBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tables.ReportBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>paramBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.param.ParamBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>toolBarBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.toolbar.ToolBarBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>userBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.UserBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>demoNavigator</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.navigation.DemoNavigator</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>groups</property-name> - <value>#{navigationParser.groupsList}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>navigationParser</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.navigation.NavigationParser</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>selectsBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.SelectsBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>skinBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.SkinBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>skin</property-name> - <value>blueSky</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>listBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.lists.ListBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>fileUploadBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.fileupload.FileUploadBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>dragDropBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.dragdrop.DragDropBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>dragDropEventBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.dragdrop.DragDropEventBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>dragDropBean</property-name> - <value>#{dragDropBean}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>dropDownMenuBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.dropdownmenu.DropDownMenuBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>cdsParser</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.CDParser</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>fileSystemBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.adaptors.FileSystemBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>treeBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.TreeBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>cdXmlDescriptors</property-name> - <value>#{cdsParser.cdsList}</value> - </managed-property> - </managed-bean> - - <managed-bean> - <managed-bean-name>opBean1</managed-bean-name> - <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>opBean2</managed-bean-name> - <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> + </component> + <managed-bean> + <managed-bean-name>personBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.arrangeablemodel.PersonBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean eager="true"> + <managed-bean-name>persistenceService</managed-bean-name> + <managed-bean-class>org.richfaces.demo.arrangeablemodel.PersistenceService</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>functionBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.function.FunctionBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>validationBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.validation.ValidationBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>passwordValidationBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.validation.PasswordValidationBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>mediaData</managed-bean-name> + <managed-bean-class>org.richfaces.demo.mediaOutput.MediaData</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>mediaBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.mediaOutput.MediaBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>pollBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.poll.PollBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>profile</managed-bean-name> + <managed-bean-class>org.richfaces.demo.togglepanel.Profile</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>progressBarBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.progressBar.ProgressBarBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>tooltipData</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tooltip.TooltipData</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>calendarBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>calendarModel</managed-bean-name> + <managed-bean-class>org.richfaces.demo.calendar.model.CalendarModel</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>queueBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.queue.QueueBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>regionBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.region.RegionBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>autocompleteBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.autocomplete.AutocompleteBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>capitals</property-name> + <value>#{capitalsParser.capitalsList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>inplaceSelectBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.inplaces.InplaceSelectBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>capitals</property-name> + <value>#{capitalsParser.capitalsList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>panelMenuBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.panelmenu.PanelMenuBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>capitalsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.CapitalsBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>capitals</property-name> + <value>#{capitalsParser.capitalsList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>carsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.CarsBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>carsFilteringBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.CarsFilteringBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>capitalsSortingBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.CapitalsSortingBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>extTableSelectionBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.ExtTableSelectionBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + <managed-property> + <property-name>inventoryItems</property-name> + <value>#{carsBean.allInventoryItems}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>capitalsParser</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.model.capitals.CapitalsParser</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>slidesBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.SlidesBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>reportBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tables.ReportBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>paramBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.param.ParamBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>toolBarBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.toolbar.ToolBarBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>userBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.UserBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>demoNavigator</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.navigation.DemoNavigator</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>groups</property-name> + <value>#{navigationParser.groupsList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>navigationParser</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.navigation.NavigationParser</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>selectsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.SelectsBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>skinBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.SkinBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>skin</property-name> + <value>blueSky</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>listBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.lists.ListBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>fileUploadBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.fileupload.FileUploadBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>dragDropBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.dragdrop.DragDropBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>dragDropEventBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.dragdrop.DragDropEventBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>dragDropBean</property-name> + <value>#{dragDropBean}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>dropDownMenuBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.dropdownmenu.DropDownMenuBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>cdsParser</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.CDParser</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>fileSystemBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.adaptors.FileSystemBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>treeBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.TreeBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>cdXmlDescriptors</property-name> + <value>#{cdsParser.cdsList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>opBean1</managed-bean-name> + <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>opBean2</managed-bean-name> + <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <factory> + <lifecycle-factory>org.richfaces.demo.arrangeablemodel.PersistenceLifecycleFactory</lifecycle-factory> + </factory> </faces-config>