Author: alexsmirnov Date: 2007-07-03 20:30:26 -0400 (Tue, 03 Jul 2007) New Revision: 1458 Added: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ trunk/framework/api/src/main/java/org/richfaces/skin/ Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java trunk/framework/impl/src/main/resources/META-INF/faces-config.xml trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/framework/test/src/test/java/DnDScriptTest.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml trunk/ui/core/src/main/config/resources/resources-config.xml trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java Log: packages and classes refactor Copied: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -0,0 +1,312 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - 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.ajax4jsf; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + +public class Messages { + private static final String BUNDLE_NAME = "org.ajax4jsf.framework.util.message.messages"; + static ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME); + + public static final String getMessage(String name) { + String value = bundle.getString(name); + return value == null ? "%" + name + "%" : bundle.getString(name); + } + + public static final String getMessage(String name, Object param) { + String pattern = bundle.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 = bundle.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 = bundle.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 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_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 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 void main(String[] args) { + String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); + System.out.println(m); + } + +} Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/message/Messages.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -1,312 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - 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.ajax4jsf.framework.util.message; - -import java.text.MessageFormat; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "org.ajax4jsf.framework.util.message.messages"; - static ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME); - - public static final String getMessage(String name) { - String value = bundle.getString(name); - return value == null ? "%" + name + "%" : bundle.getString(name); - } - - public static final String getMessage(String name, Object param) { - String pattern = bundle.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 = bundle.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 = bundle.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 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_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 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 void main(String[] args) { - String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); - System.out.println(m); - } - -} Copied: trunk/framework/api/src/main/java/org/ajax4jsf/javascript (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.HashMap; import java.util.Map; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSEncoder.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * @author shura Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSFunction.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunction.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSFunctionDefinition.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSFunctionDefinition.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSMin.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSMin.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -56,7 +56,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSObject.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSObject.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.util.List; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/JSReference.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSReference.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * Create reference to JavaScript variable with optional index. @@ -57,7 +57,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.util.javascript.ScriptString#appendScript(java.lang.StringBuffer) + * @see org.ajax4jsf.javascript.ScriptString#appendScript(java.lang.StringBuffer) */ public void appendScript(StringBuffer functionString) { functionString.append(name); Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptString.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptString.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptStringBase.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptStringBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/ScriptUtils.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.util.javascript; +package org.ajax4jsf.javascript; import java.beans.PropertyDescriptor; import java.lang.reflect.Array; Copied: trunk/framework/api/src/main/java/org/ajax4jsf/resource (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource) Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/InternetResource.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.IOException; import java.io.InputStream; @@ -42,7 +42,7 @@ public static final String ENCODE_URI_PARAMETER = "org.ajax4jsf.ENCRYPT_RESOURCE_DATA"; public static final String ENCODE_PASS_PARAMETER = "org.ajax4jsf.ENCRYPT_PASSWORD"; - public static final String CODEC_ATTR = "org.ajax4jsf.framework.resource.CODEC"; + public static final String CODEC_ATTR = "org.ajax4jsf.resource.CODEC"; public static final String RESOURCE_PROTOCOL = "resource"; public static final String RESOURCE_URI_PREFIX = "resource://"; Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBuilder.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.resource; +package org.ajax4jsf.resource; import java.io.BufferedReader; import java.io.InputStream; @@ -30,9 +30,7 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -118,7 +116,7 @@ /** * Get ( or create if nessesary ) instance of builder for current * loader. check content of file - * META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder + * META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder * for name of class to instantiate, othrthise create * {@link ResourceBuilderImpl} instance. * Copied: trunk/framework/api/src/main/java/org/richfaces/skin (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin) Modified: trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/Skin.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.context.FacesContext; Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinConfiguration.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinConfiguration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.context.FacesContext; Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinFactory.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import java.io.BufferedReader; import java.io.IOException; @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +62,7 @@ /** * Initialize skin factory. TODO - make call from init() method of any * servlet or custom faces element method ??? If exist resource - * META-INF/services/org.ajax4jsf.framework.skin.SkinFactory , create + * META-INF/services/org.richfaces.skin.SkinFactory , create * instance of class by name from first line of this file. If such class * have constructor with {@link SkinFactory} parameter, instantiate it with * instance of default factory ( as usual in JSF ). If any error occurs in Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/skin/SkinNotFoundException.java 2007-07-03 22:03:50 UTC (rev 1454) +++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinNotFoundException.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.ajax4jsf.framework.skin; +package org.richfaces.skin; import javax.faces.FacesException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/ResourceBundleMap.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,7 @@ import java.util.ResourceBundle; import java.util.Set; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Very limited Map decorator to ResourceBundle. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/ajax/UILoadBundle.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -46,7 +46,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#addListener(org.ajax4jsf.framework.resource.cache.CacheListener) + * @see org.ajax4jsf.resource.cache.Cache#addListener(org.ajax4jsf.resource.cache.CacheListener) */ public void addListener(CacheListener listener) { // TODO Auto-generated method stub @@ -54,14 +54,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#clear() + * @see org.ajax4jsf.resource.cache.Cache#clear() */ public void clear() { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#containsKey(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#containsKey(java.lang.Object) */ public boolean containsKey(Object key) { // TODO Auto-generated method stub @@ -69,7 +69,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#containsValue(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#containsValue(java.lang.Object) */ public boolean containsValue(Object value) { // TODO Auto-generated method stub @@ -77,7 +77,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#entrySet() + * @see org.ajax4jsf.resource.cache.Cache#entrySet() */ public Set entrySet() { // TODO Auto-generated method stub @@ -85,7 +85,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#evict() + * @see org.ajax4jsf.resource.cache.Cache#evict() */ public void evict() { // TODO Auto-generated method stub @@ -93,7 +93,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#get(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#get(java.lang.Object, java.lang.Object) */ public Object get(Object key, Object context) throws CacheException { String keyString = key.toString(); @@ -113,7 +113,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#getCacheEntry(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#getCacheEntry(java.lang.Object) */ public CacheEntry getCacheEntry(Object key) { // TODO Auto-generated method stub @@ -121,7 +121,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#isEmpty() + * @see org.ajax4jsf.resource.cache.Cache#isEmpty() */ public boolean isEmpty() { // TODO Auto-generated method stub @@ -129,7 +129,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#keySet() + * @see org.ajax4jsf.resource.cache.Cache#keySet() */ public Set keySet() { // TODO Auto-generated method stub @@ -137,14 +137,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#load(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#load(java.lang.Object, java.lang.Object) */ public void load(Object key, Object context) throws CacheException { cacheLoader.load(key, context); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#peek(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#peek(java.lang.Object) */ public Object peek(Object key) { String keyString = key.toString(); @@ -159,7 +159,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#put(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#put(java.lang.Object, java.lang.Object) */ public Object put(Object key, Object value) { cache.putInCache(key.toString(), value); @@ -167,7 +167,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#putAll(java.util.Map) + * @see org.ajax4jsf.resource.cache.Cache#putAll(java.util.Map) */ public void putAll(Map t) { // TODO Auto-generated method stub @@ -175,7 +175,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#remove(java.lang.Object) + * @see org.ajax4jsf.resource.cache.Cache#remove(java.lang.Object) */ public Object remove(Object key) { String keyString = key.toString(); @@ -188,7 +188,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#removeListener(org.ajax4jsf.framework.resource.cache.CacheListener) + * @see org.ajax4jsf.resource.cache.Cache#removeListener(org.ajax4jsf.resource.cache.CacheListener) */ public void removeListener(CacheListener listener) { // TODO Auto-generated method stub @@ -196,7 +196,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#size() + * @see org.ajax4jsf.resource.cache.Cache#size() */ public int size() { // TODO Auto-generated method stub @@ -204,7 +204,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.Cache#values() + * @see org.ajax4jsf.resource.cache.Cache#values() */ public Collection values() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,7 +39,7 @@ private static final Log log = LogFactory.getLog(OSCacheCacheFactory.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.cache.CacheFactory#createCache(java.util.Map, org.ajax4jsf.framework.resource.cache.CacheLoader) + * @see org.ajax4jsf.resource.cache.CacheFactory#createCache(java.util.Map, org.ajax4jsf.resource.cache.CacheLoader) */ public Cache createCache(Map env, CacheLoader cacheLoader, CacheConfigurationLoader cacheConfigurationloader) throws CacheException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/DnDScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,14 +30,14 @@ public class DnDScript extends ClientScript { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#getJavaScript() + * @see org.ajax4jsf.resource.ClientScript#getJavaScript() */ public String getJavaScript() { return "/org/ajax4jsf/framework/ajax/scripts/dnd.js"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#isUsePrototype() + * @see org.ajax4jsf.resource.ClientScript#isUsePrototype() */ protected boolean isUsePrototype() { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/DebugOutputMaker.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,9 +41,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -52,6 +52,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; @@ -60,13 +61,12 @@ import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.skin.SkinNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.HeaderResourceProducer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import org.richfaces.skin.SkinNotFoundException; /** * This class incapsulated Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,12 +31,12 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainerBase; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxRenderEvent; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,15 +32,15 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.application.ViewHandlerWrapper; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,13 +32,13 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.Messages; import org.ajax4jsf.application.AjaxSingleException; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ViewIdHolder; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.collections.Buffer; import org.apache.commons.collections.BufferUnderflowException; import org.apache.commons.collections.UnboundedFifoBuffer; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/EventValueBinding.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,10 @@ import javax.faces.el.PropertyNotFoundException; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; /** * Inner class for build event string for parent component. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.PushEventsCounter; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.resource.InternetResourceService; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxViewHandler; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContent.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -149,7 +149,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, * java.lang.String) */ public void setHeader(String name, String value) { @@ -159,7 +159,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, * int) */ public void setIntHeader(String name, int value) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/FilterServletResponseWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -73,7 +73,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.ajax4jsf.io.FastBufferInputStream; import org.ajax4jsf.io.FastBufferOutputStream; import org.ajax4jsf.io.FastBufferReader; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/Log4JConfigurator.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.util.Properties; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.log4j.LogManager; import org.apache.log4j.helpers.LogLog; import org.apache.log4j.helpers.OptionConverter; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/XMLResponseWriterState.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author shura Class to implement state pattern for Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyParser.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,9 +30,9 @@ import java.util.Properties; import java.util.Set; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.AjaxViewHandler; import org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.org.w3c.tidy.Lexer; import org.ajax4jsf.org.w3c.tidy.Node; import org.ajax4jsf.org.w3c.tidy.Tidy; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/tidy/TidyXMLFilter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,9 +25,9 @@ import java.io.InputStream; import java.util.Properties; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.xmlfilter.BaseXMLFilter; import org.ajax4jsf.framework.ajax.xmlfilter.HtmlParser; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; import org.apache.commons.collections.ArrayStack; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author shura Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,10 +30,10 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.component.AjaxChildrenEncoder; import org.ajax4jsf.component.AjaxOutput; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.AjaxRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxComponentRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,8 +22,8 @@ package org.ajax4jsf.framework.renderer; import org.ajax4jsf.framework.ajax.AjaxScript; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,10 +29,10 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,11 +32,11 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; +import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.SkinFactory; /** * Listener for act before Render phase to set RenderKit Id for current skin. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -43,6 +43,7 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.component.AjaxContainer; @@ -52,10 +53,9 @@ import org.ajax4jsf.framework.ajax.JavaScriptParameter; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.ServicesUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,7 +22,7 @@ package org.ajax4jsf.framework.renderer; import org.ajax4jsf.framework.ajax.AjaxViewRoot; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.render.RenderKit; import javax.faces.render.RenderKitFactory; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ChameleonRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,7 +21,7 @@ package org.ajax4jsf.framework.renderer; -import org.ajax4jsf.framework.resource.ResourceProduser; +import org.ajax4jsf.resource.ResourceProduser; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/ComponentUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.ResponseWriter; import javax.faces.el.MethodNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.beanutils.MethodUtils; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/HeaderResourcesRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** * Base renderer for components used JavaScripts and Styles in header. In real Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/PrototypeBasedRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,9 +26,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.PrototypeScript; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,14 +30,14 @@ import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.resource.ResourceNotFoundException; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/RendererUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,11 +38,11 @@ import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/AttributeElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.FacesException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.xml.sax.SAXException; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/BreakPoint.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.util.message.Messages; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ChildrensElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.style.CSSFormat; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ElementBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,10 +36,10 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.beanutils.MethodUtils; +import org.richfaces.skin.SkinFactory; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/FacetElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/HtmlCompiler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -34,8 +34,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.RulesBase; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/MethodCallElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,7 +33,7 @@ import javax.faces.FacesException; import javax.faces.el.MethodNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/PlainElementCreateRule.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,7 +21,7 @@ package org.ajax4jsf.framework.renderer.compiler; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Rule; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/ResourceElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.faces.FacesException; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/RootElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/SelectorElement.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.xml.sax.SAXException; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/compiler/WithDefaultsRulesWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,7 +42,7 @@ import java.util.Iterator; import java.util.List; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rules; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/BaseResourceRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,10 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -110,8 +113,8 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, - * org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.ResourceRenderer#send(org.ajax4jsf.resource.InternetResource, + * org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { @@ -154,7 +157,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#requireFacesContext() + * @see org.ajax4jsf.resource.ResourceRenderer#requireFacesContext() */ public boolean requireFacesContext() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CacheKey.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.InternetResource; + /** * @author Nick - mailto:nbelaevski@exadel.com * created 01.05.2007 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/CachedResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,6 +27,7 @@ import java.io.PrintWriter; import org.ajax4jsf.framework.ajax.xmlfilter.CacheContent; +import org.ajax4jsf.resource.ResourceContext; /** @@ -48,63 +49,63 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { return content.getOutputStream(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return this.parent.getPathInfo(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return this.parent.getQueryString(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getRequestParameter(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getRequestParameter(java.lang.String) */ public String getRequestParameter(String data_parameter) { return this.parent.getRequestParameter(data_parameter); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getResourceAsStream(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getResourceAsStream(java.lang.String) */ public InputStream getResourceAsStream(String path) { return this.parent.getResourceAsStream(path); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return this.parent.getSessionAttribute(name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, long) + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, long) */ public void setDateHeader(String name, long value) { this.content.setDateHeader(name,value); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) */ public void setHeader(String name, String value) { this.content.setHeader(name,value); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, int) + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, int) */ public void setIntHeader(String name, int value) { this.content.setIntHeader(name,value); @@ -118,7 +119,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { return content.getWriter(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ClientScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,11 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,7 +77,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getLastModified() + * @see org.ajax4jsf.resource.InternetResourceBase#getLastModified() */ public Date getLastModified(ResourceContext resourceContext) { @@ -86,7 +90,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable(ResourceContext resourceContext) { return true; @@ -98,7 +102,7 @@ public abstract String getJavaScript(); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) throws IOException { if (isNotAjaxRequest(context)) { @@ -111,7 +115,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResourceBase#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) throws IOException { if (isNotAjaxRequest(context)) { @@ -123,7 +127,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(FacesContext context, Object component) throws IOException { if (isNotAjaxRequest(context)) { @@ -135,7 +139,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#encode(javax.faces.context.FacesContext, java.lang.Object) */ public void encode(FacesContext context, Object data) throws IOException { if (isNotAjaxRequest(context)) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/FacesResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,6 +33,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: nick_belaevski $) * @version $Revision: 1.1.2.2 $ $Date: 2007/01/11 16:52:14 $ @@ -62,7 +64,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, * java.lang.String) */ public void setHeader(String name, String value) { @@ -75,7 +77,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, * int) */ public void setIntHeader(String name, int value) { @@ -88,7 +90,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, * long) */ public void setDateHeader(String name, long value) { @@ -101,7 +103,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { if (null != response) { @@ -126,7 +128,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { if (null != response) { @@ -151,7 +153,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return ((HttpServletRequest) externalContext.getRequest()) @@ -161,7 +163,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return externalContext.getRequestPathInfo(); @@ -170,7 +172,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return externalContext.getSessionMap().get(name); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/GifRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,6 +27,7 @@ import java.io.IOException; import org.ajax4jsf.framework.util.image.GIFEncoder; +import org.ajax4jsf.resource.ResourceContext; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -38,7 +39,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/HTMLRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:03 $ @@ -34,7 +37,7 @@ public class HTMLRenderer extends BaseResourceRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -42,7 +45,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -50,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -58,14 +61,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub return "text/html"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { // Encode style in page - read from resource. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ImageRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,10 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:06 $ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,11 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -204,7 +208,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#getUri(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#getUri(javax.faces.context.FacesContext, * java.lang.Object) */ public String getUri(final FacesContext context, Object data) { @@ -275,7 +279,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#getProperty(java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getProperty(java.lang.Object) */ public Object getProperty(Object key) { // TODO Auto-generated method stub @@ -285,7 +289,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#setProperty(java.lang.Object, + * @see org.ajax4jsf.resource.InternetResource#setProperty(java.lang.Object, * java.lang.Object) */ public void setProperty(Object key, Object value) { @@ -296,7 +300,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, * javax.faces.component.UIComponent) */ public void encode(FacesContext context, Object data) throws IOException { @@ -309,7 +313,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, * java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) @@ -326,7 +330,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, * javax.faces.component.UIComponent, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) @@ -342,7 +346,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, * javax.faces.component.UIComponent, java.util.Map) */ public void encodeEnd(FacesContext context, Object component) @@ -357,7 +361,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#send(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResource#send(javax.faces.context.FacesContext, * java.lang.Object) */ public void send(ResourceContext context) throws IOException { @@ -415,7 +419,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResource#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResource#requireFacesContext() */ public boolean requireFacesContext() { // by default, send data in ordinary Http request. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/InternetResourceService.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.Messages; import org.ajax4jsf.cache.Cache; import org.ajax4jsf.cache.CacheConfigurationLoader; import org.ajax4jsf.cache.CacheException; @@ -49,7 +50,10 @@ import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.CacheContent; import org.ajax4jsf.framework.util.config.WebXml; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JarResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,9 @@ import java.io.InputStream; +import org.ajax4jsf.resource.ResourceContext; + /** * Class stoped all resources in application classpath. * TODO - set last midified & expired values. @@ -51,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, java.lang.Object) */ public InputStream getResourceAsStream(ResourceContext context) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Java2Dresource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,8 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.ResourceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +69,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, * java.lang.Object) */ public InputStream getResourceAsStream(ResourceContext context) { @@ -79,7 +80,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(javax.faces.context.FacesContext, + * @see org.ajax4jsf.resource.InternetResourceBase#send(javax.faces.context.FacesContext, * java.lang.Object) */ public void send(ResourceContext context) throws IOException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/JpegRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,9 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:03 $ @@ -37,7 +39,7 @@ public class JpegRenderer extends ImageRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/LogfileRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:02 $ @@ -34,7 +37,7 @@ public class LogfileRenderer extends BaseResourceRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -42,7 +45,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -50,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -58,14 +61,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub return "text/plain"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { // Encode style in page - read from resource. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/OneTimeRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.InternetResource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ private static final Log log = LogFactory.getLog(OneTimeRenderer.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#encodeBegin(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.BaseResourceRenderer#encodeBegin(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(InternetResource resource, FacesContext context, Object data, Map attributes) throws IOException { @@ -52,7 +53,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#encodeEnd(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#encodeEnd(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(InternetResource resource, FacesContext context, Object data) throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/Png8Renderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,6 +29,8 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:04 $ @@ -66,7 +68,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#sendImage(org.ajax4jsf.framework.resource.ResourceContext, + * @see org.ajax4jsf.resource.ImageRenderer#sendImage(org.ajax4jsf.resource.ResourceContext, * java.awt.image.RenderedImage) */ public void sendImage(ResourceContext context, RenderedImage image) @@ -92,7 +94,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#getImageType() + * @see org.ajax4jsf.resource.ImageRenderer#getImageType() */ public int getImageType() { return BufferedImage.TYPE_BYTE_INDEXED; @@ -102,7 +104,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ImageRenderer#createImage(int, int) + * @see org.ajax4jsf.resource.ImageRenderer#createImage(int, int) */ public BufferedImage createImage(int width, int height) { @@ -113,7 +115,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/PngRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,8 @@ import javax.imageio.ImageIO; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:05 $ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -43,9 +43,13 @@ import javax.imageio.ImageIO; import javax.servlet.ServletContext; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.base64.Codec; import org.ajax4jsf.framework.util.config.WebXml; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ResourceLifecycle.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,9 @@ import javax.faces.event.PhaseListener; import javax.faces.lifecycle.Lifecycle; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; + /** * Lifecycle for simulate faces request processing for resource. * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ScriptRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,8 +25,10 @@ import java.io.InputStream; import java.io.OutputStream; -import org.ajax4jsf.framework.util.javascript.JSMin; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.javascript.JSMin; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +44,7 @@ private static final Log _log = LogFactory.getLog(ScriptRenderer.class); /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { // TODO Auto-generated method stub @@ -50,7 +52,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { // TODO Auto-generated method stub @@ -58,7 +60,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { // TODO Auto-generated method stub @@ -66,7 +68,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO - use configurable encoding ? @@ -74,7 +76,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { InputStream in = base.getResourceAsStream(context); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/ServletResourceContext.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:01 $ @@ -54,7 +56,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#setHeader(java.lang.String, java.lang.String) */ public void setHeader(String name, String value) { response.setHeader(name,value); @@ -62,7 +64,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, int) + * @see org.ajax4jsf.resource.ResourceContext#setIntHeader(java.lang.String, int) */ public void setIntHeader(String name, int value) { response.setIntHeader(name,value); @@ -70,7 +72,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#setDateHeader(java.lang.String, long) + * @see org.ajax4jsf.resource.ResourceContext#setDateHeader(java.lang.String, long) */ public void setDateHeader(String name, long value) { response.setDateHeader(name,value); @@ -78,7 +80,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getOutputStream() + * @see org.ajax4jsf.resource.ResourceContext#getOutputStream() */ public OutputStream getOutputStream() throws IOException { // TODO Auto-generated method stub @@ -86,21 +88,21 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getQueryString() + * @see org.ajax4jsf.resource.ResourceContext#getQueryString() */ public String getQueryString() { return request.getQueryString(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getPathInfo() + * @see org.ajax4jsf.resource.ResourceContext#getPathInfo() */ public String getPathInfo() { return request.getPathInfo(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getSessionAttribute(java.lang.String) + * @see org.ajax4jsf.resource.ResourceContext#getSessionAttribute(java.lang.String) */ public Object getSessionAttribute(String name) { return request.getSession(false).getAttribute(name); @@ -117,7 +119,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceContext#getWriter() + * @see org.ajax4jsf.resource.ResourceContext#getWriter() */ public PrintWriter getWriter() throws IOException { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/SmartPositionScript.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ public class SmartPositionScript extends ClientScript { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ClientScript#getJavaScript() + * @see org.ajax4jsf.resource.ClientScript#getJavaScript() */ public String getJavaScript() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,6 +25,8 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.ResourceContext; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: nick_belaevski $) * @version $Revision: 1.1.2.2 $ $Date: 2007/01/11 16:52:14 $ @@ -52,7 +54,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ public InputStream getResourceAsStream(ResourceContext context) { return context.getResourceAsStream(path); @@ -61,7 +63,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable(ResourceContext resourceContext) { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,28 +32,28 @@ public class StyleRenderer extends OneTimeRenderer { /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() */ protected String getTag() { return "link"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { return "href"; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { return new String[][]{{"type","text/css"},{"rel","stylesheet"}}; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.ResourceRenderer#getContentType() + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() */ public String getContentType() { // TODO use configurable encoding ? @@ -61,7 +61,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.framework.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.BaseResourceRenderer#customEncode(org.ajax4jsf.resource.InternetResource, javax.faces.context.FacesContext, java.lang.Object) */ /* protected void customEncode(InternetResource resource, FacesContext context, Object data) throws IOException { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,9 @@ import org.ajax4jsf.framework.renderer.compiler.HtmlCompiler; import org.ajax4jsf.framework.renderer.compiler.PreparedTemplate; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.skin.SkinFactory; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.SkinFactory; /** * @author shura @@ -56,7 +58,7 @@ }; /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#send(org.ajax4jsf.framework.resource.InternetResource, org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { PreparedTemplate template = null; @@ -108,7 +110,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#requireFacesContext() + * @see org.ajax4jsf.resource.BaseResourceRenderer#requireFacesContext() */ public boolean requireFacesContext() { return true; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/TemplateCSSResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,12 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; + /** * Class for create and send resources from template ( at most, used for CSS files ) * @author shura (latest modification by $Author: nick_belaevski $) @@ -77,7 +82,7 @@ * @param data * @param attributes * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encode(FacesContext context, Object data, Map attributes) throws IOException { _resource.encode(context, data, attributes); @@ -87,7 +92,7 @@ * @param context * @param data * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#encode(javax.faces.context.FacesContext, java.lang.Object) */ public void encode(FacesContext context, Object data) throws IOException { _resource.encode(context, data); @@ -98,7 +103,7 @@ * @param component * @param attrs * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) + * @see org.ajax4jsf.resource.InternetResource#encodeBegin(javax.faces.context.FacesContext, java.lang.Object, java.util.Map) */ public void encodeBegin(FacesContext context, Object component, Map attrs) throws IOException { _resource.encodeBegin(context, component, attrs); @@ -108,7 +113,7 @@ * @param context * @param component * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#encodeEnd(javax.faces.context.FacesContext, java.lang.Object) */ public void encodeEnd(FacesContext context, Object component) throws IOException { _resource.encodeEnd(context, component); @@ -116,7 +121,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getContentLength(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getContentLength(ResourceContext) */ public int getContentLength(ResourceContext resourceContext) { return _resource.getContentLength(resourceContext); @@ -124,7 +129,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getContentType(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getContentType(ResourceContext) */ public String getContentType(ResourceContext resourceContext) { return _resource.getContentType(null); @@ -132,7 +137,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getExpired(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getExpired(ResourceContext) */ public Date getExpired(ResourceContext resourceContext) { return _resource.getExpired(null); @@ -140,7 +145,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getKey() + * @see org.ajax4jsf.resource.InternetResource#getKey() */ public String getKey() { return _resource.getKey(); @@ -148,7 +153,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getLastModified(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getLastModified(ResourceContext) */ public Date getLastModified(ResourceContext resourceContext) { return _resource.getLastModified(null); @@ -157,7 +162,7 @@ /** * @param key * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getProperty(java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getProperty(java.lang.Object) */ public Object getProperty(Object key) { return _resource.getProperty(key); @@ -166,7 +171,7 @@ /** * @param context * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getResourceAsStream(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getResourceAsStream(org.ajax4jsf.resource.ResourceContext) */ public InputStream getResourceAsStream(ResourceContext context) { return _resource.getResourceAsStream(context); @@ -176,7 +181,7 @@ * @param context * @param data * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getUri(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#getUri(javax.faces.context.FacesContext, java.lang.Object) */ public String getUri(FacesContext context, Object data) { return _resource.getUri(context, data); @@ -184,7 +189,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#isCacheable(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#isCacheable(ResourceContext) */ public boolean isCacheable(ResourceContext resourceContext) { return _resource.isCacheable(null); @@ -192,7 +197,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#isSessionAware() + * @see org.ajax4jsf.resource.InternetResource#isSessionAware() */ public boolean isSessionAware() { return _resource.isSessionAware(); @@ -200,7 +205,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResource#requireFacesContext() */ public boolean requireFacesContext() { return _resource.requireFacesContext(); @@ -209,7 +214,7 @@ /** * @param context * @throws IOException - * @see org.ajax4jsf.framework.resource.InternetResource#send(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#send(org.ajax4jsf.resource.ResourceContext) */ public void send(ResourceContext context) throws IOException { _resource.send(context); @@ -217,7 +222,7 @@ /** * @param response - * @see org.ajax4jsf.framework.resource.InternetResource#sendHeaders(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#sendHeaders(org.ajax4jsf.resource.ResourceContext) */ public void sendHeaders(ResourceContext response) { _resource.sendHeaders(response); @@ -225,7 +230,7 @@ /** * @param key - * @see org.ajax4jsf.framework.resource.InternetResource#setKey(java.lang.String) + * @see org.ajax4jsf.resource.InternetResource#setKey(java.lang.String) */ public void setKey(String key) { _resource.setKey(key); @@ -234,7 +239,7 @@ /** * @param key * @param value - * @see org.ajax4jsf.framework.resource.InternetResource#setProperty(java.lang.Object, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResource#setProperty(java.lang.Object, java.lang.Object) */ public void setProperty(Object key, Object value) { _resource.setProperty(key, value); @@ -242,7 +247,7 @@ /** * @param renderer - * @see org.ajax4jsf.framework.resource.InternetResource#setRenderer(org.ajax4jsf.framework.resource.ResourceRenderer) + * @see org.ajax4jsf.resource.InternetResource#setRenderer(org.ajax4jsf.resource.ResourceRenderer) */ public void setRenderer(ResourceRenderer renderer) { _resource.setRenderer(renderer); @@ -250,7 +255,7 @@ /** * @return - * @see org.ajax4jsf.framework.resource.InternetResource#getRenderer(ResourceContext) + * @see org.ajax4jsf.resource.InternetResource#getRenderer(ResourceContext) */ public ResourceRenderer getRenderer(ResourceContext resourceContext) { return _resource.getRenderer(null); @@ -258,7 +263,7 @@ /** * @param cacheable - * @see org.ajax4jsf.framework.resource.InternetResource#setCacheable(boolean) + * @see org.ajax4jsf.resource.InternetResource#setCacheable(boolean) */ public void setCacheable(boolean cacheable) { _resource.setCacheable(cacheable); @@ -266,7 +271,7 @@ /** * @param expired - * @see org.ajax4jsf.framework.resource.InternetResource#setExpired(java.util.Date) + * @see org.ajax4jsf.resource.InternetResource#setExpired(java.util.Date) */ public void setExpired(Date expired) { _resource.setExpired(expired); @@ -274,7 +279,7 @@ /** * @param lastModified - * @see org.ajax4jsf.framework.resource.InternetResource#setLastModified(java.util.Date) + * @see org.ajax4jsf.resource.InternetResource#setLastModified(java.util.Date) */ public void setLastModified(Date lastModified) { _resource.setLastModified(lastModified); @@ -282,7 +287,7 @@ /** * @param sessionAware - * @see org.ajax4jsf.framework.resource.InternetResource#setSessionAware(boolean) + * @see org.ajax4jsf.resource.InternetResource#setSessionAware(boolean) */ public void setSessionAware(boolean sessionAware) { _resource.setSessionAware(sessionAware); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/UserResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,6 +32,9 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; +import org.ajax4jsf.resource.ResourceComponent; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura * @@ -61,7 +64,7 @@ this.contentType = contentType; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) */ public Object getDataToStore(FacesContext context, Object data) { UriData dataToStore = null; @@ -85,7 +88,7 @@ return dataToStore; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResourceBase#send(org.ajax4jsf.resource.ResourceContext) */ public void send(ResourceContext context) throws IOException { UriData data = (UriData) restoreData(context); @@ -109,7 +112,7 @@ } } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResourceBase#requireFacesContext() */ public boolean requireFacesContext() { // TODO Auto-generated method stub Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,15 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.Messages; +import org.ajax4jsf.framework.resource.CachedResourceBuilder; +import org.ajax4jsf.framework.resource.DualLRUMap; +import org.ajax4jsf.framework.resource.ResourceBean; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; -import org.ajax4jsf.framework.resource.ResourceNotFoundException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.framework.resource.ResourceBytesDataBean; +import org.ajax4jsf.framework.resource.ResourceDataBean; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +58,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#decrypt(byte[]) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#decrypt(byte[]) */ protected byte[] decrypt(byte[] data) { // dummy - data not send via internet. @@ -63,7 +68,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#encrypt(byte[]) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#encrypt(byte[]) */ protected byte[] encrypt(byte[] data) { // dummy - data not send via internet. @@ -73,7 +78,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getResourceDataForKey(java.lang.String) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getResourceDataForKey(java.lang.String) */ public Object getResourceDataForKey(String key) { ResourceBean bean = (ResourceBean) cache.get(key); @@ -87,7 +92,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getResourceForKey(java.lang.String) + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getResourceForKey(java.lang.String) */ public InternetResource getResourceForKey(String key) throws ResourceNotFoundException { @@ -102,7 +107,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#getUri(org.ajax4jsf.framework.resource.InternetResource, + * @see org.ajax4jsf.resource.ResourceBuilderImpl#getUri(org.ajax4jsf.resource.InternetResource, * javax.faces.context.FacesContext, java.lang.Object) */ public String getUri(InternetResource resource, FacesContext facesContext, @@ -145,7 +150,7 @@ /* * (non-Javadoc) * - * @see org.ajax4jsf.framework.resource.ResourceBuilderImpl#init(javax.servlet.ServletContext, + * @see org.ajax4jsf.resource.ResourceBuilderImpl#init(javax.servlet.ServletContext, * java.lang.String) */ public void init() Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/DummySkinConfiguration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,9 @@ import javax.faces.context.FacesContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinConfiguration; + /** * @author shura * @@ -40,21 +43,21 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#containsParameter(java.lang.String) + * @see org.richfaces.skin.SkinConfiguration#containsParameter(java.lang.String) */ public boolean containsParameter(String name) { return _skin.containsProperty(name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return _skin.getParameter(context, name); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) + * @see org.richfaces.skin.SkinConfiguration#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) */ public Object getParameter(FacesContext context, String name, String skinName, Object defaultValue) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinBean.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,9 @@ import javax.faces.context.FacesContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:40 $ @@ -36,7 +39,7 @@ public class SkinBean extends AbstractMap implements Skin { /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#hashCode(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#hashCode(javax.faces.context.FacesContext) */ public int hashCode(FacesContext context) { // TODO Auto-generated method stub @@ -95,14 +98,14 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) */ public String getRenderKitId(FacesContext context) { return getSkin().getRenderKitId(context); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return getSkin().getParameter(context,name); @@ -118,7 +121,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#containsProperty(java.lang.String) + * @see org.richfaces.skin.Skin#containsProperty(java.lang.String) */ public boolean containsProperty(String name) { return getSkin().containsProperty(name); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinFactoryImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,9 +38,12 @@ import javax.faces.el.ReferenceSyntaxException; import javax.faces.el.ValueBinding; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import org.richfaces.skin.SkinNotFoundException; /** * Implementation of {@link SkinFactory} with building skins from properties files. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,6 +28,8 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.richfaces.skin.Skin; + /** * Singleton ( in respect as collection of different skins ) for produce * instances properties for all used skins. @@ -57,21 +59,21 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#getRenderKitId(javax.faces.context.FacesContext) */ public String getRenderKitId(FacesContext context) { return (String) getValueReference(context,skinParams.get(RENDER_KIT_PARAMETER)); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String) */ public Object getParameter(FacesContext context, String name) { return getValueReference(context,skinParams.get(name)); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) + * @see org.richfaces.skin.Skin#getParameter(javax.faces.context.FacesContext, java.lang.String, java.lang.String, java.lang.Object) */ public Object getParameter(FacesContext context, String name, Object defaultValue) { Object value = getValueReference(context, skinParams.get(name)); @@ -104,7 +106,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#containsProperty(java.lang.String) + * @see org.richfaces.skin.Skin#containsProperty(java.lang.String) */ public boolean containsProperty(String name) { // TODO Auto-generated method stub @@ -113,7 +115,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.skin.Skin#hashCode(javax.faces.context.FacesContext) + * @see org.richfaces.skin.Skin#hashCode(javax.faces.context.FacesContext) */ public int hashCode(FacesContext context) { Integer requestCode = (Integer) context.getExternalContext().getRequestMap().get(REQUEST_HASH_CODE_PARAMETER); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinPropertyResolver.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,9 +26,10 @@ import javax.faces.el.PropertyNotFoundException; import javax.faces.el.PropertyResolver; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.skin.Skin; /** * Resolve Skin propertyes. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/skin/SkinVariableResolver.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,6 +25,8 @@ import javax.faces.el.EvaluationException; import javax.faces.el.VariableResolver; +import org.richfaces.skin.SkinFactory; + /** * Resolve current skin as EL Variable. e.g. #{chameleonSkin['color'] } #{chameleonSkin.color} * must be evaluated as Skin.getProperty(context,"color"); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentBodyTagBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.webapp.UIComponentBodyTag; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/taglib/UIComponentTagBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.webapp.UIComponentTag; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/GifEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** GifEncoder - writes out an image as a GIF. * Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlColor.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/HtmlDimensions.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,7 +26,7 @@ import java.text.ParseException; import java.util.regex.Pattern; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class HtmlDimensions { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/SelectUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,7 +41,7 @@ import javax.faces.el.ValueBinding; import javax.faces.model.SelectItem; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/Base64.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ package org.ajax4jsf.framework.util.base64; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/base64/URL64Codec.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -37,7 +37,7 @@ package org.ajax4jsf.framework.util.base64; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/config/WebXml.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -35,7 +35,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -217,7 +217,7 @@ } /** - * Convert {@link org.ajax4jsf.framework.resource.InternetResource } key to + * Convert {@link org.ajax4jsf.resource.InternetResource } key to * real URL for handle by chameleon filter, depend of mapping in WEB.XML . * For prefix or * mapping, prepend servlet prefix and default Resource * prefix to key. For suffix mapping, prepend with resource prefix and Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/DiffusionFilterOp.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -57,7 +57,7 @@ import java.awt.image.DataBufferInt; import java.awt.image.IndexColorModel; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class DiffusionFilterOp implements BufferedImageOp { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageGenerator.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -46,7 +46,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Factory class for generating Image objects from various sources. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageInfo.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -44,7 +44,7 @@ import java.net.URL; import java.util.Vector; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Get file format, image resolution, number of bits per pixel and optionally Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWaiter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,7 +40,7 @@ import java.awt.Image; import java.awt.image.ImageObserver; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * The ImageWaiter will only be used like this: Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/ImageWrapper.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -70,7 +70,7 @@ import java.awt.image.IndexColorModel; import java.io.IOException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Abstract base class for Image Wrappers. Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/RoundGradientPaint.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,7 @@ import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; public class RoundGradientPaint implements Paint { protected Point2D mPoint; protected Point2D mRadius; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/SimpleGIFEncoder.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * GIFEncoder is a class which takes an image and saves it to a stream Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/util/image/imageio/gif/GIFImageWriter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -52,8 +52,8 @@ import javax.imageio.ImageWriter; import javax.imageio.metadata.IIOMetadata; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.util.image.GIFEncoder; -import org.ajax4jsf.framework.util.message.Messages; public class GIFImageWriter extends ImageWriter { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Configuration.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -88,7 +88,7 @@ import java.util.Map; import java.util.Properties; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.TypeInfo; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMAttrMapImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMDocumentImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMElementImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.TypeInfo; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMNodeImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -75,7 +75,7 @@ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.UserDataHandler; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMProcessingInstructionImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/DOMTextImpl.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -74,7 +74,7 @@ */ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import org.w3c.dom.DOMException; import org.w3c.dom.Text; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/OutFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -78,7 +78,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/StreamInFactory.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -78,7 +78,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/TidyUtils.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -75,7 +75,7 @@ package org.ajax4jsf.org.w3c.tidy; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; /** * Utility class with handy methods, mainly for String handling or for reproducing c behaviours. Modified: trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,8 +25,8 @@ import java.io.Writer; import java.util.Arrays; -import org.ajax4jsf.framework.util.javascript.JSEncoder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; +import org.ajax4jsf.javascript.JSEncoder; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.renderer.AjaxChildrenRenderer; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/ScriptOptions.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,9 +38,9 @@ import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.ScriptStringBase; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.ScriptStringBase; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author Maksim Kaszynski Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,12 +33,12 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,9 +30,9 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; public abstract class SliderArrowBase extends Java2Dresource{ private static final Dimension dimensions = new Dimension(7, 8); Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,9 +23,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class SliderArrowImage extends SliderArrowBase { protected Object getDataToStore(FacesContext context, Object data) { Modified: trunk/framework/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -11,8 +11,8 @@ </factory> <application> <!-- - <variable-resolver>org.ajax4jsf.framework.skin.SkinVariableResolver</variable-resolver> - <property-resolver>org.ajax4jsf.framework.skin.SkinPropertyResolver</property-resolver> + <variable-resolver>org.richfaces.skin.SkinVariableResolver</variable-resolver> + <property-resolver>org.richfaces.skin.SkinPropertyResolver</property-resolver> --> <view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler> <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> @@ -23,12 +23,12 @@ </lifecycle> <managed-bean> <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class> + <managed-bean-class>org.richfaces.skin.VersionBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> Modified: trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java =================================================================== --- trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/impl/src/test/java/org/ajax4jsf/framework/util/javascript/ScriptUtilsTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,6 +29,8 @@ import java.util.TreeMap; import java.util.TreeSet; +import org.ajax4jsf.javascript.ScriptUtils; + import junit.framework.TestCase; /** @@ -109,7 +111,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testStringToScript() { Object obj = "foo"; @@ -117,14 +119,14 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testArrayToScript() { int[] obj = {1,2,3,4,5}; assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalArrayToScript() { int[][] obj = {{1,2},{3,4}}; @@ -132,7 +134,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalStringArrayToScript() { String[][] obj = {{"one","two"},{"three","four"}}; @@ -143,7 +145,7 @@ assertEquals("{'a':[['one','two'] ,['three','four'] ] ,'b':'c'} ", ScriptUtils.toScript(map)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testListToScript() { List obj = new ArrayList(); @@ -156,7 +158,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testSetToScript() { Set obj = new TreeSet(); @@ -168,7 +170,7 @@ assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectArrayToScript() { Bean[] obj = {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; @@ -176,7 +178,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectListToScript() { Bean[] array = {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; @@ -185,7 +187,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#toScript(java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testMapToScript() { TreeMap obj = new TreeMap(); @@ -195,7 +197,7 @@ assertEquals("{'a':'foo','b':'bar','c':'baz'} ", ScriptUtils.toScript(obj)); } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#addEncodedString(java.lang.StringBuffer, java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncodedString(java.lang.StringBuffer, java.lang.Object)}. */ public void testAddEncodedString() { StringBuffer buff = new StringBuffer(); @@ -204,7 +206,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.util.javascript.ScriptUtils#addEncoded(java.lang.StringBuffer, java.lang.Object)}. + * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncoded(java.lang.StringBuffer, java.lang.Object)}. */ public void testAddEncoded() { StringBuffer buff = new StringBuffer(); Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,17 +48,17 @@ import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer; import org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.skin.SkinBean; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.skin.VersionBean; import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser; import org.apache.shale.test.base.AbstractJsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; import org.apache.shale.test.mock.MockResponseWriter; import org.apache.shale.test.mock.MockServletOutputStream; +import org.richfaces.skin.SkinFactory; import com.gargoylesoftware.htmlunit.MockWebConnection; import com.gargoylesoftware.htmlunit.Page; Modified: trunk/framework/test/src/test/java/DnDScriptTest.java =================================================================== --- trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,7 +23,7 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.resource.FacesResourceContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** @@ -58,7 +58,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceBase#send(org.ajax4jsf.framework.resource.ResourceContext)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceBase#send(org.ajax4jsf.resource.ResourceContext)}. */ public void testSend() { DnDScript resource = new DnDScript(); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -33,7 +33,7 @@ public static Test suite() { TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.framework.resource"); + "Test for org.ajax4jsf.resource"); //$JUnit-BEGIN$ suite.addTestSuite(ResourceServiceThreadsTestCase.class); suite.addTestSuite(InternetResourceServiceTestCase.class); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,6 +26,9 @@ import org.ajax4jsf.framework.renderer.compiler.TemplateContext; import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; @@ -97,7 +100,7 @@ methodCalled = true; } /* - * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.send(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)' */ public void testSend() throws IOException { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -114,7 +117,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.TemplateCSSResource(String)' + * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)' */ public void testTemplateCSSResource() throws IOException { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -133,14 +136,14 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.isCacheable()' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()' */ public void testIsCacheable() { } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getContentType()' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()' */ public void testGetContentType() { @@ -150,7 +153,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getUri(FacesContext, Object)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)' */ public void testGetUri() { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; @@ -162,14 +165,14 @@ } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' */ public void testGetResourceAsStream() { } /* - * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.sendHeaders(ResourceContext)' + * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)' */ public void testSendHeaders() { String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,8 @@ import java.io.IOException; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockServletOutputStream; @@ -55,7 +57,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. * @throws Exception */ public void testInit() throws Exception { @@ -67,7 +69,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -89,7 +91,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -114,7 +116,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. * @throws IOException * @throws Exception */ @@ -147,7 +149,7 @@ } /** - * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#getProperties(java.lang.String)}. + * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}. */ public void testGetProperties() { // fail("Not yet implemented"); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,6 +24,8 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; +import org.ajax4jsf.resource.ResourceContext; + /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,6 +23,8 @@ import javax.faces.context.FacesContext; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; import org.apache.shale.test.mock.MockHttpServletRequest; import org.apache.shale.test.mock.MockHttpServletResponse; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,6 +36,8 @@ import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * Test for Skin/skin factory methods. @@ -83,7 +85,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getInstance()' + * Test method for 'org.richfaces.skin.SkinFactory.getInstance()' */ public void testGetInstance() { SkinFactory factory = SkinFactory.getInstance(); @@ -92,7 +94,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testGetSkin() { SkinFactory factory = SkinFactory.getInstance(); @@ -131,7 +133,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -167,7 +169,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testCyclicSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -189,7 +191,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testBadSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -210,7 +212,7 @@ assertTrue(false); } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ public void testGetBindedSkin() { SkinFactory factory = SkinFactory.getInstance(); @@ -306,7 +308,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getDefaultProperties()' + * Test method for 'org.richfaces.skin.SkinFactory.getDefaultProperties()' */ public void testGetDefaultProperties() { SkinFactoryImpl factory = (SkinFactoryImpl) SkinFactory.getInstance(); @@ -317,7 +319,7 @@ } /* - * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkinName(FacesContext)' + * Test method for 'org.richfaces.skin.SkinFactory.getSkinName(FacesContext)' */ public void testGetSkinName() { Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ public static Test suite() { TestSuite suite = new TestSuite( - "Test for org.ajax4jsf.framework.skin"); + "Test for org.richfaces.skin"); //$JUnit-BEGIN$ suite.addTestSuite(SkinThreadsTestCase.class); suite.addTestSuite(SkinTestCase.class); Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,6 +24,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -11,7 +11,7 @@ import javax.faces.component.UIInput; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockResponseWriter; Modified: trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml =================================================================== --- trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -3,7 +3,7 @@ xmlns:u='http://jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".exadel_debug_console"> - <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCall" /> + <f:call name="org.ajax4jsf.resource.CSSTemplateTestCase.contextCall" /> <u:style name="margin" value="0px"/> <u:style name="font-size" skin="preferableDataSizeFont"></u:style> </u:selector> Modified: trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml =================================================================== --- trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -3,7 +3,7 @@ xmlns:u='http://jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".exadel_debug_console"> - <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCallWithParam" > + <f:call name="org.ajax4jsf.resource.CSSTemplateTestCase.contextCallWithParam" > <f:parameter value="Test" /> </f:call> <u:style name="margin" value="0px"/> Modified: trunk/ui/core/src/main/config/resources/resources-config.xml =================================================================== --- trunk/ui/core/src/main/config/resources/resources-config.xml 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/config/resources/resources-config.xml 2007-07-04 00:30:26 UTC (rev 1458) @@ -6,7 +6,7 @@ <resource class="org.ajax4jsf.framework.ajax.AjaxScript"> <name>ajax.js</name> </resource> - <resource class="org.ajax4jsf.framework.resource.PrototypeScript"> + <resource class="org.ajax4jsf.resource.PrototypeScript"> <name>prototype.js</name> </resource> <resource class="org.ajax4jsf.dnd.DnDScript"> @@ -15,11 +15,11 @@ <resource > <name>form.js</name> <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path> - <renderer class="org.ajax4jsf.framework.resource.ScriptRenderer"/> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource > <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path> - <renderer class="org.ajax4jsf.framework.resource.ScriptRenderer"/> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> </resource-config> Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIActionParameter.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,8 +31,8 @@ import javax.faces.event.ActionEvent; import javax.faces.event.ActionListener; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.ajax.JavaScriptParameter; -import org.ajax4jsf.framework.util.message.Messages; /** * @author shura (latest modification by $Author: alexsmirnov $) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxStatus.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,9 +29,9 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,11 +28,11 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.framework.ajax.EventValueBinding; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/resource/UIMediaOutput.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,8 +22,9 @@ package org.ajax4jsf.ajax.resource; import javax.faces.component.UIOutput; -import org.ajax4jsf.framework.resource.ResourceComponent; +import org.ajax4jsf.resource.ResourceComponent; + /** * @author shura * Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxFunctionRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,10 +31,10 @@ import org.ajax4jsf.ajax.UIAjaxFunction; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.ajax.UIResource; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.renderkit.HeaderResourceProducer; +import org.ajax4jsf.resource.InternetResource; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,8 +40,8 @@ import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,8 +31,8 @@ import org.ajax4jsf.ajax.UIPoll; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPushRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,8 +32,8 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSReference; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxStatusRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import org.ajax4jsf.ajax.UIAjaxStatus; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunctionDefinition; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -35,10 +35,10 @@ import javax.faces.context.ResponseWriter; import javax.faces.event.ActionEvent; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.javascript.JSFunction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/MediaOutputRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,12 +32,12 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.resource.UIMediaOutput; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; /** * @author shura Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/ActionParamHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,8 +27,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIActionParameter; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.el.LegacyValueBinding; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,10 +28,10 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; +import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxSource; import org.ajax4jsf.framework.ajax.AjaxListenerHelper; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/FacetHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; -import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/KeepAliveHandler.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,8 +29,8 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.AjaxPhaseListener; -import org.ajax4jsf.framework.util.message.Messages; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/ActionParamTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,9 +28,9 @@ import javax.faces.convert.Converter; import javax.faces.webapp.UIComponentTag; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIActionParameter; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,10 +30,10 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; +import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.AjaxSource; import org.ajax4jsf.framework.ajax.AjaxListenerHelper; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxRegionTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import javax.faces.component.UIComponent; import javax.faces.el.MethodBinding; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIAjaxRegion; import org.ajax4jsf.component.AjaxContainer; import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; import org.ajax4jsf.renderkit.html.AjaxRegionRenderer; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxSupportTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import javax.faces.component.UIComponent; import javax.faces.webapp.UIComponentTag; +import org.ajax4jsf.Messages; import org.ajax4jsf.ajax.UIAjaxSupport; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.taglib.UIComponentTagBase; -import org.ajax4jsf.framework.util.message.Messages; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,8 +28,8 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; +import org.ajax4jsf.Messages; import org.ajax4jsf.framework.renderer.AjaxPhaseListener; -import org.ajax4jsf.framework.util.message.Messages; /** * @author shura Modified: trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java =================================================================== --- trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,11 +42,11 @@ import javax.faces.el.ValueBinding; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.event.DataFilterSliderAdapter; @@ -80,7 +80,7 @@ */ static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("scripts/scriptaculous-js-1.6.5/src/slider.js"); } Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -57,7 +57,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); } private UIDatascroller scroller; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,10 +31,10 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; import org.richfaces.event.DropEvent; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIDragSupport; import org.richfaces.renderkit.CompositeRenderer; import org.richfaces.renderkit.DnDParametersEncoder; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,8 +30,8 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIDropSupport; import org.richfaces.renderkit.CompositeRenderer; import org.richfaces.renderkit.DnDParametersEncoder; Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java =================================================================== --- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,7 +40,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("scripts/browser_info.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript"); Modified: trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -36,7 +36,7 @@ import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.UIDropDownMenu; import org.richfaces.component.UIMenuGroup; import org.richfaces.component.UIMenuItem; Modified: trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java =================================================================== --- trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,10 +27,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; @@ -50,7 +50,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript"); javaScripts.add("scripts/menu.js"); Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java =================================================================== --- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,7 +48,7 @@ private final static String TEST_STYLE = "width:500px; height:400px"; static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/gmap.js"); javaScripts.add("http://maps.google.com"); Modified: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java =================================================================== --- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -23,9 +23,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class SliderArrowSelectedImage extends SliderArrowBase { protected Object getDataToStore(FacesContext context, Object data) { Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java =================================================================== --- trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import com.gargoylesoftware.htmlunit.KeyValuePair; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.*; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.SliderArrowImage; @@ -68,7 +68,7 @@ */ static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/SliderScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerButtonGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.renderkit.html.BaseGradient; public class SpinnerButtonGradient extends BaseGradient { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/background/SpinnerFieldGradient.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,7 +25,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.renderkit.html.BaseGradient; public class SpinnerFieldGradient extends BaseGradient { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonDown.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class SpinnerButtonDown extends SpinnerButtonImage { private static final Dimension dimensions = new Dimension(14, 7); Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,11 +26,11 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public abstract class SpinnerButtonImage extends Java2Dresource { Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonUp.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class SpinnerButtonUp extends SpinnerButtonImage { private static final Dimension dimensions = new Dimension(14, 7); Modified: trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java =================================================================== --- trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,11 +24,11 @@ import com.gargoylesoftware.htmlunit.KeyValuePair; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.*; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.background.SpinnerButtonGradient; @@ -59,7 +59,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("script/SpinnerScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -10,12 +10,12 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public class MenuNodeImage extends Java2Dresource { Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -40,10 +40,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -41,10 +41,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockViewRoot; Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -42,7 +42,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript()"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript()"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript()"); javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript()"); } */ Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,8 +24,8 @@ import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * JSF component class Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.UIModalPanel; import org.richfaces.component.util.ViewUtil; Modified: trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java =================================================================== --- trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -56,7 +56,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/utils.js"); javaScripts.add("scripts/modalPanel.js"); javaScripts.add("scripts/modalPanelBorders.js"); Modified: trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java =================================================================== --- trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,7 +29,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIPaint2D; /** Modified: trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java =================================================================== --- trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,9 +39,9 @@ import org.ajax4jsf.framework.resource.InternetResourceBase; import org.ajax4jsf.framework.resource.JpegRenderer; import org.ajax4jsf.framework.resource.PngRenderer; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.resource.ResourceRenderer; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.richfaces.component.UIPaint2D; @@ -62,7 +62,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getRenderer() + * @see org.ajax4jsf.resource.InternetResourceBase#getRenderer() */ public ResourceRenderer getRenderer() { return _renderers[0]; @@ -72,14 +72,14 @@ return getRenderer(); } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() + * @see org.ajax4jsf.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable() { return false; } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#requireFacesContext() + * @see org.ajax4jsf.resource.InternetResourceBase#requireFacesContext() */ public boolean requireFacesContext() { // work in context @@ -88,7 +88,7 @@ /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) */ protected Object getDataToStore(FacesContext context, Object data) { if (data instanceof UIPaint2D) { @@ -156,7 +156,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#send(javax.faces.context.FacesContext, java.lang.Object) + * @see org.ajax4jsf.resource.InternetResourceBase#send(javax.faces.context.FacesContext, java.lang.Object) */ public void send(ResourceContext context) throws IOException { ImageData data = (ImageData) restoreData(context); @@ -198,7 +198,7 @@ } /* (non-Javadoc) - * @see org.ajax4jsf.framework.resource.InternetResourceBase#sendHeaders(org.ajax4jsf.framework.resource.ResourceContext) + * @see org.ajax4jsf.resource.InternetResourceBase#sendHeaders(org.ajax4jsf.resource.ResourceContext) */ public void sendHeaders(ResourceContext context) { ImageData data = (ImageData) restoreData(context); Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,14 +22,14 @@ package org.richfaces.renderkit.html.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.component.UISeparator; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.context.FacesContext; import java.awt.*; Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,14 +22,14 @@ package org.richfaces.renderkit.html.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; import org.richfaces.component.UISeparator; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; Modified: trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java =================================================================== --- trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,10 +27,10 @@ import javax.faces.component.html.HtmlOutputText; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import com.gargoylesoftware.htmlunit.Page; Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -48,7 +48,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript"); javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -29,14 +29,14 @@ import org.ajax4jsf.framework.renderer.compiler.HtmlCompiler; import org.ajax4jsf.framework.renderer.compiler.PreparedTemplate; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.TemplateCSSResource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.AjaxSuggestionEvent; import org.richfaces.component.UISuggestionBox; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.FacesException; import javax.faces.component.NamingContainer; @@ -697,7 +697,7 @@ * Gets additional scripts. * * @return array of resources - * {@link org.ajax4jsf.framework.resource.InternetResource} + * {@link org.ajax4jsf.resource.InternetResource} */ protected final InternetResource[] getAdditionalScripts() { return additionalScripts; @@ -707,7 +707,7 @@ * Gets styles. * * @return array of styles - * {@link org.ajax4jsf.framework.resource.InternetResource} + * {@link org.ajax4jsf.resource.InternetResource} */ protected final InternetResource[] getStyles() { return styles; Modified: trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java =================================================================== --- trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -44,7 +44,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("prototype.js"); - javaScripts.add("org.ajax4jsf.framework.resource.SmartPositionScript"); + javaScripts.add("org.ajax4jsf.resource.SmartPositionScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/scriptaculo.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/suggestionbox.js"); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -24,7 +24,7 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.UISwitchablePanel; import org.richfaces.component.UITab; import org.richfaces.component.UITabPanel; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -26,8 +26,8 @@ import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.HtmlDimensions; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.UISwitchablePanel; import org.richfaces.component.UITab; import org.richfaces.component.UITabPanel; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientA.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,8 +21,8 @@ package org.richfaces.renderkit.images; -import org.ajax4jsf.framework.skin.Skin; import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabGradientB.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -21,8 +21,8 @@ package org.richfaces.renderkit.images; -import org.ajax4jsf.framework.skin.Skin; import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -22,12 +22,12 @@ package org.richfaces.renderkit.images; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; import javax.faces.context.FacesContext; import java.awt.*; Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,10 +25,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; @@ -48,7 +48,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js"); Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java =================================================================== --- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -51,7 +51,7 @@ static { javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/togglePanel.js"); } Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/DotSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -31,7 +31,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/GridSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class GridSeparatorImage extends ToolBarSeparatorImage { Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/LineSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/SquareSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -32,7 +32,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; /** Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,14 +27,14 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.richfaces.component.UIToolBar; import org.richfaces.component.UIToolBarGroup; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; /** * @author Maksim Kaszynski, Filip Antonov Modified: trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java =================================================================== --- trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/toolBar/src/test/java/org/richfaces/component/ToolBarComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -25,10 +25,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import junit.framework.Assert; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import javax.faces.component.UICommand; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -15,8 +15,8 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; import org.richfaces.component.UITree; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -39,9 +39,9 @@ import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.RendererUtils; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.ajax4jsf.framework.util.javascript.JSReference; -import org.ajax4jsf.framework.util.javascript.ScriptUtils; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSReference; +import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.model.DataVisitor; import org.richfaces.component.UITree; import org.richfaces.component.UITreeNode; Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -27,11 +27,11 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.HtmlColor; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; public abstract class TreeImageBase extends Java2Dresource { Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineCollapsedImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineExpandedImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(2, 1); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineLastImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeLineNodeImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(32, 512); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreeMinusImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(16, 16); Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.resource.ResourceContext; public class TreePlusImage extends TreeImageBase { private static final Dimension dimensions = new Dimension(16, 16); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:16:11 UTC (rev 1457) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:30:26 UTC (rev 1458) @@ -38,10 +38,10 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.resource.InternetResource; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; import org.ajax4jsf.framework.util.image.ImageInfo; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.component.state.events.ExpandAllCommandEvent; @@ -73,7 +73,7 @@ static { javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add("org.ajax4jsf.resource.PrototypeScript"); javaScripts.add("scripts/AJAX.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript");