Author: alexsmirnov Date: 2010-12-02 19:28:30 -0500 (Thu, 02 Dec 2010) New Revision: 20323 Removed: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/FunctionDefWithDependencies.java branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ScriptWithDependencies.java Modified: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ClientSideScript.java Log: RESOLVED - issue RF-9612: Create JSF 2.0 resource loading extension to dynamically add scripts and its dependencies. https://jira.jboss.org/browse/RF-9612 Modified: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ClientSideScript.java =================================================================== --- branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ClientSideScript.java 2010-12-03 00:26:26 UTC (rev 20322) +++ branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ClientSideScript.java 2010-12-03 00:28:30 UTC (rev 20323) @@ -8,6 +8,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import javax.faces.application.ResourceDependency; + /** * This annotation describes client-side version of Converter/validator. * @author asmirnov @@ -17,10 +19,8 @@ @Target(ElementType.TYPE) public @interface ClientSideScript { - String library() default ""; - String resource(); - String function(); + ResourceDependency[] resources() default {}; } Deleted: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/FunctionDefWithDependencies.java =================================================================== --- branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/FunctionDefWithDependencies.java 2010-12-03 00:26:26 UTC (rev 20322) +++ branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/FunctionDefWithDependencies.java 2010-12-03 00:28:30 UTC (rev 20323) @@ -1,35 +0,0 @@ -/* - * $Id$ - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.richfaces.javascript; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public interface FunctionDefWithDependencies extends ScriptWithDependencies { - - String getName(); - -} Deleted: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ScriptWithDependencies.java =================================================================== --- branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ScriptWithDependencies.java 2010-12-03 00:26:26 UTC (rev 20322) +++ branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/ScriptWithDependencies.java 2010-12-03 00:28:30 UTC (rev 20323) @@ -1,14 +0,0 @@ -package org.richfaces.javascript; - -import org.ajax4jsf.javascript.ScriptString; -import org.richfaces.resource.ResourceLibrary; - -/** - * This interface describes JavaScript object with optional dependent resources. - * @author asmirnov - * - */ -public interface ScriptWithDependencies extends ResourceLibrary, ScriptString { - - -} \ No newline at end of file