Author: alexsmirnov Date: 2007-07-09 20:17:10 -0400 (Mon, 09 Jul 2007) New Revision: 1556 Added: trunk/framework/api/src/main/java/org/ajax4jsf/component/JavaScriptParameter.java trunk/framework/impl/src/main/java/org/ajax4jsf/event/ trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java Removed: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxListenerHelper.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxValidationActionEvent.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/InitPhaseListener.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JavaScriptParameter.java Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/framework/impl/src/main/resources/META-INF/faces-config.xml trunk/ui/core/src/main/java/org/ajax4jsf/component/UIActionParameter.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java Log: packages and classes refactor in the "impl" project Copied: trunk/framework/api/src/main/java/org/ajax4jsf/component/JavaScriptParameter.java (from rev 1551, trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JavaScriptParameter.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/JavaScriptParameter.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/JavaScriptParameter.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -0,0 +1,37 @@ +/** + * 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.component; + +/** + * Interface for extend {@link javax.faces.component.UIParameter} component by + * handling isertion parameters into JavaScript code as references, not string literals. + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:40 $ + * + */ +public interface JavaScriptParameter { + + public void setNoEscape(boolean noEscape); + + public boolean isNoEscape(); + +} \ No newline at end of file Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java (from rev 1551, trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxListenerHelper.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -0,0 +1,120 @@ +/** + * 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.event; + +import java.io.Serializable; + +import javax.faces.component.StateHolder; +import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; + +import org.ajax4jsf.event.AjaxEvent; +import org.ajax4jsf.event.AjaxListener; + +/** + * Helper class to keep reference to listener binded as EL-expression. + * @author shura + * + */ +public class AjaxListenerHelper implements AjaxListener,StateHolder { + + + private ValueBinding _binding; + + + private boolean _transient = false; + + + /** + * + */ + public AjaxListenerHelper() { + super(); + // TODO Auto-generated constructor stub + } + + /** + * @param binding + */ + public AjaxListenerHelper(ValueBinding binding) { + super(); + if (null == binding) { + throw new IllegalArgumentException("Binding expression for AjaxListener helper must be not null"); + } + _binding = binding; + } + + private AjaxListener getHandler(FacesContext context) { + return (AjaxListener) _binding.getValue(context); + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object) + */ + public void restoreState(FacesContext context, Object state) { + State helperState = (State) state; + _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context,helperState.binding); + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext) + */ + public Object saveState(FacesContext context) { + State helperState = new State(); + helperState.binding = UIComponentBase.saveAttachedState(context,_binding); + return helperState; + } + + /** + * @return Returns the transient. + */ + public boolean isTransient() { + return _transient; + } + + /** + * @param transient1 The transient to set. + */ + public void setTransient(boolean transient1) { + _transient = transient1; + } + + /** + * @author shura + * + */ + private static class State implements Serializable { + + + private Object binding; + + + } + + public void processAjax(AjaxEvent event) { + FacesContext context = FacesContext.getCurrentInstance(); + AjaxListener handler = getHandler(context); + handler.processAjax(event); + } + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java (from rev 1551, trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxValidationActionEvent.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -0,0 +1,59 @@ +/** + * 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.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.ActionEvent; +import javax.faces.event.PhaseId; + +/** + * Action event - always assigned to {@link javax.faces.event.PhaseId#PROCESS_VALIDATIONS} phase + * for bypass change phase in components , setPhaseId method do nothing. + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:37 $ + * + */ +public class AjaxValidationActionEvent extends ActionEvent { + + /** + * + */ + private static final long serialVersionUID = 941784856915815112L; + + /** + * @param component + */ + public AjaxValidationActionEvent(UIComponent component) { + super(component); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#getPhaseId() + */ + public PhaseId getPhaseId() { + // TODO Auto-generated method stub + return PhaseId.PROCESS_VALIDATIONS; + } + + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java (from rev 1555, trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/InitPhaseListener.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -0,0 +1,108 @@ +/** + * 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.event; + +import java.util.Iterator; + +import javax.faces.FactoryFinder; +import javax.faces.application.Application; +import javax.faces.application.StateManager; +import javax.faces.application.ViewHandler; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; +import javax.faces.lifecycle.LifecycleFactory; + +import org.ajax4jsf.application.AjaxStateManager; +import org.ajax4jsf.application.AjaxViewHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * One time called listener, for initialize framework at first request. + * @author shura + * + */ +public class InitPhaseListener implements PhaseListener { + + private boolean removed= false; + private boolean initialized = false; + + private static final Log log = LogFactory.getLog(InitPhaseListener.class); + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) + */ + public synchronized void afterPhase(PhaseEvent event) { + if (!removed) { + if(log.isDebugEnabled()){ + log.debug("Remove init phase listener from factories"); + } + LifecycleFactory factory = (LifecycleFactory) + FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); + for(Iterator iter = factory.getLifecycleIds(); iter.hasNext(); ) { + Lifecycle lifecycle = factory.getLifecycle((String) iter.next()); + lifecycle.removePhaseListener(this); + } + removed = true; + } + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent) + */ + public synchronized void beforePhase(PhaseEvent event) { + if(!initialized){ + if(log.isDebugEnabled()){ + log.debug("Perform additional framework initialization on first request"); + } + FacesContext facesContext = event.getFacesContext(); + Application application = facesContext.getApplication(); + StateManager stateManager = application.getStateManager(); + if(! (stateManager instanceof AjaxStateManager)){ + if(log.isDebugEnabled()){ + log.debug("Set AjaxStateManager on top of chain"); + } + application.setStateManager(new AjaxStateManager(stateManager)); + } + ViewHandler viewHandler = application.getViewHandler(); + if (!(viewHandler instanceof AjaxViewHandler)) { + if(log.isDebugEnabled()){ + log.debug("Set AjaxViewHandler on top of chain"); + } + application.setViewHandler(new AjaxViewHandler(viewHandler)); + } + initialized = true; + } + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#getPhaseId() + */ + public PhaseId getPhaseId() { + // TODO Auto-generated method stub + return PhaseId.ANY_PHASE; + } + +} Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxListenerHelper.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxListenerHelper.java 2007-07-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxListenerHelper.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -1,120 +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.ajax; - -import java.io.Serializable; - -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; - -import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.AjaxListener; - -/** - * Helper class to keep reference to listener binded as EL-expression. - * @author shura - * - */ -public class AjaxListenerHelper implements AjaxListener,StateHolder { - - - private ValueBinding _binding; - - - private boolean _transient = false; - - - /** - * - */ - public AjaxListenerHelper() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @param binding - */ - public AjaxListenerHelper(ValueBinding binding) { - super(); - if (null == binding) { - throw new IllegalArgumentException("Binding expression for AjaxListener helper must be not null"); - } - _binding = binding; - } - - private AjaxListener getHandler(FacesContext context) { - return (AjaxListener) _binding.getValue(context); - } - - /* (non-Javadoc) - * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object) - */ - public void restoreState(FacesContext context, Object state) { - State helperState = (State) state; - _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context,helperState.binding); - } - - /* (non-Javadoc) - * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext) - */ - public Object saveState(FacesContext context) { - State helperState = new State(); - helperState.binding = UIComponentBase.saveAttachedState(context,_binding); - return helperState; - } - - /** - * @return Returns the transient. - */ - public boolean isTransient() { - return _transient; - } - - /** - * @param transient1 The transient to set. - */ - public void setTransient(boolean transient1) { - _transient = transient1; - } - - /** - * @author shura - * - */ - private static class State implements Serializable { - - - private Object binding; - - - } - - public void processAjax(AjaxEvent event) { - FacesContext context = FacesContext.getCurrentInstance(); - AjaxListener handler = getHandler(context); - handler.processAjax(event); - } - -} Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxValidationActionEvent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxValidationActionEvent.java 2007-07-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxValidationActionEvent.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -1,59 +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.ajax; - -import javax.faces.component.UIComponent; -import javax.faces.event.ActionEvent; -import javax.faces.event.PhaseId; - -/** - * Action event - always assigned to {@link javax.faces.event.PhaseId#PROCESS_VALIDATIONS} phase - * for bypass change phase in components , setPhaseId method do nothing. - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:37 $ - * - */ -public class AjaxValidationActionEvent extends ActionEvent { - - /** - * - */ - private static final long serialVersionUID = 941784856915815112L; - - /** - * @param component - */ - public AjaxValidationActionEvent(UIComponent component) { - super(component); - // TODO Auto-generated constructor stub - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#getPhaseId() - */ - public PhaseId getPhaseId() { - // TODO Auto-generated method stub - return PhaseId.PROCESS_VALIDATIONS; - } - - -} Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/InitPhaseListener.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/InitPhaseListener.java 2007-07-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/InitPhaseListener.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -1,108 +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.ajax; - -import java.util.Iterator; - -import javax.faces.FactoryFinder; -import javax.faces.application.Application; -import javax.faces.application.StateManager; -import javax.faces.application.ViewHandler; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; -import javax.faces.lifecycle.Lifecycle; -import javax.faces.lifecycle.LifecycleFactory; - -import org.ajax4jsf.application.AjaxStateManager; -import org.ajax4jsf.application.AjaxViewHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * One time called listener, for initialize framework at first request. - * @author shura - * - */ -public class InitPhaseListener implements PhaseListener { - - private boolean removed= false; - private boolean initialized = false; - - private static final Log log = LogFactory.getLog(InitPhaseListener.class); - - /* (non-Javadoc) - * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) - */ - public synchronized void afterPhase(PhaseEvent event) { - if (!removed) { - if(log.isDebugEnabled()){ - log.debug("Remove init phase listener from factories"); - } - LifecycleFactory factory = (LifecycleFactory) - FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); - for(Iterator iter = factory.getLifecycleIds(); iter.hasNext(); ) { - Lifecycle lifecycle = factory.getLifecycle((String) iter.next()); - lifecycle.removePhaseListener(this); - } - removed = true; - } - } - - /* (non-Javadoc) - * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent) - */ - public synchronized void beforePhase(PhaseEvent event) { - if(!initialized){ - if(log.isDebugEnabled()){ - log.debug("Perform additional framework initialization on first request"); - } - FacesContext facesContext = event.getFacesContext(); - Application application = facesContext.getApplication(); - StateManager stateManager = application.getStateManager(); - if(! (stateManager instanceof AjaxStateManager)){ - if(log.isDebugEnabled()){ - log.debug("Set AjaxStateManager on top of chain"); - } - application.setStateManager(new AjaxStateManager(stateManager)); - } - ViewHandler viewHandler = application.getViewHandler(); - if (!(viewHandler instanceof AjaxViewHandler)) { - if(log.isDebugEnabled()){ - log.debug("Set AjaxViewHandler on top of chain"); - } - application.setViewHandler(new AjaxViewHandler(viewHandler)); - } - initialized = true; - } - } - - /* (non-Javadoc) - * @see javax.faces.event.PhaseListener#getPhaseId() - */ - public PhaseId getPhaseId() { - // TODO Auto-generated method stub - return PhaseId.ANY_PHASE; - } - -} Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JavaScriptParameter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JavaScriptParameter.java 2007-07-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JavaScriptParameter.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -1,37 +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.ajax; - -/** - * Interface for extend {@link javax.faces.component.UIParameter} component by - * handling isertion parameters into JavaScript code as references, not string literals. - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:40 $ - * - */ -public interface JavaScriptParameter { - - public void setNoEscape(boolean noEscape); - - public boolean isNoEscape(); - -} \ No newline at end of file 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-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -49,8 +49,8 @@ import org.ajax4jsf.component.AjaxLoadBundleComponent; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.component.AjaxViewRoot; +import org.ajax4jsf.component.JavaScriptParameter; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ajax.JavaScriptParameter; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.ServicesUtils; import org.ajax4jsf.javascript.JSFunction; 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-10 00:08:19 UTC (rev 1555) +++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-07-10 00:17:10 UTC (rev 1556) @@ -19,7 +19,7 @@ </application> <lifecycle> <phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener> - <phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> </lifecycle> <managed-bean> <managed-bean-name>a4j</managed-bean-name> Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIActionParameter.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIActionParameter.java 2007-07-10 00:08:19 UTC (rev 1555) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIActionParameter.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -32,7 +32,6 @@ import javax.faces.event.ActionListener; import org.ajax4jsf.Messages; -import org.ajax4jsf.framework.ajax.JavaScriptParameter; /** * @author shura (latest modification by $Author: alexsmirnov $) 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-10 00:08:19 UTC (rev 1555) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxListenerHandler.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -30,8 +30,8 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; +import org.ajax4jsf.event.AjaxListenerHelper; import org.ajax4jsf.event.AjaxSource; -import org.ajax4jsf.framework.ajax.AjaxListenerHelper; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; 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-10 00:08:19 UTC (rev 1555) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.java 2007-07-10 00:17:10 UTC (rev 1556) @@ -32,8 +32,8 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxListener; +import org.ajax4jsf.event.AjaxListenerHelper; import org.ajax4jsf.event.AjaxSource; -import org.ajax4jsf.framework.ajax.AjaxListenerHelper; /**