Author: alexsmirnov Date: 2010-07-14 15:07:51 -0400 (Wed, 14 Jul 2010) New Revision: 18081 Added: branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/component/package-info.java Modified: branches/development/iterators/ branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/cc.taglib.xml Log: Merged revisions 18078-18079 via svnmerge from https://svn.jboss.org/repos/richfaces/root ....... r18078 | abelevich | 2010-07-14 09:01:10 -0700 (Wed, 14 Jul 2010) | 1 line https://jira.jboss.org/browse/RFPL-703 ....... r18079 | abelevich | 2010-07-14 09:16:36 -0700 (Wed, 14 Jul 2010) | 1 line ....... Property changes on: branches/development/iterators ___________________________________________________________________ Name: svnmerge-integrated - /root:1-18077 + /root:1-18080 Copied: branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/component/package-info.java (from rev 18079, root/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/component/package-info.java) =================================================================== --- branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/component/package-info.java (rev 0) +++ branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/component/package-info.java 2010-07-14 19:07:51 UTC (rev 18081) @@ -0,0 +1,26 @@ +/* + * 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. + */ +/** + * Implementation of RichFaces componentControl behavior + */ +@org.richfaces.cdk.annotations.TagLibrary(uri="http://richfaces.org/componentControl", shortName="componentControl") +package org.richfaces.component; Modified: branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/cc.taglib.xml =================================================================== --- branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/cc.taglib.xml 2010-07-14 17:08:31 UTC (rev 18080) +++ branches/development/iterators/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/cc.taglib.xml 2010-07-14 19:07:51 UTC (rev 18081) @@ -6,13 +6,6 @@ id="cc"> <namespace>http://richfaces.org/componentControl</namespace> <tag> - <tag-name>componentControl</tag-name> - <behavior> - <behavior-id>org.richfaces.behavior.ComponentControlBehavior</behavior-id> - <handler-class>org.richfaces.taglib.ComponentControlHandler</handler-class> - </behavior> - </tag> - <tag> <tag-name>hashParam</tag-name> <component> <component-type>org.richfaces.HashParameter</component-type>