August 2008 - seam-commits - Jboss List Archives

Seam SVN: r8579 - trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 12:19:32 -0400 (Tue, 05 Aug 2008) New Revision: 8579 Added: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java Modified: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java Log: JBSEAM-3137 Added: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java =================================================================== --… [View More]- trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java (rev 0) +++ trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java 2008-08-05 16:19:32 UTC (rev 8579) @@ -0,0 +1,311 @@ +package org.jboss.seam.ui.util.cdk; + +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; + +public class Messages { + private static final String BUNDLE_NAME = "org.ajax4jsf.messages"; + + private static Map<ClassLoader, ResourceBundle> bundles = new HashMap<ClassLoader, ResourceBundle>(); + + private static synchronized ResourceBundle getBundle() { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + ResourceBundle bundle = (ResourceBundle) bundles.get(contextClassLoader); + if (bundle == null) { + bundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault(), contextClassLoader); + bundles.put(contextClassLoader, bundle); + } + + return bundle; + } + + public static final String getMessage(String name) { + String value = getBundle().getString(name); + return value == null ? "%" + name + "%" : value; + } + + public static final String getMessage(String name, Object param) { + String pattern = getBundle().getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, new Object[]{param}); + } + + public static final String getMessage(String name, Object param1, Object param2) { + String pattern = getBundle().getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, new Object[]{param1, param2}); + } + + public static final String getMessage(String name, Object[] params) { + String pattern = getBundle().getString(name); + if(pattern == null) return "%" + name + "%"; + return MessageFormat.format(pattern, params); + } + + public static final String BUNDLE_MAP_NO_PUT_VALUE = "BUNDLE_MAP_NO_PUT_VALUE"; + public static final String BUNDLE_MAP_NO_REMOVE_VALUE = "BUNDLE_MAP_NO_REMOVE_VALUE"; + public static final String NO_CONVERTER_REGISTERED = "NO_CONVERTER_REGISTERED"; + public static final String FOR_TARGETS_NO_AJAX_CONTAINER = "FOR_TARGETS_NO_AJAX_CONTAINER"; + public static final String VAR_MUST_BE_LITERAL = "VAR_MUST_BE_LITERAL"; + public static final String EVENT_MUST_BE_LITERAL = "EVENT_MUST_BE_LITERAL"; + public static final String CREATE_JAVASCRIPT_EVENT = "CREATE_JAVASCRIPT_EVENT"; + public static final String CALLED_SET_PARENT = "CALLED_SET_PARENT"; + public static final String DETECT_NEW_COMPONENT = "DETECT_NEW_COMPONENT"; + public static final String SET_VALUE_BINDING_FOR_EVENT = "SET_VALUE_BINDING_FOR_EVENT"; + public static final String COULD_NOT_LOAD_RESOURCE_BUNDLE = "COULD_NOT_LOAD_RESOURCE_BUNDLE"; + public static final String FACES_CONTEXT_NOT_CREATED = "FACES_CONTEXT_NOT_CREATED"; + public static final String FACES_CONTEXT_HAS_NOT_EXTERNAL = "FACES_CONTEXT_HAS_NOT_EXTERNAL"; + public static final String FACES_CONTEXT_HAS_NOT_RESPONSE = "FACES_CONTEXT_HAS_NOT_RESPONSE"; + public static final String CREATE_ALTERNATE_HANDLER = "CREATE_ALTERNATE_HANDLER"; + public static final String ALTERNATE_HANDLER_CONSTRUCTOR_WARNING = "ALTERNATE_HANDLER_CONSTRUCTOR_WARNING"; + public static final String VIEW_HANDLER_INSTANTIATION_ERROR = "VIEW_HANDLER_INSTANTIATION_ERROR"; + public static final String ERROR_ON_PAGE = "ERROR_ON_PAGE"; + public static final String LIFECYCLE_ERROR = "LIFECYCLE_ERROR"; + public static final String LIFECYCLE_ERROR_AT_PHASE = "LIFECYCLE_ERROR_AT_PHASE"; + public static final String COMPONENT_TREE_NOT_CREATED = "COMPONENT_TREE_NOT_CREATED"; + public static final String SET_AJAX_LISTENER = "SET_AJAX_LISTENER"; + public static final String ADD_AJAX_AREA = "ADD_AJAX_AREA"; + public static final String ADD_AJAX_AREAS = "ADD_AJAX_AREAS"; + public static final String SET_AJAX_REQUEST = "SET_AJAX_REQUEST"; + public static final String SUBMITTED_AJAX_REQUEST = "SUBMITTED_AJAX_REQUEST"; + public static final String SEND_EVENT_TO_AJAX_LISTENER = "SEND_EVENT_TO_AJAX_LISTENER"; + public static final String RENDER_AJAX_REQUEST = "RENDER_AJAX_REQUEST"; + public static final String RENDERING_AJAX_REGION_ERROR = "RENDERING_AJAX_REGION_ERROR"; + public static final String RESTORE_AJAX_COMPONENT_STATE = "RESTORE_AJAX_COMPONENT_STATE"; + public static final String SAVE_AJAX_COMPONENT_STATE = "SAVE_AJAX_COMPONENT_STATE"; + public static final String CREATE_AJAX_AREAS_SET_TO_RENDER = "CREATE_AJAX_AREAS_SET_TO_RENDER"; + public static final String ARGUMENT_IS_NOT_AJAX_REGION_ERROR = "ARGUMENT_IS_NOT_AJAX_REGION_ERROR"; + public static final String NULL_EVENT_SUBMITTED_ERROR = "NULL_EVENT_SUBMITTED_ERROR"; + public static final String CONTENT_TYPE_ENCODING = "CONTENT_TYPE_ENCODING"; + public static final String CONTENT_TYPE_NO_ENCODING = "CONTENT_TYPE_NO_ENCODING"; + public static final String FILTER_START_INFO = "FILTER_START_INFO"; + public static final String FILTER_XML_OUTPUT = "FILTER_XML_OUTPUT"; + public static final String FILTER_NO_XML_CHAIN = "FILTER_NO_XML_CHAIN"; + public static final String FILTER_NO_XML_CHAIN_2 = "FILTER_NO_XML_CHAIN_2"; + public static final String FILTER_STOP_INFO = "FILTER_STOP_INFO"; + public static final String PARSER_NOT_INSTANTIATED_ERROR = "PARSER_NOT_INSTANTIATED_ERROR"; + public static final String PARSING_TIME_INFO = "PARSING_TIME_INFO"; + public static final String JTIDY_PARSING_ERROR = "JTIDY_PARSING_ERROR"; + public static final String COMPONENT_NOT_FOUND = "COMPONENT_NOT_FOUND"; + public static final String EVENT_IS_READ_ONLY = "EVENT_IS_READ_ONLY"; + public static final String FLUSH_BUFFERED_STREAM_ERROR = "FLUSH_BUFFERED_STREAM_ERROR"; + public static final String UNSUPPORTED_ENCODING_WARNING = "UNSUPPORTED_ENCODING_WARNING"; + public static final String UNSUPPORTED_ENCODING_WARNING_2 = "UNSUPPORTED_ENCODING_WARNING_2"; + public static final String NO_WRITER_CALLED_INFO = "NO_WRITER_CALLED_INFO"; + public static final String PARSE_XML_DOCUMENT_INFO = "PARSE_XML_DOCUMENT_INFO"; + public static final String NO_WRITER_POSSIBLE_ERROR = "NO_WRITER_POSSIBLE_ERROR"; + public static final String CREATE_WRITER_INFO = "CREATE_WRITER_INFO"; + public static final String NO_STREAM_POSSIBLE_ERROR = "NO_STREAM_POSSIBLE_ERROR"; + public static final String CREATE_STREAM_INFO = "CREATE_STREAM_INFO"; + public static final String OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR = "OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR"; + public static final String VARIABLE_SUBSTITUTION_WARNING = "VARIABLE_SUBSTITUTION_WARNING"; + public static final String START_DOCUMENT_SAX_EXCEPTION = "START_DOCUMENT_SAX_EXCEPTION"; + public static final String COMMENT_SAX_EXCEPTION = "COMMENT_SAX_EXCEPTION"; + public static final String END_ELEMENT_SAX_EXCEPTION = "END_ELEMENT_SAX_EXCEPTION"; + public static final String END_DOCUMENT_SAX_EXCEPTION = "END_DOCUMENT_SAX_EXCEPTION"; + public static final String START_ELEMENT_SAX_EXCEPTION = "START_ELEMENT_SAX_EXCEPTION"; + public static final String TEXT_SAX_EXCEPTION = "TEXT_SAX_EXCEPTION"; + public static final String MESSAGE_PARSING_INFO = "MESSAGE_PARSING_INFO"; + public static final String CREATE_JTIDY_INFO = "CREATE_JTIDY_INFO"; + public static final String READING_TIDY_PROPERTIES_ERROR = "READING_TIDY_PROPERTIES_ERROR"; + public static final String ILLEGAL_METHOD_STATE = "ILLEGAL_METHOD_STATE"; + public static final String WRAPPED_RULES_NULL_ERROR = "WRAPPED_RULES_NULL_ERROR"; + public static final String NO_NAME_ATTRIBUTE_ERROR = "NO_NAME_ATTRIBUTE_ERROR"; + public static final String ENCODE_COMPILED_TEMPLATE_INFO = "ENCODE_COMPILED_TEMPLATE_INFO"; + public static final String ENCODING_TEMPLATE_TERMINATED_INFO = "ENCODING_TEMPLATE_TERMINATED_INFO"; + public static final String ENCODE_COMPILED_TEMPLATE_INFO2 = "ENCODE_COMPILED_TEMPLATE_INFO2"; + public static final String CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR = "CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR"; + public static final String COMPONENT_CLASS_ERROR = "COMPONENT_CLASS_ERROR"; + public static final String CONTEXT_NULL_ERROR = "CONTEXT_NULL_ERROR"; + public static final String COMPONENT_NULL_ERROR = "COMPONENT_NULL_ERROR"; + public static final String START_DECODING_COMPONENT_INFO = "START_DECODING_COMPONENT_INFO"; + public static final String START_ENCODING_COMPONENT_INFO = "START_ENCODING_COMPONENT_INFO"; + public static final String CHILDREN_ENCODING_COMPONENT_INFO = "CHILDREN_ENCODING_COMPONENT_INFO"; + public static final String FINISH_ENCODING_COMPONENT_INFO = "FINISH_ENCODING_COMPONENT_INFO"; + public static final String NAMESPACE_NOT_RECOGNIZED_ERROR = "NAMESPACE_NOT_RECOGNIZED_ERROR"; + public static final String RENDERER_METHOD_NOT_SET_ERROR = "RENDERER_METHOD_NOT_SET_ERROR"; + public static final String METHOD_CALL_ERROR_1 = "METHOD_CALL_ERROR_1"; + public static final String METHOD_CALL_ERROR_2 = "METHOD_CALL_ERROR_2"; + public static final String METHOD_CALL_ERROR_3 = "METHOD_CALL_ERROR_3"; + public static final String METHOD_CALL_ERROR_4 = "METHOD_CALL_ERROR_4"; + public static final String METHOD_CALL_ERROR_5 = "METHOD_CALL_ERROR_5"; + public static final String METHOD_CALL_ERROR_6 = "METHOD_CALL_ERROR_6"; + public static final String METHOD_CALL_ERROR_1a = "METHOD_CALL_ERROR_1a"; + public static final String METHOD_CALL_ERROR_2a = "METHOD_CALL_ERROR_2a"; + public static final String METHOD_CALL_ERROR_3a = "METHOD_CALL_ERROR_3a"; + public static final String METHOD_CALL_ERROR_4a = "METHOD_CALL_ERROR_4a"; + public static final String METHOD_CALL_ERROR_5a = "METHOD_CALL_ERROR_5a"; + public static final String METHOD_CALL_ERROR_6a = "METHOD_CALL_ERROR_6a"; + public static final String PARSING_TEMPLATE_ERROR = "PARSING_TEMPLATE_ERROR"; + public static final String TEMPLATE_IO_ERROR = "TEMPLATE_IO_ERROR"; + public static final String PARSING_TEMPLATE_ERROR_2 = "PARSING_TEMPLATE_ERROR_2"; + public static final String START_COMPILE_TEMPLATE_INFO = "START_COMPILE_TEMPLATE_INFO"; + public static final String PARSING_TEMPLATE_ERROR_a = "PARSING_TEMPLATE_ERROR_a"; + public static final String TEMPLATE_IO_ERROR_a = "TEMPLATE_IO_ERROR_a"; + public static final String PARSING_TEMPLATE_ERROR_2a = "PARSING_TEMPLATE_ERROR_2a"; + public static final String FINISH_COMPILE_TEMPLATE_INFO = "FINISH_COMPILE_TEMPLATE_INFO"; + public static final String TEMPLATE_NOT_COMPILED_ERROR = "TEMPLATE_NOT_COMPILED_ERROR"; + public static final String NO_CHILD_ALLOWED = "NO_CHILD_ALLOWED"; + public static final String NO_FACET_NAME_ATTRIBUTE = "NO_FACET_NAME_ATTRIBUTE"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR = "BREAKPOINTS_UNSUPPORTED_ERROR"; + public static final String BREAKPOINT_NOT_REGISTERED_ERROR = "BREAKPOINT_NOT_REGISTERED_ERROR"; + public static final String CHILD_NOT_ALLOWED_ERROR = "CHILD_NOT_ALLOWED_ERROR"; + public static final String INVOKE_RENDERER_METHOD_ERROR = "INVOKE_RENDERER_METHOD_ERROR"; + public static final String METHOD_CALL_ERROR_2b = "METHOD_CALL_ERROR_2b"; + public static final String METHOD_CALL_ERROR_4b = "METHOD_CALL_ERROR_4b"; + public static final String METHOD_CALL_ERROR_6b = "METHOD_CALL_ERROR_6b"; + public static final String STYLE_ATTRIBUTE_ERROR = "STYLE_ATTRIBUTE_ERROR"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR_2 = "BREAKPOINTS_UNSUPPORTED_ERROR_2"; + public static final String BREAKPOINTS_UNSUPPORTED_ERROR_3 = "BREAKPOINTS_UNSUPPORTED_ERROR_3"; + public static final String REQUEST_CHAMELEON_RENDER_KIT_INFO = "REQUEST_CHAMELEON_RENDER_KIT_INFO"; + public static final String GET_DEFAULT_RENDER_KIT_ERROR = "GET_DEFAULT_RENDER_KIT_ERROR"; + public static final String DEFAULT_RENDER_KIT_INFO = "DEFAULT_RENDER_KIT_INFO"; + public static final String AJAX_RESPONSE_NOT_RENDERED_INFO = "AJAX_RESPONSE_NOT_RENDERED_INFO"; + public static final String ENTER_BEFORE_RENDER_VIEW_PHASE = "ENTER_BEFORE_RENDER_VIEW_PHASE"; + public static final String SET_RENDER_KIT_ID_INFO = "SET_RENDER_KIT_ID_INFO"; + public static final String PROCESS_AJAX_EVENTS_INFO = "PROCESS_AJAX_EVENTS_INFO"; + public static final String DELEGATE_AJAX_PROCESSING_INFO = "DELEGATE_AJAX_PROCESSING_INFO"; + public static final String BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR = "BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR"; + public static final String BUILD_ONCLICK_INFO = "BUILD_ONCLICK_INFO"; + public static final String UNNAMED_PARAMETER_ERROR = "UNNAMED_PARAMETER_ERROR"; + public static final String AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING = "AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING"; + public static final String COMPONENT_NULL_ERROR_2 = "COMPONENT_NULL_ERROR_2"; + public static final String CALCULATE_COMPONENT_ID_INFO = "CALCULATE_COMPONENT_ID_INFO"; + public static final String DETECTING_ENCODING_DISABLED_ERROR = "DETECTING_ENCODING_DISABLED_ERROR"; + public static final String OBTAIN_RESPONSE_SET_HEADER_ERROR = "OBTAIN_RESPONSE_SET_HEADER_ERROR"; + public static final String INVOKE_AJAX_REGION_LISTENER = "INVOKE_AJAX_REGION_LISTENER"; + public static final String APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING = "APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING"; + public static final String RENDER_CHILDREN_NON_AJAX_INFO = "RENDER_CHILDREN_NON_AJAX_INFO"; + public static final String RENDER_CHILDREN_AJAX_INFO = "RENDER_CHILDREN_AJAX_INFO"; + public static final String ENCODE_CHILD_AJAX_INFO = "ENCODE_CHILD_AJAX_INFO"; + public static final String RENDER_AJAX_AREA_INFO = "RENDER_AJAX_AREA_INFO"; + public static final String DECODE_AJAX_REQUEST_STATUS_INFO = "DECODE_AJAX_REQUEST_STATUS_INFO"; + public static final String REQUEST_PARAMETERS_MAP = "REQUEST_PARAMETERS_MAP"; + public static final String SET_MYFACES_SEQUENCE_INFO = "SET_MYFACES_SEQUENCE_INFO"; + public static final String SKIP_ENCODING_HTML_INFO = "SKIP_ENCODING_HTML_INFO"; + public static final String SKIP_ENCODE_BEGIN_HTML_INFO = "SKIP_ENCODE_BEGIN_HTML_INFO"; + public static final String SKIP_ENCODE_END_HTML_INFO = "SKIP_ENCODE_END_HTML_INFO"; + public static final String QUERY_STRING_BUILDING_ERROR = "QUERY_STRING_BUILDING_ERROR"; + public static final String BUILD_RESOURCE_URI_INFO = "BUILD_RESOURCE_URI_INFO"; + public static final String RESTORE_DATA_FROM_RESOURCE_URI_INFO = "RESTORE_DATA_FROM_RESOURCE_URI_INFO"; + public static final String STREAM_CORRUPTED_ERROR = "STREAM_CORRUPTED_ERROR"; + public static final String DESERIALIZE_DATA_INPUT_ERROR = "DESERIALIZE_DATA_INPUT_ERROR"; + public static final String DATA_CLASS_NOT_FOUND_ERROR = "DATA_CLASS_NOT_FOUND_ERROR"; + public static final String METHOD_NOT_IMPLEMENTED = "METHOD_NOT_IMPLEMENTED"; + public static final String ENCODE_HTML_INFO = "ENCODE_HTML_INFO"; + public static final String ENCODE_HTML_INFO_2 = "ENCODE_HTML_INFO_2"; + public static final String ENCODE_BEGIN_HTML_INFO = "ENCODE_BEGIN_HTML_INFO"; + public static final String ENCODE_END_HTML_INFO = "ENCODE_END_HTML_INFO"; + public static final String SEND_CONTENT_INFO = "SEND_CONTENT_INFO"; + public static final String NO_INPUT_STREAM_ERROR = "NO_INPUT_STREAM_ERROR"; + public static final String SET_RESPONSE_HEADERS_INFO = "SET_RESPONSE_HEADERS_INFO"; + public static final String BUILD_RESOURCE_INFO = "BUILD_RESOURCE_INFO"; + public static final String NO_RESOURCE_REGISTERED_ERROR = "NO_RESOURCE_REGISTERED_ERROR"; + public static final String NO_RESOURCE_REGISTERED_ERROR_2 = "NO_RESOURCE_REGISTERED_ERROR_2"; + public static final String NO_RESOURCE_EXISTS_ERROR = "NO_RESOURCE_EXISTS_ERROR"; + public static final String INSTANTIATE_RESOURCE_ERROR = "INSTANTIATE_RESOURCE_ERROR"; + public static final String INSTANTIATE_CLASS_ERROR = "INSTANTIATE_CLASS_ERROR"; + public static final String STATIC_RESOURCE_NOT_FOUND_ERROR = "STATIC_RESOURCE_NOT_FOUND_ERROR"; + public static final String PARSING_IF_MODIFIED_SINCE_WARNING = "PARSING_IF_MODIFIED_SINCE_WARNING"; + public static final String GET_CONTENT_FROM_CACHE_INFO = "GET_CONTENT_FROM_CACHE_INFO"; + public static final String CONTENT_NOT_FOUND_ERROR = "CONTENT_NOT_FOUND_ERROR"; + public static final String SEND_RESOURCE_ERROR = "SEND_RESOURCE_ERROR"; + public static final String SEND_RESOURCE_ERROR_2 = "SEND_RESOURCE_ERROR_2"; + public static final String READING_PROPERTIES_ERROR = "READING_PROPERTIES_ERROR"; + public static final String SEND_IMAGE_ERROR = "SEND_IMAGE_ERROR"; + public static final String SEND_IMAGE_ERROR_2 = "SEND_IMAGE_ERROR_2"; + public static final String SKIP_ENCODE_BEGIN_HTML_INFO_2 = "SKIP_ENCODE_BEGIN_HTML_INFO_2"; + public static final String MARK_AS_RENDERED_INFO = "MARK_AS_RENDERED_INFO"; + public static final String SKIP_ENCODE_END_HTML_INFO_2 = "SKIP_ENCODE_END_HTML_INFO_2"; + public static final String VARIABLE_SUBSTITUTION_ERROR = "VARIABLE_SUBSTITUTION_ERROR"; + public static final String SET_SKIN_FACTORY_INFO = "SET_SKIN_FACTORY_INFO"; + public static final String CREATING_SKIN_FACTORY_ERROR = "CREATING_SKIN_FACTORY_ERROR"; + public static final String NULL_SKIN_NAME_ERROR = "NULL_SKIN_NAME_ERROR"; + public static final String CREATE_SKIN_INFO = "CREATE_SKIN_INFO"; + public static final String DEFAULT_PROPERTIES_NOT_FOUND_ERROR = "DEFAULT_PROPERTIES_NOT_FOUND_ERROR"; + public static final String SKIN_PROPERTIES_IO_ERROR = "SKIN_PROPERTIES_IO_ERROR"; + public static final String SKIN_NOT_FOUND_ERROR = "SKIN_NOT_FOUND_ERROR"; + public static final String ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR = "ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR"; + public static final String ACESSING_SKIN_PROPERTY_ERROR = "ACESSING_SKIN_PROPERTY_ERROR"; + public static final String SKIN_PROPERTIES_READ_ONLY_ERROR = "SKIN_PROPERTIES_READ_ONLY_ERROR"; + public static final String NO_DATA_ADAPTOR = "NO_DATA_ADAPTOR"; + public static final String NO_VALUE_HOLDER_ERROR = "NO_VALUE_HOLDER_ERROR"; + public static final String NO_EDITABLE_VALUE_HOLDER_ERROR = "NO_EDITABLE_VALUE_HOLDER_ERROR"; + public static final String INVALID_VALIDATION_EXPRESSION = "INVALID_VALIDATION_EXPRESSION"; + public static final String NO_ACTION_SOURCE_ERROR = "NO_ACTION_SOURCE_ERROR"; + public static final String NO_ACTION_SOURCE2_ERROR = "NO_ACTION_SOURCE2_ERROR"; + public static final String INVALID_ACTION_LISTENER = "INVALID_ACTION_LISTENER"; + public static final String INVALID_VALUE_CHANGE_LISTENER = "INVALID_VALUE_CHANGE_LISTENER"; + public static final String NO_VALUE_REFERENCE_ERROR = "NO_VALUE_REFERENCE_ERROR"; + public static final String NO_BYTE_ARRAY_ERROR = "NO_BYTE_ARRAY_ERROR"; + public static final String BUFFER_TYPE_ERROR = "BUFFER_TYPE_ERROR"; + public static final String IMAGE_ERROR = "IMAGE_ERROR"; + public static final String CANNOT_WRITE_RASTERS = "CANNOT_WRITE_RASTERS"; + public static final String NULL_OUTPUT_ERROR = "NULL_OUTPUT_ERROR"; + public static final String IMAGE_NOT_BUFFERED_ERROR = "IMAGE_NOT_BUFFERED_ERROR"; + public static final String NOT_DATA_OUTPUT_ERROR = "NOT_DATA_OUTPUT_ERROR"; + public static final String NULL_COLOR_PARAMETER_ERROR = "NULL_COLOR_PARAMETER_ERROR"; + public static final String DECODE_COLOR_PARAMETER_ERROR = "DECODE_COLOR_PARAMETER_ERROR"; + public static final String NULL_COLOR_PARAMETER_ERROR_2 = "NULL_COLOR_PARAMETER_ERROR_2"; + public static final String DECODE_PARAMETER_ERROR = "DECODE_PARAMETER_ERROR"; + public static final String IMAGE_GENERATOR_CLASS_NOT_FOUND = "IMAGE_GENERATOR_CLASS_NOT_FOUND"; + public static final String CREATING_IMAGE_GENERATOR_ERROR = "CREATING_IMAGE_GENERATOR_ERROR"; + public static final String INVALID_COMMENT_INDEX = "INVALID_COMMENT_INDEX"; + public static final String LOADING_IMAGE_ERROR = "LOADING_IMAGE_ERROR"; + public static final String NOT_INDEXED_IMAGE_ERROR = "NOT_INDEXED_IMAGE_ERROR"; + public static final String INVALID_RADIUS = "INVALID_RADIUS"; + public static final String INVALID_ATTRIBUTE_VALUE = "INVALID_ATTRIBUTE_VALUE"; + public static final String VALUE_BINDING_TYPE_ERROR = "VALUE_BINDING_TYPE_ERROR"; + public static final String NO_CONVERTER_FOUND_ERROR = "NO_CONVERTER_FOUND_ERROR"; + public static final String GRABBER_ERROR = "GRABBER_ERROR"; + public static final String TOOMANY_COLORS_ERROR = "TOOMANY_COLORS_ERROR"; + public static final String GET_RESOURCE_AS_STREAM_ERROR = "GET_RESOURCE_AS_STREAM_ERROR"; + public static final String PARSING_WEB_XML_IO_ERROR = "PARSING_WEB_XML_IO_ERROR"; + public static final String PARSING_WEB_XML_SAX_ERROR = "PARSING_WEB_XML_SAX_ERROR"; + public static final String NULL_FILTER_NAME_WARNING = "NULL_FILTER_NAME_WARNING"; + public static final String FILTER_NOT_FOUND_ERROR = "FILTER_NOT_FOUND_ERROR"; + public static final String FILTER_NOT_CONFIGURED_ERROR = "FILTER_NOT_CONFIGURED_ERROR"; + public static final String NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR = "NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR"; + public static final String CONFIG_INITIALIZATION_ERROR = "CONFIG_INITIALIZATION_ERROR"; + public static final String FIELD_READING_ERROR = "FIELD_READING_ERROR"; + public static final String CONFIG_INITIALIZATION_ERROR_2 = "CONFIG_INITIALIZATION_ERROR_2"; + public static final String DOM_METHOD_NOT_SUPPORTED = "DOM_METHOD_NOT_SUPPORTED"; + public static final String METHOD_NOT_SUPPORTED = "METHOD_NOT_SUPPORTED"; + public static final String NAMED_ITEM_NOT_FOUND_ERROR = "NAMED_ITEM_NOT_FOUND_ERROR"; + public static final String AJAX_SUPPORT_REQUEST_PARAMETER_INFO = "AJAX_SUPPORT_REQUEST_PARAMETER_INFO"; + public static final String COMMAND_LINK_SUBMIT_INFO = "COMMAND_LINK_SUBMIT_INFO"; + public static final String COMMAND_LINK_NOT_IN_FORM_WARNING = "COMMAND_LINK_NOT_IN_FORM_WARNING"; + public static final String MUST_BE_EXPRESSION_ERROR = "MUST_BE_EXPRESSION_ERROR"; + public static final String NOT_PARENT_AJAX_CONTAINER_ERROR = "NOT_PARENT_AJAX_CONTAINER_ERROR"; + public static final String MUST_BE_LITERAL_ERROR = "MUST_BE_LITERAL_ERROR"; + public static final String FACET_TAG_MANY_CHILDREN_ERROR = "FACET_TAG_MANY_CHILDREN_ERROR"; + public static final String NO_UI_COMPONENT_TAG_ANCESTOR_ERROR = "NO_UI_COMPONENT_TAG_ANCESTOR_ERROR"; + public static final String NO_VALUE_REFERENCE_ERROR_2 = "NO_VALUE_REFERENCE_ERROR_2"; + public static final String NULL_TYPE_ATTRIBUTE_ERROR = "NULL_TYPE_ATTRIBUTE_ERROR"; + public static final String NULL_ATTRIBUTE_ERROR = "NULL_ATTRIBUTE_ERROR"; + public static final String AJAX_VIEW_EXPIRED = "AJAX_VIEW_EXPIRED"; + public static final String SKIN_CYCLIC_REFERENCE = "SKIN_CYCLIC_REFERENCE"; + public static final String SKIN_ILLEGAL_REFERENCE = "SKIN_ILLEGAL_REFERENCE"; + public static final String NAME_MUST_BE_LITERAL = "NAME_MUST_BE_LITERAL"; + public static final String INSTANTIATE_LISTENER_ERROR = "INSTANTIATE_LISTENER_ERROR"; + public static final String NOT_AJAX_CONTAINER_ERROR = "NOT_AJAX_CONTAINER_ERROR"; + public static final String INVALID_EXPRESSION = "INVALID_EXPRESSION"; + public static final String NOT_INSTANCE_OF_ERROR = "NOT_INSTANCE_OF_ERROR"; + public static final String UNSUPPORTED_ENCODING_ERROR = "UNSUPPORTED_ENCODING_ERROR"; + public static final String UNSUPPORTED_INPUT_SOURCE_ERROR = "UNSUPPORTED_INPUT_SOURCE_ERROR"; + public static final String STRING_CONVERSION_ERROR = "STRING_CONVERSION_ERROR"; + public static final String UTF_CONVERSION_ERROR = "UTF_CONVERSION_ERROR"; + public static final String READ_ONLY_NODE_ERROR = "READ_ONLY_NODE_ERROR"; + public static final String NOT_PARENT_AJAX_COMPONENT_ERROR = "NOT_PARENT_AJAX_COMPONENT_ERROR"; + public static final String INVALID_VALUE = "INVALID_VALUE"; + public static final String DATASCROLLER_PAGE_MISSING = "DATASCROLLER_PAGE_MISSING"; + + public static void main(String[] args) { + String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); + System.out.println(m); + } + +} Property changes on: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java (rev 0) +++ trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java 2008-08-05 16:19:32 UTC (rev 8579) @@ -0,0 +1,88 @@ +package org.jboss.seam.ui.util.cdk; + +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import javax.faces.component.ActionSource2; +import javax.faces.component.EditableValueHolder; +import javax.faces.component.UIComponent; +import javax.faces.component.ValueHolder; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.event.MethodExpressionActionListener; +import javax.faces.event.MethodExpressionValueChangeListener; +import javax.faces.validator.MethodExpressionValidator; +import javax.faces.webapp.UIComponentELTag; + +import org.jboss.seam.log.Log; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; + +/** + * @author Maksim Kaszynski + * + */ +public abstract class UIComponentELTagBase extends UIComponentELTag { + + private static final LogProvider log = Logging.getLogProvider(UIComponentELTagBase.class); + + protected void setActionListenerProperty(UIComponent component, MethodExpression actionListener) { + if (actionListener != null) { + if (component instanceof ActionSource2) { + ActionSource2 actionSource2 = (ActionSource2) component; + actionSource2.addActionListener(new MethodExpressionActionListener(actionListener)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); + } + } + } + + protected void setActionProperty(UIComponent component, MethodExpression action) { + if (action != null) { + if (component instanceof ActionSource2) { + ActionSource2 actionSource2 = (ActionSource2) component; + actionSource2.setActionExpression(action); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); + } + } + } + + protected void setConverterProperty(UIComponent component, ValueExpression converter) { + if (converter != null) { + if (component instanceof ValueHolder) { + ValueHolder output = (ValueHolder) component; + if (!converter.isLiteralText()) { + component.setValueExpression("converter", converter); + } else { + Converter conv = FacesContext.getCurrentInstance().getApplication().createConverter(converter.getExpressionString()); + output.setConverter(conv); + } + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); + } + } + } + + protected void setValidatorProperty(UIComponent component, MethodExpression validator) { + + if (validator != null) { + if (component instanceof EditableValueHolder) { + EditableValueHolder input = (EditableValueHolder) component; + input.addValidator(new MethodExpressionValidator(validator)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); + } + } + } + + protected void setValueChangeListenerProperty(UIComponent component, MethodExpression valueChangeListener) { + if (valueChangeListener != null) { + if (component instanceof EditableValueHolder) { + EditableValueHolder input = (EditableValueHolder) component; + input.addValueChangeListener(new MethodExpressionValueChangeListener(valueChangeListener)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); + } + } + } +} Property changes on: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java 2008-08-05 16:19:11 UTC (rev 8578) +++ trunk/ui/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java 2008-08-05 16:19:32 UTC (rev 8579) @@ -15,9 +15,10 @@ import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; -import org.richfaces.webapp.taglib.UIComponentELTagBase; - -@Deprecated +/** + * @author Maksim Kaszynski + * + */ public abstract class UIComponentTagBase extends UIComponentELTagBase { protected ExpressionFactory getExpressionFactory() { [View Less]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8578 - trunk/examples/excel.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 12:19:11 -0400 (Tue, 05 Aug 2008) New Revision: 8578 Modified: trunk/examples/excel/ Log: svn:ignores Property changes on: trunk/examples/excel ___________________________________________________________________ Name: svn:ignore - dist exploded-archives + dist exploded-archives test-build

16 years, 7 months

1
0
0 / 0

Seam SVN: r8577 - trunk/src/mail/org/jboss/seam/mail/ui.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 12:18:46 -0400 (Tue, 05 Aug 2008) New Revision: 8577 Modified: trunk/src/mail/org/jboss/seam/mail/ui/MailComponent.java Log: Replace deprecated method Modified: trunk/src/mail/org/jboss/seam/mail/ui/MailComponent.java =================================================================== --- trunk/src/mail/org/jboss/seam/mail/ui/MailComponent.java 2008-08-05 14:38:44 UTC (rev 8576) +++ trunk/src/mail/org/jboss/seam/mail/ui/MailComponent.java 2008-… [View More]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8576 - trunk/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 10:38:44 -0400 (Tue, 05 Aug 2008) New Revision: 8576 Modified: trunk/doc/Seam_Reference_Guide/en-US/Testing.xml Log: Improve test instructions slightly Modified: trunk/doc/Seam_Reference_Guide/en-US/Testing.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-08-05 12:39:29 UTC (rev 8575) +++ trunk/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-08-05 14:38:44 UTC (… [View More]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8575 - trunk/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-05 08:39:29 -0400 (Tue, 05 Aug 2008) New Revision: 8575 Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml Log: Formatting, Excel entity Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-08-05 08:35:30 UTC (rev 8574) +++ trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-08-05 12:39:29 UTC (rev 8575) @@ -1,52 +… [View More]1,54 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ +<!ENTITY excel 'the <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> spreadsheet application'> +<!ENTITY Excel 'The <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> spreadsheet application'> +]> + + + <chapter id="excel"> - <title> - <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> spreadsheet generation - </title> + <title>&Excel;</title> <para> - Seam also supports generation of <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> - spreadsheets through the excellent <ulink url="http://jexcelapi.sourceforge.net/"><literal>JExcelAPI</literal></ulink> library. The generated document is compatible with - <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> spreadsheet applications - versions 95, 97, 2000, XP and 2003. Currently a limited subset of the library functionality is exposed but the ultimate goal - is to be able to do everything the library allows for. Please refer to the JExcelAPI documentation for more information on - capabilities and limitations. + Seam also supports generation of + &excel; + spreadsheets through the excellent + <ulink url="http://jexcelapi.sourceforge.net/">JExcelAPI</ulink> library. + The generated document is compatible with &excel; + versions 95, 97, 2000, XP and 2003. Currently a limited subset of the + library functionality is exposed but the ultimate goal is to be able to do + everything the library allows for. Please refer to the JExcelAPI + documentation for more information on capabilities and limitations. </para> <section id="excel.intro"> - <title><trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> Support</title> + <title>&Excel; support</title> <para> - <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> support is provided by - <literal>jboss-seam-excel.jar</literal> - . This JAR contains the <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> - JSF controls, which are used to construct views that can render the document, and - the DocumentStore component, which serves the rendered document to the user. To include - <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> spreadsheet support - in your application, included - <literal>jboss-seam-excel.jar</literal> - in your - <literal>WEB-INF/lib</literal> - directory along with the <literal>jxl.jar</literal> JAR file. Furthermore, you need to configure the DocumentStore servlet in your - web.xml + &Excel; <literal>jboss-seam-excel.jar</literal>. This JAR contains the + &excel; JSF controls, which are used to construct views that can render + the document, and the DocumentStore component, which serves the + rendered document to the user. To include &excel; support in your + application, included <literal>jboss-seam-excel.jar</literal> in your + <literal>WEB-INF/lib</literal> directory along with the + <literal>jxl.jar</literal> JAR file. Furthermore, you need to configure + the DocumentStore servlet in your web.xml </para> <para> - The Seam <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> module - requires the use of Facelets as the view technology. Additionally, it requires the use of the seam-ui package. + &Excel; Seam module requires the use of Facelets as the view + technology. Additionally, it requires the use of the seam-ui package. </para> <para> - The - <literal>examples/excel</literal> - project contains an example of the <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> - support in action. It demonstrates proper deployment packaging, and it shows the exposed functionality + The <literal>examples/excel</literal> project contains an example of + &excel; support in action. It demonstrates proper deployment packaging, + and it shows the exposed functionality. </para> <para> - Customizing the module to support other kinds of <trademark class="registered">Microsoft</trademark> - <trademark class="registered">Excel</trademark> spreadsheet API's has been made very easy. Implement the - <literal>ExcelWorkbook</literal> - interface, set the component name to - <literal>org.jboss.seam.excel.<myModule></literal> - and set the UIWorkbook type to - <literal>myModule</literal> - and your own exporter will be used. Default is "jxl", but support for CSV has also been added, using the type - "csv". + Customizing the module to support other kinds of &excel; spreadsheet + API's has been made very easy. Implement the + <literal>ExcelWorkbook</literal> interface, set the component name to + <literal>org.jboss.seam.excel.<myModule></literal> and set the + UIWorkbook type to <literal>myModule</literal> and your own exporter + will be used. Default is "jxl", but support for CSV has also been + added, using the type "csv". </para> </section> [View Less]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8574 - trunk/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2008-08-05 04:35:30 -0400 (Tue, 05 Aug 2008) New Revision: 8574 Modified: trunk/doc/Seam_Reference_Guide/en-US/Dependencies.xml Log: Added excel dependencies to core + own section in ref doc Modified: trunk/doc/Seam_Reference_Guide/en-US/Dependencies.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2008-08-05 08:27:56 UTC (rev 8573) +++ trunk/doc/Seam_Reference_Guide/en-US/Dependencies.… [View More]xml 2008-08-05 08:35:30 UTC (rev 8574) @@ -114,6 +114,21 @@ <para>Required when using Seam's PDF features</para> </entry> </row> + + <row> + <entry> + <para><literal>jboss-seam-excel.jar</literal></para> + </entry> + <entry align="center"> + <para>runtime</para> + </entry> + <entry align="center"> + <para>war</para> + </entry> + <entry> + <para>Required when using Seam's <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> features</para> + </entry> + </row> <row> <entry> @@ -503,6 +518,73 @@ </tgroup> </table> </section> + + <section> + <title>Seam <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark></title> + + <table> + <title>Seam <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> Dependencies</title> + + <tgroup cols="4"> + <colspec colnum="1" colwidth="4*" /> + <colspec colnum="2" colwidth="2*" /> + <colspec colnum="3" colwidth="3*" /> + <colspec colnum="4" colwidth="5*" /> + + <thead> + <row> + <entry align="center"> + <para>Name</para> + </entry> + <entry align="center"> + <para>Type</para> + </entry> + <entry align="center"> + <para>Scope</para> + </entry> + <entry align="center"> + <para>Notes</para> + </entry> + </row> + </thead> + + <tbody> + + <row> + <entry> + <para><literal>jxl.jar</literal></para> + </entry> + <entry align="center"> + <para>runtime</para> + </entry> + <entry align="center"> + <para>war</para> + </entry> + <entry> + <para>JExcelAPI Library</para> + </entry> + </row> + + <row> + <entry> + <para><literal>jboss-seam-excel.jar</literal></para> + </entry> + <entry align="center"> + <para>runtime</para> + </entry> + <entry align="center"> + <para>war</para> + </entry> + <entry> + <para>Seam <trademark class="registered">Microsoft</trademark> <trademark class="registered">Excel</trademark> core library</para> + </entry> + </row> + + </tbody> + </tgroup> + </table> + </section> + <section> <title>JBoss Rules</title> [View Less]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8573 - trunk/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2008-08-05 04:27:56 -0400 (Tue, 05 Aug 2008) New Revision: 8573 Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml Log: Added xrefs and ulinks, expanded examples Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-08-04 23:25:48 UTC (rev 8572) +++ trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-08-05 08:27:56 UTC (rev 8573) @@ -4,… [View More]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8572 - in trunk/src/main/org/jboss/seam: security and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-04 19:25:48 -0400 (Mon, 04 Aug 2008) New Revision: 8572 Modified: trunk/src/main/org/jboss/seam/Component.java trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java Log: enable security interceptor for role annotations Modified: trunk/src/main/org/jboss/seam/Component.java =================================================================== --- trunk/src/main/org/jboss/seam/Component.java 2008-08-04 16:50:04 UTC (rev 8571) +++ … [View More]trunk/src/main/org/jboss/seam/Component.java 2008-08-04 23:25:48 UTC (rev 8572) @@ -85,6 +85,7 @@ import org.jboss.seam.annotations.intercept.Interceptors; import org.jboss.seam.annotations.security.PermissionCheck; import org.jboss.seam.annotations.security.Restrict; +import org.jboss.seam.annotations.security.RoleCheck; import org.jboss.seam.annotations.web.RequestParameter; import org.jboss.seam.async.AsynchronousInterceptor; import org.jboss.seam.bpm.BusinessProcessInterceptor; @@ -1096,11 +1097,21 @@ return; } + for (Annotation annotation : getBeanClass().getAnnotations()) + { + if (annotation.annotationType().isAnnotationPresent(RoleCheck.class)) + { + secure = true; + return; + } + } + for (Method method : getBeanClass().getMethods()) { for (Annotation annotation : method.getAnnotations()) { - if (annotation.annotationType().isAnnotationPresent(PermissionCheck.class)) + if (annotation.annotationType().isAnnotationPresent(PermissionCheck.class) || + annotation.annotationType().isAnnotationPresent(RoleCheck.class)) { secure = true; return; @@ -1116,6 +1127,7 @@ secure = true; return; } + } } } Modified: trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java =================================================================== --- trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java 2008-08-04 16:50:04 UTC (rev 8571) +++ trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java 2008-08-04 23:25:48 UTC (rev 8572) @@ -172,6 +172,15 @@ restrict.value() : createDefaultExpr(method)); } + for (Annotation annotation : method.getDeclaringClass().getAnnotations()) + { + if (annotation.annotationType().isAnnotationPresent(RoleCheck.class)) + { + if (restriction == null) restriction = new Restriction(); + restriction.addRoleRestriction(annotation.annotationType().getSimpleName().toLowerCase()); + } + } + for (Annotation annotation : method.getAnnotations()) { if (annotation.annotationType().isAnnotationPresent(PermissionCheck.class)) [View Less]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8571 - trunk/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-04 12:50:04 -0400 (Mon, 04 Aug 2008) New Revision: 8571 Modified: trunk/build/classpath.tmpl Log: Add mail and excel unit tests to eclipse src folders Modified: trunk/build/classpath.tmpl =================================================================== --- trunk/build/classpath.tmpl 2008-08-04 14:48:24 UTC (rev 8570) +++ trunk/build/classpath.tmpl 2008-08-04 16:50:04 UTC (rev 8571) @@ -13,6 +13,8 @@ <classpathentry kind="src" path="src/… [View More]

16 years, 7 months

1
0
0 / 0

Seam SVN: r8570 - in branches/Seam_2_0_FP: build and 4 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-08-04 10:48:24 -0400 (Mon, 04 Aug 2008) New Revision: 8570 Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.md5 branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.sha1 branches/… [View More]Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.md5 branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.sha1 branches/Seam_2_0_FP/dependency-report.txt branches/Seam_2_0_FP/seamfp_plan.html Modified: branches/Seam_2_0_FP/build/core.pom.xml branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 branches/Seam_2_0_FP/build/root.pom.xml branches/Seam_2_0_FP/src/main/org/jboss/seam/Entity.java branches/Seam_2_0_FP/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java Log: Backport of JBSEAM-3049 Modified: branches/Seam_2_0_FP/build/core.pom.xml =================================================================== --- branches/Seam_2_0_FP/build/core.pom.xml 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/build/core.pom.xml 2008-08-04 14:48:24 UTC (rev 8570) @@ -270,14 +270,8 @@ <optional>true</optional> <scope>runtime</scope> </dependency> - + <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <optional>true</optional> Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.md5 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.md5 (rev 0) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.md5 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1 @@ +9df5ceb2481a1319b92e39432846f938 \ No newline at end of file Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.sha1 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.sha1 (rev 0) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.jar.sha1 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1 @@ +2cf5bf004f44dad4f5d6d9445f5c40eb3846434a \ No newline at end of file Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom (rev 0) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>3.2.2.GA_CP03</version> +</project> Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.md5 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.md5 (rev 0) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.md5 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1 @@ +3ae373e9313d3b9ce7840cceb8699e44 \ No newline at end of file Added: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.sha1 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.sha1 (rev 0) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_CP03/jbpm-jpdl-3.2.2.GA_CP03.pom.sha1 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1 @@ +1b6f49290f2efc708d3aeae0ed7e50ebedc4606d \ No newline at end of file Modified: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml 2008-08-04 14:48:24 UTC (rev 8570) @@ -5,7 +5,8 @@ <versioning> <versions> <version>3.2.2.GA_CP02</version> + <version>3.2.2.GA_CP03</version> </versions> - <lastUpdated>20080703123226</lastUpdated> + <lastUpdated>20080715091333</lastUpdated> </versioning> </metadata> \ No newline at end of file Modified: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 2008-08-04 14:48:24 UTC (rev 8570) @@ -1 +1 @@ -0489f2d197feb928fb7298fad97b60f4 \ No newline at end of file +605651396f3132894f5a3a908f4929f6 \ No newline at end of file Modified: branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 =================================================================== --- branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 2008-08-04 14:48:24 UTC (rev 8570) @@ -1 +1 @@ -90f81c8b00035e1535e06df6cad71ab695688de5 \ No newline at end of file +01c98e7d5072dc86ade110492f962dbdd401a65f \ No newline at end of file Modified: branches/Seam_2_0_FP/build/root.pom.xml =================================================================== --- branches/Seam_2_0_FP/build/root.pom.xml 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/build/root.pom.xml 2008-08-04 14:48:24 UTC (rev 8570) @@ -232,7 +232,7 @@ <dependency> <groupId>org.jbpm</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>3.2.2.GA_CP02</version> + <version>3.2.2.GA_CP03</version> </dependency> <dependency> @@ -828,12 +828,6 @@ </dependency> <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>1.8.0.8-brew</version> Added: branches/Seam_2_0_FP/dependency-report.txt =================================================================== --- branches/Seam_2_0_FP/dependency-report.txt (rev 0) +++ branches/Seam_2_0_FP/dependency-report.txt 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1,220 @@ + +----------------------------------------- +Dependencies for Seam 2.0.2-FP +***************************************** +----------------------------------------- + + + + +----------------------------------------- +Dependency Tree for core +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam:ejb:2.0.2-FP ++- org.hibernate:hibernate:jar:3.2.4.sp1:compile +| +- asm:asm-attrs:jar:1.5.3:compile +| +- cglib:cglib:jar:2.1_3:compile +| \- asm:asm:jar:1.5.3:compile ++- org.hibernate:hibernate-annotations:jar:3.3.0.ga:compile ++- org.hibernate:hibernate-validator:jar:3.0.0.GA:compile ++- org.hibernate:hibernate-search:jar:3.0.0.GA:compile +| +- org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile +| \- org.apache.lucene:lucene-core:jar:2.2.0:compile ++- org.hibernate:hibernate-entitymanager:jar:3.3.1.ga:compile +| \- jboss:jboss-common-core:jar:2.0.4.GA:compile ++- javassist:javassist:jar:3.5.0.GA:compile ++- dom4j:dom4j:jar:1.6.1-jboss:compile ++- javax.portlet:portlet-api:jar:1.0:compile ++- javax.servlet:servlet-api:jar:2.5:provided (scope not updated to runtime) ++- javax.mail:mail:jar:1.4:provided +| \- javax.activation:activation:jar:1.1:provided ++- javax.xml.ws:jaxws-api:jar:2.0:provided +| \- javax.xml.bind:jaxb-api:jar:2.0:provided +| \- javax.xml.bind:jsr173_api:jar:1.0:provided ++- javax.jws:jsr181-api:jar:1.0-MR1:provided ++- javax.faces:jsf-api:jar:1.2_08:provided ++- javax.servlet.jsp:jsp-api:jar:2.1:provided ++- javax.ejb:ejb-api:jar:3.0:provided ++- javax.xml.soap:saaj-api:jar:1.3:provided ++- javax.jms:jms:jar:1.1:provided ++- javax.annotation:jsr250-api:jar:1.0:provided ++- javax.transaction:jta:jar:1.0.1B:provided (scope not updated to compile) ++- org.codehaus.groovy:groovy-all:jar:1.5.4:compile ++- log4j:log4j:jar:1.2.14:compile ++- javax.el:el-api:jar:1.0:provided (scope not updated to compile) ++- javax.persistence:persistence-api:jar:1.0:provided (scope not updated to compile) ++- antlr:antlr:jar:2.7.6:compile ++- org.apache.ant:ant-antlr:jar:1.7.0:compile ++- jboss:jboss-cache:jar:1.4.1.SP9:compile ++- jboss:jboss-system:jar:4.2.2.GA:compile ++- jboss:jboss-jmx:jar:4.2.2.GA:compile ++- jgroups:jgroups:jar:2.4.2.GA_CP01-brew:compile ++- org.drools:drools-core:jar:4.0.7-SOA-P:compile +| \- org.mvel:mvel:jar:1.3.1-java1.4:compile ++- org.drools:drools-compiler:jar:4.0.7-SOA-P:compile +| +- org.antlr:antlr-runtime:jar:3.0:compile +| +- org.eclipse.jdt:core:jar:3.2.3.v_686_R32x:compile +| \- janino:janino:jar:2.5.10:compile ++- org.testng:testng:jar:5.6:compile ++- org.dbunit:dbunit:jar:2.2:compile +| +- commons-lang:commons-lang:jar:2.1:compile +| \- commons-logging:commons-logging:jar:1.1.0.jboss:compile ++- org.jbpm:jbpm-jpdl:jar:3.2.2.GA_CP03:compile ++- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- org.jboss.seam.embedded:jboss-embedded-api:jar:beta3:compile +| \- org.jboss.microcontainer:jboss-deployers-client-spi:jar:2.0.0.Beta6:compile +| \- org.jboss.microcontainer:jboss-deployers-core-spi:jar:2.0.0.Beta6:compile ++- quartz:quartz:jar:1.5.2:compile ++- javax.faces:jsf-impl:jar:1.2_08:compile ++- org.tuckey:urlrewritefilter:jar:3.0.4:runtime ++- oswego-concurrent:concurrent:jar:1.3.4:compile +\- hsqldb:hsqldb:jar:1.8.0.8-brew:compile + + + +----------------------------------------- +Dependency Tree for debug +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-debug:jar:2.0.2-FP ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- javassist:javassist:jar:3.5.0.GA:compile +| +- dom4j:dom4j:jar:1.6.1-jboss:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- javax.faces:jsf-api:jar:1.2_08:provided ++- javax.faces:jsf-impl:jar:1.2_08:compile ++- com.sun.facelets:jsf-facelets:jar:1.1.14:compile ++- javax.servlet:servlet-api:jar:2.5:provided +\- javax.el:el-api:jar:1.0:provided (scope not updated to compile) + + + +----------------------------------------- +Dependency Tree for ui +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-ui:jar:2.0.2-FP ++- javax.servlet:servlet-api:jar:2.5:provided ++- javax.servlet.jsp:jsp-api:jar:2.1:provided ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- javassist:javassist:jar:3.5.0.GA:compile +| +- dom4j:dom4j:jar:1.6.1-jboss:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- antlr:antlr:jar:2.7.6:compile ++- org.richfaces.framework:richfaces-api:jar:3.1.4.GA:compile +| \- commons-collections:commons-collections:jar:3.1:compile (version managed from 3.2) ++- org.richfaces.ui:richfaces-ui:jar:3.1.4.GA:compile +| \- org.richfaces.framework:richfaces-impl:jar:3.1.4.GA:compile +| +- javax.servlet:jstl:jar:1.0:compile +| \- commons-digester:commons-digester:jar:1.8:compile ++- javax.faces:jsf-api:jar:1.2_08:provided (scope not updated to compile) ++- org.jbpm:jbpm-jpdl:jar:3.2.2.GA_CP03:compile ++- jboss:jboss-cache:jar:1.4.1.SP9:compile ++- jboss:jboss-system:jar:4.2.2.GA:compile ++- jboss:jboss-jmx:jar:4.2.2.GA:compile ++- org.hibernate:hibernate:jar:3.2.4.sp1:compile +| +- javax.transaction:jta:jar:1.0.1B:compile +| +- asm:asm-attrs:jar:1.5.3:compile +| +- cglib:cglib:jar:2.1_3:compile +| \- asm:asm:jar:1.5.3:compile ++- com.sun.facelets:jsf-facelets:jar:1.1.14:compile ++- javax.el:el-api:jar:1.0:provided (scope not updated to compile) ++- commons-beanutils:commons-beanutils:jar:1.7.0:compile ++- javax.persistence:persistence-api:jar:1.0:provided ++- org.hibernate:hibernate-validator:jar:3.0.0.GA:compile +\- org.testng:testng:jar:jdk15:5.1:test + \- junit:junit:jar:3.8.1:test + + + +----------------------------------------- +Dependency Tree for remoting +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-remoting:jar:2.0.2-FP ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- javassist:javassist:jar:3.5.0.GA:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile +| \- javax.el:el-api:jar:1.0:compile ++- com.google.gwt:gwt-servlet:jar:1.4.60:compile ++- dom4j:dom4j:jar:1.6.1-jboss:compile ++- org.hibernate:hibernate:jar:3.2.4.sp1:compile +| +- javax.transaction:jta:jar:1.0.1B:compile +| +- asm:asm-attrs:jar:1.5.3:compile +| +- antlr:antlr:jar:2.7.6:compile +| +- cglib:cglib:jar:2.1_3:compile +| \- asm:asm:jar:1.5.3:compile ++- javax.servlet:servlet-api:jar:2.5:provided +\- javax.jms:jms:jar:1.1:provided + + + +----------------------------------------- +Dependency Tree for mail +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-mail:jar:2.0.2-FP ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- javassist:javassist:jar:3.5.0.GA:compile +| +- dom4j:dom4j:jar:1.6.1-jboss:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- org.jboss.seam:jboss-seam-ui:jar:2.0.2-FP:compile +| \- commons-beanutils:commons-beanutils:jar:1.7.0:compile ++- org.jboss.seam:jboss-seam-pdf:jar:2.0.2-FP:compile ++- com.sun.facelets:jsf-facelets:jar:1.1.14:compile ++- javax.faces:jsf-api:jar:1.2_08:provided ++- javax.mail:mail:jar:1.4:provided +| \- javax.activation:activation:jar:1.1:provided +\- javax.el:el-api:jar:1.0:provided (scope not updated to compile) + + + +----------------------------------------- +Dependency Tree for pdf +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-pdf:jar:2.0.2-FP ++- com.lowagie:itext:jar:2.0.7:compile ++- jfree:jfreechart:jar:1.0.9:compile +| \- jfree:jcommon:jar:1.0.12:compile ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- javassist:javassist:jar:3.5.0.GA:compile +| +- dom4j:dom4j:jar:1.6.1-jboss:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- org.jboss.seam:jboss-seam-ui:jar:2.0.2-FP:compile +| \- commons-beanutils:commons-beanutils:jar:1.7.0:compile ++- com.sun.facelets:jsf-facelets:jar:1.1.14:compile ++- javax.faces:jsf-api:jar:1.2_08:provided ++- javax.servlet:servlet-api:jar:2.5:provided +\- javax.el:el-api:jar:1.0:provided (scope not updated to compile) + + + +----------------------------------------- +Dependency Tree for ioc +***************************************** +----------------------------------------- + +org.jboss.seam:jboss-seam-ioc:jar:2.0.2-FP ++- org.springframework:spring:jar:2.0.6:compile ++- cglib:cglib-nodep:jar:2.1_3:compile ++- org.jboss.seam:jboss-seam:jar:2.0.2-FP:compile +| +- dom4j:dom4j:jar:1.6.1-jboss:compile +| \- org.jboss.el:jboss-el:jar:2.0.1.GA:compile ++- javax.el:el-api:jar:1.0:provided (scope not updated to compile) ++- javax.transaction:jta:jar:1.0.1B:provided (scope not updated to compile) ++- javassist:javassist:jar:3.5.0.GA:compile ++- javax.persistence:persistence-api:jar:1.0:provided ++- org.hibernate:hibernate:jar:3.2.4.sp1:compile +| +- asm:asm-attrs:jar:1.5.3:compile +| +- antlr:antlr:jar:2.7.6:compile +| +- cglib:cglib:jar:2.1_3:compile +| \- asm:asm:jar:1.5.3:compile +\- javax.servlet:servlet-api:jar:2.5:provided Property changes on: branches/Seam_2_0_FP/dependency-report.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/Seam_2_0_FP/seamfp_plan.html =================================================================== --- branches/Seam_2_0_FP/seamfp_plan.html (rev 0) +++ branches/Seam_2_0_FP/seamfp_plan.html 2008-08-04 14:48:24 UTC (rev 8570) @@ -0,0 +1,681 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Insert title here</title> +</head> +<body> + <h2> + + <a name="tasks" id="tasks">Tasks</a> + </h2> + <div class="scroll-div"> + <table cellspacing="0" cellpadding="0" border="1"> + <tr class="header" align="left"> + <th> + WBS + </th> + + <th> + Name + </th> + <th> + Start + </th> + <th> + Finish + + </th> + <th> + Work + </th> + <th> + Priority + </th> + <th> + + Complete + </th> + <th> + Cost + </th> + </tr> + <tr class="odd"> + <td> + + 1 + </td> + <td> + <a name="task1" style="font-weight: bold; margin-left: 0px" id="task1"> + Seam Feature Pack + </a> + </td> + <td> + + May 21 + </td> + <td> + Jul 21 + </td> + <td> + 66d + + </td> + <td></td> + <td></td> + <td> + + </td> + </tr> + <tr class="even"> + <td> + + 1.1 + </td> + <td> + <a name="task2" style="margin-left: 18px" id="task2"> + Development + </a> + </td> + <td> + + May 21 + </td> + <td> + Jul 1 + </td> + <td> + 30d + + </td> + <td align="center"> + + </td> + <td align="right"> + 90% + + </td> + <td align="right"> + + 240 + </td> + </tr> + <tr class="odd"> + <td> + 1.2 + </td> + <td> + + <a name="task3" style="font-weight: bold; margin-left: 18px" id="task3"> + Release Phase + </a> + </td> + <td> + Jul 2 + </td> + <td> + + Jul 21 + </td> + <td> + 33d + </td> + <td></td> + <td></td> + <td> + + + </td> + </tr> + <tr class="even"> + <td> + 1.2.1 + </td> + <td> + + <a name="task4" style="margin-left: 36px" id="task4"> + Create SVN Tag + </a> + </td> + <td> + Jul 2 + </td> + <td> + + Jul 2 + </td> + <td> + 4h + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 4 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.2 + </td> + <td> + <a name="task5" style="margin-left: 36px" id="task5"> + Process Brew Builds + </a> + </td> + + <td> + Jul 2 + </td> + <td> + Jul 2 + </td> + <td> + 4h + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 4 + </td> + </tr> + <tr class="even"> + <td> + 1.2.3 + </td> + <td> + + <a name="task6" style="margin-left: 36px" id="task6"> + Publish Release Candidate to webqa + </a> + </td> + <td> + Jul 3 + </td> + <td> + + Jul 3 + </td> + <td> + 1d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 8 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.4 + </td> + <td> + <a name="task7" style="margin-left: 36px" id="task7"> + Publish Release Candidate to cspqa + </a> + </td> + + <td> + Jul 3 + </td> + <td> + Jul 3 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 8 + </td> + </tr> + <tr class="even"> + <td> + 1.2.5 + </td> + <td> + + <a name="task8" style="margin-left: 36px" id="task8"> + Create Release Notes + </a> + </td> + <td> + Jul 2 + </td> + <td> + + Jul 3 + </td> + <td> + 2d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 16 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.6 + </td> + <td> + <a name="task9" style="margin-left: 36px" id="task9"> + Test zip distro + </a> + </td> + + <td> + Jul 3 + </td> + <td> + Jul 16 + </td> + <td> + 10d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 80 + </td> + </tr> + <tr class="even"> + <td> + 1.2.7 + </td> + <td> + + <a name="task10" style="margin-left: 36px" id="task10"> + Verify documentation + </a> + </td> + <td> + Jul 3 + </td> + <td> + + Jul 8 + </td> + <td> + 4d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 32 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.8 + </td> + <td> + <a name="task11" style="margin-left: 36px" id="task11"> + Test Release Candidate on cspqa + </a> + </td> + + <td> + Jul 4 + </td> + <td> + Jul 4 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 8 + </td> + </tr> + <tr class="even"> + <td> + 1.2.9 + </td> + <td> + + <a name="task12" style="margin-left: 36px" id="task12"> + Test RHEL4/5 rpms on webqa + </a> + </td> + <td> + Jul 4 + </td> + <td> + + Jul 17 + </td> + <td> + 10d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 80 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.10 + </td> + <td> + <a name="task13" style="margin-left: 36px" id="task13"> + Push release to RHN + </a> + </td> + + <td> + Jul 18 + </td> + <td> + Jul 18 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 8 + </td> + </tr> + <tr class="even"> + <td> + 1.2.11 + </td> + <td> + + <a name="task14" style="margin-left: 36px" id="task14"> + Push Release to CSP + </a> + </td> + <td> + Jul 18 + </td> + <td> + + Jul 18 + </td> + <td> + 1d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + 8 + </td> + </tr> + <tr class="odd"> + + <td> + 1.2.12 + </td> + <td> + <a name="task15" style="margin-left: 36px" id="task15"> + Push Documentation to redhat.com + </a> + </td> + + <td> + Jul 9 + </td> + <td> + Jul 9 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + 8 + </td> + </tr> + <tr class="even"> + <td> + 1.2.13 + </td> + <td> + + <a name="task16" style="margin-left: 36px" id="task16"> + GA Release + </a> + </td> + <td> + Jul 21 + </td> + <td> + + Jul 21 + </td> + <td> + + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + + </td> + </tr> + <tr class="odd"> + + <td> + 1.3 + </td> + <td> + <a name="task17" style="font-weight: bold; margin-left: 18px" id="task17"> + Documentation Translation + </a> + </td> + + <td> + Jul 21 + </td> + <td> + Jul 21 + </td> + <td> + 3d + + </td> + <td></td> + <td></td> + <td> + + </td> + </tr> + <tr class="even"> + <td> + + 1.3.1 + </td> + <td> + <a name="task18" style="margin-left: 36px" id="task18"> + Process Japanese translation + </a> + </td> + <td> + + Jul 21 + </td> + <td> + Jul 21 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + + </td> + </tr> + <tr class="odd"> + <td> + 1.3.2 + </td> + <td> + + <a name="task19" style="margin-left: 36px" id="task19"> + Process Chinese translation + </a> + </td> + <td> + Jul 21 + </td> + <td> + + Jul 21 + </td> + <td> + 1d + </td> + <td align="center"> + + </td> + + <td align="right"> + 0% + + </td> + <td align="right"> + + </td> + </tr> + <tr class="even"> + + <td> + 1.3.3 + </td> + <td> + <a name="task20" style="margin-left: 36px" id="task20"> + Process Portuguese translation + </a> + </td> + + <td> + Jul 21 + </td> + <td> + Jul 21 + </td> + <td> + 1d + + </td> + <td align="center"> + + </td> + <td align="right"> + 0% + + </td> + <td align="right"> + + + </td> + </tr> + </table> + </div> + +</body> +</html> \ No newline at end of file Property changes on: branches/Seam_2_0_FP/seamfp_plan.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/Entity.java =================================================================== --- branches/Seam_2_0_FP/src/main/org/jboss/seam/Entity.java 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/src/main/org/jboss/seam/Entity.java 2008-08-04 14:48:24 UTC (rev 8570) @@ -158,11 +158,11 @@ { throw new NotEntityException("Not an entity class: " + clazz.getName()); } - String name = getModelName(clazz); + String name = getModelName(entityClass); Model model = (Model) Contexts.getApplicationContext().get(name); if (model == null || !(model instanceof Entity)) { - Entity entity = new Entity(clazz); + Entity entity = new Entity(entityClass); Contexts.getApplicationContext().set(name, entity); return entity; } Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java =================================================================== --- branches/Seam_2_0_FP/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-08-04 14:43:22 UTC (rev 8569) +++ branches/Seam_2_0_FP/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-08-04 14:48:24 UTC (rev 8570) @@ -20,6 +20,7 @@ import org.jboss.seam.Component; import org.jboss.seam.Entity; import org.jboss.seam.ScopeType; +import org.jboss.seam.Entity.NotEntityException; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; @@ -318,11 +319,19 @@ public static Class getEntityClass(Object bean) { - Class clazz = Hibernate.getClass(bean); - if (clazz == null) + Class clazz = null; + try { clazz = Entity.forBean(bean).getBeanClass(); } + catch (NotEntityException e) { + // It's ok, try some other methods + } + + if (clazz == null) + { + clazz = Hibernate.getClass(bean); + } return clazz; } [View Less]

16 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits August 2008