Author: nbelaevski Date: 2010-08-31 13:45:24 -0400 (Tue, 31 Aug 2010) New Revision: 19053 Added: branches/RF-7560/core/api/src/main/java/org/richfaces/application/CoreMessages.java branches/RF-7560/core/api/src/main/java/org/richfaces/l10n/ branches/RF-7560/core/api/src/main/java/org/richfaces/log/JavaLogger.java branches/RF-7560/core/api/src/main/java/org/richfaces/log/LogFactory.java branches/RF-7560/core/api/src/main/java/org/richfaces/log/Logger.java branches/RF-7560/core/api/src/test/java/org/richfaces/l10n/ branches/RF-7560/core/api/src/test/java/org/richfaces/log/ branches/RF-7560/core/api/src/test/resources/ branches/RF-7560/core/api/src/test/resources/org/ branches/RF-7560/core/api/src/test/resources/org/richfaces/ branches/RF-7560/core/api/src/test/resources/org/richfaces/l10n/ branches/RF-7560/core/api/src/test/resources/org/richfaces/log/ branches/RF-7560/core/impl/src/test/java/org/richfaces/application/FacesMessages.java branches/RF-7560/core/impl/src/test/resources/org/richfaces/application/FacesMessages.properties branches/RF-7560/ui/common/api/src/main/java/org/richfaces/appplication/ branches/RF-7560/ui/common/api/src/main/java/org/richfaces/appplication/FacesMessages.java Removed: branches/RF-7560/core/commons/ Modified: branches/RF-7560/bom/pom.xml branches/RF-7560/core/api/pom.xml branches/RF-7560/core/impl/pom.xml branches/RF-7560/core/pom.xml branches/RF-7560/dist/pom.xml branches/RF-7560/dist/readme-ui.txt branches/RF-7560/ui/dist/richfaces-components-api/pom.xml branches/RF-7560/ui/dist/richfaces-components-ui/pom.xml branches/RF-7560/ui/output/ui/pom.xml Log: RF-7560 Modified: branches/RF-7560/bom/pom.xml =================================================================== --- branches/RF-7560/bom/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/bom/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -46,11 +46,6 @@ <dependencies> <!-- Project Versions --> <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> <version>${project.version}</version> Modified: branches/RF-7560/core/api/pom.xml =================================================================== --- branches/RF-7560/core/api/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/core/api/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -36,12 +36,6 @@ </description> <dependencies> - <!-- Runtime dependencies --> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> - <!-- Provided dependencies --> <dependency> <groupId>javax.el</groupId> Copied: branches/RF-7560/core/api/src/main/java/org/richfaces/application/CoreMessages.java (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/application/CoreMessages.java) =================================================================== --- branches/RF-7560/core/api/src/main/java/org/richfaces/application/CoreMessages.java (rev 0) +++ branches/RF-7560/core/api/src/main/java/org/richfaces/application/CoreMessages.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.application; + +import org.richfaces.l10n.MessageBundle; + + +/** + * @author Nick Belaevski + * + */ +@MessageBundle(baseName = "org.richfaces.Messages") +public final class CoreMessages { + + private CoreMessages() {} + +} Copied: branches/RF-7560/core/api/src/main/java/org/richfaces/l10n (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/l10n) Copied: branches/RF-7560/core/api/src/main/java/org/richfaces/log/JavaLogger.java (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/log/JavaLogger.java) =================================================================== --- branches/RF-7560/core/api/src/main/java/org/richfaces/log/JavaLogger.java (rev 0) +++ branches/RF-7560/core/api/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,253 @@ +/* + * $Id: JavaLogger.java 16812 2010-04-26 20:43:19Z alexsmirnov $ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.log; + +import java.util.EnumMap; +import java.util.Locale; +import java.util.Map; +import java.util.logging.LogRecord; + +import org.richfaces.l10n.BundleLoader; +import org.richfaces.l10n.InterpolationException; +import org.richfaces.l10n.MessageInterpolator; + + + + +/** + * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p> + * + * @author asmirnov(a)exadel.com + * @author nick + */ +public class JavaLogger implements Logger { + + public static final String RICHFACES_LOG = "org.richfaces"; + + static final Map<Level, java.util.logging.Level> LEVELS_MAP = + new EnumMap<Level, java.util.logging.Level>(Level.class); + + static { + LEVELS_MAP.put(Level.ERROR, java.util.logging.Level.SEVERE); + LEVELS_MAP.put(Level.INFO, java.util.logging.Level.INFO); + LEVELS_MAP.put(Level.WARNING, java.util.logging.Level.WARNING); + LEVELS_MAP.put(Level.DEBUG, java.util.logging.Level.FINE); + } + + private static final String CLASS_NAME = JavaLogger.class.getName(); + + private final java.util.logging.Logger jdkLogger; + + private MessageInterpolator messageInterpolator; + + JavaLogger(String category) { + jdkLogger = java.util.logging.Logger.getLogger(category); + messageInterpolator = new MessageInterpolator(new BundleLoader()); + } + + JavaLogger() { + this(RICHFACES_LOG); + } + + private void fillCallerData(String fqn, LogRecord record) { + StackTraceElement[] stackTrace = new Exception().getStackTrace(); + + int i = 0; + + for (; i < stackTrace.length; i++) { + if (fqn.equals(stackTrace[i].getClassName())) { + break; + } + } + + int idx = i + 1; + + for (; idx < stackTrace.length; idx++) { + if (!fqn.equals(stackTrace[idx].getClassName())) { + break; + } + } + + if (idx < stackTrace.length) { + record.setSourceMethodName(stackTrace[idx].getMethodName()); + record.setSourceClassName(stackTrace[idx].getClassName()); + } + } + + private String interpolate(Enum<?> messageKey, Object... args) { + try { + return messageInterpolator.interpolate(Locale.getDefault(), messageKey, args); + } catch (InterpolationException e) { + return "???" + e.getMessageKey() + "???"; + } + } + + private LogRecord createRecord(java.util.logging.Level level, CharSequence message, Throwable thrown) { + // millis and thread are filled by the constructor + LogRecord record = new LogRecord(level, message != null ? message.toString() : null); + + //TODO resource bundle? + record.setLoggerName(jdkLogger.getName()); + record.setThrown(thrown); + fillCallerData(CLASS_NAME, record); + + return record; + } + + public boolean isDebugEnabled() { + return isLogEnabled(Level.DEBUG); + } + + public void debug(CharSequence content) { + log(Level.DEBUG, content); + } + + public void debug(Enum<?> messageKey, Object... args) { + log(Level.DEBUG, messageKey, args); + } + + public void debug(CharSequence content, Throwable thrown) { + log(Level.DEBUG, content, thrown); + } + + public void debug(Throwable error, Enum<?> messageKey, Object... args) { + log(Level.DEBUG, error, messageKey, args); + } + + public void debug(Throwable thrown) { + log(Level.DEBUG, thrown); + } + + public boolean isInfoEnabled() { + return isLogEnabled(Level.INFO); + } + + public void info(CharSequence content) { + log(Level.INFO, content); + } + + public void info(Enum<?> messageKey, Object... args) { + log(Level.INFO, messageKey, args); + } + + public void info(CharSequence content, Throwable thrown) { + log(Level.INFO, content, thrown); + } + + public void info(Throwable error, Enum<?> messageKey, Object... args) { + log(Level.INFO, error, messageKey, args); + } + + public void info(Throwable thrown) { + log(Level.INFO, thrown); + } + + public boolean isWarnEnabled() { + return isLogEnabled(Level.WARNING); + } + + public void warn(CharSequence content) { + log(Level.WARNING, content); + } + + public void warn(Enum<?> messageKey, Object... args) { + log(Level.WARNING, messageKey, args); + } + + public void warn(CharSequence content, Throwable thrown) { + log(Level.WARNING, content, thrown); + } + + public void warn(Throwable error, Enum<?> messageKey, Object... args) { + log(Level.WARNING, error, messageKey, args); + } + + public void warn(Throwable thrown) { + log(Level.WARNING, thrown); + } + + public boolean isErrorEnabled() { + return isLogEnabled(Level.ERROR); + } + + public void error(CharSequence content) { + log(Level.ERROR, content); + } + + public void error(Enum<?> messageKey, Object... args) { + log(Level.ERROR, messageKey, args); + } + + public void error(CharSequence content, Throwable thrown) { + log(Level.ERROR, content, thrown); + } + + public void error(Throwable error, Enum<?> messageKey, Object... args) { + log(Level.ERROR, error, messageKey, args); + } + + public void error(Throwable thrown) { + log(Level.ERROR, thrown); + } + + public boolean isLogEnabled(Level level) { + return jdkLogger.isLoggable(LEVELS_MAP.get(level)); + } + + public void log(Level level, CharSequence content) { + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, content, null)); + } + } + + public void log(Level level, Enum<?> messageKey, Object... args) { + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, interpolate(messageKey, args), null)); + } + } + + public void log(Level level, CharSequence content, Throwable thrown) { + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, content, thrown)); + } + } + + public void log(Level level, Throwable thrown, Enum<?> messageKey, Object... args) { + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, interpolate(messageKey, args), thrown)); + } + } + + public void log(Level level, Throwable thrown) { + java.util.logging.Level julLevel = LEVELS_MAP.get(level); + if (jdkLogger.isLoggable(julLevel)) { + jdkLogger.log(createRecord(julLevel, null, thrown)); + } + } + +} Copied: branches/RF-7560/core/api/src/main/java/org/richfaces/log/LogFactory.java (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/log/LogFactory.java) =================================================================== --- branches/RF-7560/core/api/src/main/java/org/richfaces/log/LogFactory.java (rev 0) +++ branches/RF-7560/core/api/src/main/java/org/richfaces/log/LogFactory.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.log; + + +/** + * <p class="changed_added_4_0">This class produces loggers used by whole RichFaces library.</p> + * @author asmirnov(a)exadel.com + * + */ +public final class LogFactory { + + private static final Logger DEFAULT_LOGGER = new JavaLogger(); + + private LogFactory(){ + // This class is not instantiable. + } + + + /** + * <p class="changed_added_4_0">This method creates default logger.</p> + * @return + */ + public static Logger getLogger(){ + return DEFAULT_LOGGER; + } + + /** + * <p class="changed_added_4_0">This method produces logger instance for given category.</p> + * @param category + * @return + */ + public static Logger getLogger(String category){ + return new JavaLogger(category); + } + + public static Logger getLogger(Class<?> clazz){ + return getLogger(clazz.getName()); + } + +} Copied: branches/RF-7560/core/api/src/main/java/org/richfaces/log/Logger.java (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/log/Logger.java) =================================================================== --- branches/RF-7560/core/api/src/main/java/org/richfaces/log/Logger.java (rev 0) +++ branches/RF-7560/core/api/src/main/java/org/richfaces/log/Logger.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,311 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.log; + +/** + * That interface hides current logging system from classes. Concrete implementation should provide appropriate logger + * instance that delegates messages to the current log system. + * + * @author shura + */ +public interface Logger { + + public enum Level { + DEBUG, + INFO, + WARNING, + ERROR + } + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @return + */ + public boolean isDebugEnabled(); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + */ + public void debug(CharSequence content); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param messageKey + * @param args + */ + public void debug(Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + * @param error + */ + public void debug(CharSequence content, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + * @param messageKey + * @param args + */ + public void debug(Throwable error, Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + */ + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + */ + public void debug(Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @return + */ + public boolean isInfoEnabled(); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + */ + public void info(CharSequence content); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param messageKey + * @param args + */ + public void info(Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + * @param error + */ + public void info(CharSequence content, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + * @param messageKey + * @param args + */ + public void info(Throwable error, Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + */ + public void info(Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @return + */ + public boolean isWarnEnabled(); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + */ + public void warn(CharSequence content); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param messageKey + * @param args + */ + public void warn(Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + * @param error + */ + public void warn(CharSequence content, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + * @param messageKey + * @param args + */ + public void warn(Throwable error, Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + */ + public void warn(Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @return + */ + public boolean isErrorEnabled(); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + */ + public void error(CharSequence content); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param messageKey + * @param args + */ + public void error(Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param content + * @param error + */ + public void error(CharSequence content, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + * @param messageKey + * @param args + */ + public void error(Throwable error, Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param error + */ + public void error(Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @return + */ + public boolean isLogEnabled(Level level); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @param content + */ + public void log(Level level, CharSequence content); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @param content + * @param error + */ + public void log(Level level, CharSequence content, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @param error + */ + public void log(Level level, Throwable error); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @param messageKey + * @param args + */ + public void log(Level level, Enum<?> messageKey, Object... args); + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param level + * @param error + * @param messageKey + * @param args + */ + public void log(Level level, Throwable error, Enum<?> messageKey, Object... args); + +} Copied: branches/RF-7560/core/api/src/test/java/org/richfaces/l10n (from rev 19051, branches/RF-7560/core/commons/src/test/java/org/richfaces/l10n) Copied: branches/RF-7560/core/api/src/test/java/org/richfaces/log (from rev 19051, branches/RF-7560/core/commons/src/test/java/org/richfaces/log) Copied: branches/RF-7560/core/api/src/test/resources/org/richfaces/l10n (from rev 19051, branches/RF-7560/core/commons/src/test/resources/org/richfaces/l10n) Copied: branches/RF-7560/core/api/src/test/resources/org/richfaces/log (from rev 19051, branches/RF-7560/core/commons/src/test/resources/org/richfaces/log) Modified: branches/RF-7560/core/impl/pom.xml =================================================================== --- branches/RF-7560/core/impl/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/core/impl/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -40,10 +40,6 @@ <artifactId>richfaces-core-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> - <dependency> <groupId>net.sourceforge.cssparser</groupId> <artifactId>cssparser</artifactId> </dependency> Added: branches/RF-7560/core/impl/src/test/java/org/richfaces/application/FacesMessages.java =================================================================== --- branches/RF-7560/core/impl/src/test/java/org/richfaces/application/FacesMessages.java (rev 0) +++ branches/RF-7560/core/impl/src/test/java/org/richfaces/application/FacesMessages.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.application; + +import org.richfaces.l10n.MessageBundle; + +/** + * @author Nick Belaevski + * + */ +@MessageBundle(baseName = "org.richfaces.application.FacesMessages") +public enum FacesMessages { + + UIINPUT_CONVERSION("javax.faces.component.UIInput.CONVERSION"), + ENUM_CONVERTER_ENUM("javax.faces.converter.EnumConverter.ENUM"), + CONVERTER_STRING("javax.faces.converter.STRING"); + + private String key; + + private FacesMessages(String key) { + this.key = key; + } + + @Override + public String toString() { + return key; + } +} Added: branches/RF-7560/core/impl/src/test/resources/org/richfaces/application/FacesMessages.properties =================================================================== --- branches/RF-7560/core/impl/src/test/resources/org/richfaces/application/FacesMessages.properties (rev 0) +++ branches/RF-7560/core/impl/src/test/resources/org/richfaces/application/FacesMessages.properties 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,4 @@ +javax.faces.component.UIInput.CONVERSION={0}: Conversion error occurred. +javax.faces.converter.STRING={1}: Could not convert ''{0}'' to a string. +javax.faces.converter.EnumConverter.ENUM={2}: ''{0}'' must be convertible to an enum. +javax.faces.converter.EnumConverter.ENUM_detail={2}: ''{0}'' must be convertible to an enum from the enum that contains the constant ''{1}''. \ No newline at end of file Modified: branches/RF-7560/core/pom.xml =================================================================== --- branches/RF-7560/core/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/core/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -38,7 +38,6 @@ <modules> <module>parent</module> - <module>commons</module> <module>api</module> <module>impl</module> </modules> Modified: branches/RF-7560/dist/pom.xml =================================================================== --- branches/RF-7560/dist/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/dist/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -55,10 +55,6 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> <!-- Examples --> <dependency> @@ -89,7 +85,7 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> <configuration> - <includeGroupIds>org.richfaces.core,org.richfaces.commons,org.richfaces.ui</includeGroupIds> + <includeGroupIds>org.richfaces.core,org.richfaces.ui</includeGroupIds> </configuration> <executions> <execution> Modified: branches/RF-7560/dist/readme-ui.txt =================================================================== --- branches/RF-7560/dist/readme-ui.txt 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/dist/readme-ui.txt 2010-08-31 17:45:24 UTC (rev 19053) @@ -8,14 +8,13 @@ ------------------------------- 1) Put RichFaces libraries and its dependencies in your application libraries folder: - 1.1) richfaces-commons-api-4.0.0.20100824-M2.jar - 1.2) richfaces-core-api-4.0.0.20100824-M2.jar - 1.3) richfaces-core-impl-4.0.0.20100824-M2.jar - 1.4) richfaces-components-api-4.0.0.20100824-M2.jar - 1.5) richfaces-components-ui-4.0.0.20100824-M2.jar - 1.6) sac-1.3, cssparser-0.9.5 - required for components CSS work - 1.7) google-guava-r06 - core runtime dependency. - 1.8) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be + 1.1) richfaces-core-api-4.0.0.20100824-M2.jar + 1.2) richfaces-core-impl-4.0.0.20100824-M2.jar + 1.3) richfaces-components-api-4.0.0.20100824-M2.jar + 1.4) richfaces-components-ui-4.0.0.20100824-M2.jar + 1.5) sac-1.3, cssparser-0.9.5 - required for components CSS work + 1.6) google-guava-r06 - core runtime dependency. + 1.7) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be created/accessed dynamically from some appication actions/listeners. For optimal performance it's recommended to add one of these caching frameworks to application classpath: EhCache, JBoss Cache, OsCache. Copied: branches/RF-7560/ui/common/api/src/main/java/org/richfaces/appplication/FacesMessages.java (from rev 19051, branches/RF-7560/core/commons/src/main/java/org/richfaces/application/FacesMessages.java) =================================================================== --- branches/RF-7560/ui/common/api/src/main/java/org/richfaces/appplication/FacesMessages.java (rev 0) +++ branches/RF-7560/ui/common/api/src/main/java/org/richfaces/appplication/FacesMessages.java 2010-08-31 17:45:24 UTC (rev 19053) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.appplication; + +import javax.faces.application.FacesMessage; + +import org.richfaces.l10n.MessageBundle; + +/** + * @author Nick Belaevski + * + */ +@MessageBundle(baseName = FacesMessage.FACES_MESSAGES) +public enum FacesMessages { + + UIINPUT_CONVERSION("javax.faces.component.UIInput.CONVERSION"), + UIINPUT_REQUIRED("javax.faces.component.UIInput.REQUIRED"), + UIINPUT_UPDATE("javax.faces.component.UIInput.UPDATE"), + UISELECTONE_INVALID("javax.faces.component.UISelectOne.INVALID"), + UISELECTMANY_INVALID("javax.faces.component.UISelectMany.INVALID"), + BIG_DECIMAL_CONVERTER_DECIMAL("javax.faces.converter.BigDecimalConverter.DECIMAL"), + BIG_DECIMAL_CONVERTER_DECIMAL_DETAIL("javax.faces.converter.BigDecimalConverter.DECIMAL_detail"), + BIG_INTEGER_CONVERTER_BIGINTEGER("javax.faces.converter.BigIntegerConverter.BIGINTEGER"), + BIG_INTEGER_CONVERTER_BIGINTEGER_DETAIL("javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail"), + BOOLEAN_CONVERTER_BOOLEAN("javax.faces.converter.BooleanConverter.BOOLEAN"), + BOOLEAN_CONVERTER_BOOLEAN_DETAIL("javax.faces.converter.BooleanConverter.BOOLEAN_detail"), + BYTE_CONVERTER_BYTE("javax.faces.converter.ByteConverter.BYTE"), + BYTE_CONVERTER_BYTE_DETAIL("javax.faces.converter.ByteConverter.BYTE_detail"), + CHARACTER_CONVERTER_CHARACTER("javax.faces.converter.CharacterConverter.CHARACTER"), + CHARACTER_CONVERTER_CHARACTER_DETAIL("javax.faces.converter.CharacterConverter.CHARACTER_detail"), + DATE_TIME_CONVERTER_DATE("javax.faces.converter.DateTimeConverter.DATE"), + DATE_TIME_CONVERTER_DATE_DETAIL("javax.faces.converter.DateTimeConverter.DATE_detail"), + DATE_TIME_CONVERTER_TIME("javax.faces.converter.DateTimeConverter.TIME"), + DATE_TIME_CONVERTER_TIME_DETAIL("javax.faces.converter.DateTimeConverter.TIME_detail"), + DATE_TIME_CONVERTER_DATETIME("javax.faces.converter.DateTimeConverter.DATETIME"), + DATE_TIME_CONVERTER_DATETIME_DETAIL("javax.faces.converter.DateTimeConverter.DATETIME_detail"), + DATE_TIME_CONVERTER_PATTERN_TYPE("javax.faces.converter.DateTimeConverter.PATTERN_TYPE"), + DOUBLE_CONVERTER_DOUBLE("javax.faces.converter.DoubleConverter.DOUBLE"), + DOUBLE_CONVERTER_DOUBLE_DETAIL("javax.faces.converter.DoubleConverter.DOUBLE_detail"), + ENUM_CONVERTER_ENUM("javax.faces.converter.EnumConverter.ENUM"), + ENUM_CONVERTER_ENUM_DETAIL("javax.faces.converter.EnumConverter.ENUM_detail"), + ENUM_CONVERTER_ENUM_NO_CLASS("javax.faces.converter.EnumConverter.ENUM_NO_CLASS"), + ENUM_CONVERTER_ENUM_NO_CLASS_DETAIL("javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail"), + FLOAT_CONVERTER_FLOAT("javax.faces.converter.FloatConverter.FLOAT"), + FLOAT_CONVERTER_FLOAT_DETAIL("javax.faces.converter.FloatConverter.FLOAT_detail"), + INTEGER_CONVERTER_INTEGER("javax.faces.converter.IntegerConverter.INTEGER"), + INTEGER_CONVERTER_INTEGER_DETAIL("javax.faces.converter.IntegerConverter.INTEGER_detail"), + LONG_CONVERTER_LONG("javax.faces.converter.LongConverter.LONG"), + LONG_CONVERTER_LONG_DETAIL("javax.faces.converter.LongConverter.LONG_detail"), + NUMBER_CONVERTER_CURRENCY("javax.faces.converter.NumberConverter.CURRENCY"), + NUMBER_CONVERTER_CURRENCY_DETAIL("javax.faces.converter.NumberConverter.CURRENCY_detail"), + NUMBER_CONVERTER_PERCENT("javax.faces.converter.NumberConverter.PERCENT"), + NUMBER_CONVERTER_PERCENT_DETAIL("javax.faces.converter.NumberConverter.PERCENT_detail"), + NUMBER_CONVERTER_NUMBER("javax.faces.converter.NumberConverter.NUMBER"), + NUMBER_CONVERTER_NUMBER_DETAIL("javax.faces.converter.NumberConverter.NUMBER_detail"), + NUMBER_CONVERTER_PATTERN("javax.faces.converter.NumberConverter.PATTERN"), + NUMBER_CONVERTER_PATTERN_DETAIL("javax.faces.converter.NumberConverter.PATTERN_detail"), + SHORT_CONVERTER_SHORT("javax.faces.converter.ShortConverter.SHORT"), + SHORT_CONVERTER_SHORT_DETAIL("javax.faces.converter.ShortConverter.SHORT_detail"), + CONVERTER_STRING("javax.faces.converter.STRING"), + DOUBLE_RANGE_VALIDATOR_MAXIMUM("javax.faces.validator.DoubleRangeValidator.MAXIMUM"), + DOUBLE_RANGE_VALIDATOR_MINIMUM("javax.faces.validator.DoubleRangeValidator.MINIMUM"), + DOUBLE_RANGE_VALIDATOR_NOT_IN_RANGE("javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE"), + DOUBLE_RANGE_VALIDATOR_TYPE("javax.faces.validator.DoubleRangeValidator.TYPE"), + LENGTH_VALIDATOR_MAXIMUM("javax.faces.validator.LengthValidator.MAXIMUM"), + LENGTH_VALIDATOR_MINIMUM("javax.faces.validator.LengthValidator.MINIMUM"), + LONG_RANGE_VALIDATOR_MAXIMUM("javax.faces.validator.LongRangeValidator.MAXIMUM"), + LONG_RANGE_VALIDATOR_MINIMUM("javax.faces.validator.LongRangeValidator.MINIMUM"), + LONG_RANGE_VALIDATOR_NOT_IN_RANGE("javax.faces.validator.LongRangeValidator.NOT_IN_RANGE"), + LONG_RANGE_VALIDATOR_TYPE("javax.faces.validator.LongRangeValidator.TYPE"), + VALIDATOR_NOT_IN_RANGE("javax.faces.validator.NOT_IN_RANGE"), + REGEX_VALIDATOR_PATTERN_NOT_SET("javax.faces.validator.RegexValidator.PATTERN_NOT_SET"), + REGEX_VALIDATOR_PATTERN_NOT_SET_DETAIL("javax.faces.validator.RegexValidator.PATTERN_NOT_SET_detail"), + REGEX_VALIDATOR_NOT_MATCHED("javax.faces.validator.RegexValidator.NOT_MATCHED"), + REGEX_VALIDATOR_NOT_MATCHED_DETAIL("javax.faces.validator.RegexValidator.NOT_MATCHED_detail"), + REGEX_VALIDATOR_MATCH_EXCEPTION("javax.faces.validator.RegexValidator.MATCH_EXCEPTION"), + REGEX_VALIDATOR_MATCH_EXCEPTION_DETAIL("javax.faces.validator.RegexValidator.MATCH_EXCEPTION_detail"), + BEAN_VALIDATOR_MESSAGE("javax.faces.validator.BeanValidator.MESSAGE"); + + private String key; + + private FacesMessages(String key) { + this.key = key; + } + + @Override + public String toString() { + return key; + } +} Modified: branches/RF-7560/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/RF-7560/ui/dist/richfaces-components-api/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/ui/dist/richfaces-components-api/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -71,10 +71,6 @@ <artifactId>richfaces-core-impl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-7560/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/RF-7560/ui/dist/richfaces-components-ui/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/ui/dist/richfaces-components-ui/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -80,10 +80,6 @@ <artifactId>richfaces-core-impl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-7560/ui/output/ui/pom.xml =================================================================== --- branches/RF-7560/ui/output/ui/pom.xml 2010-08-31 17:20:11 UTC (rev 19052) +++ branches/RF-7560/ui/output/ui/pom.xml 2010-08-31 17:45:24 UTC (rev 19053) @@ -57,10 +57,6 @@ <artifactId>richfaces-core-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency>