Author: alexsmirnov
Date: 2010-09-29 12:36:52 -0400 (Wed, 29 Sep 2010)
New Revision: 19380
Modified:
trunk/
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java
Log:
Merged revisions 19378 via svnmerge from
https://svn.jboss.org/repos/richfaces/branches/RF-9309
.......
r19378 | alexsmirnov | 2010-09-29 08:55:33 -0700 (Wed, 29 Sep 2010) | 1 line
RF-9309
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/RF-9309:1-19112
+ /branches/RF-9309:1-19112,19378
Modified:
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
===================================================================
---
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2010-09-29
16:13:49 UTC (rev 19379)
+++
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2010-09-29
16:36:52 UTC (rev 19380)
@@ -63,6 +63,7 @@
description=@Description(displayName="Test HTML5
abbreviation",largeIcon="large.gif",smallIcon="spall.png"),
tag=(a)Tag(name="abbr",generate=true,handler="org.richfaces.cdk.test.facelets.AbbrTagHandler"),
generate="org.richfaces.cdk.test.component.html.HtmlTestAbbr",
+
attributes={"core-props.xml","events-props.xml","i18n-props.xml"},
interfaces=Html5Attributes.class,
renderer=(a)JsfRenderer(type="org.richfaces.cdk.test.HtmlAbbrRenderer")),
@RendererSpecificComponent(type =
"org.richfaces.cdk.test.TestHtmlDfn",
Modified:
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java
===================================================================
---
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2010-09-29
16:13:49 UTC (rev 19379)
+++
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2010-09-29
16:36:52 UTC (rev 19380)
@@ -48,7 +48,7 @@
/**
* @return
*/
- @Attribute(events=@EventName("ondrag"))
+ @Attribute(events=@EventName("drag"))
public abstract DraggableState getDraggable();
/**