Author: Alex.Kolonitsky Date: 2010-08-09 05:36:20 -0400 (Mon, 09 Aug 2010) New Revision: 18499 Added: trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-componentcontrol.xml trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-functions.xml trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/config/ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/AbstractJQuery.java trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryAttachType.java trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryTiming.java trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/package-info-jquery.java trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit/ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/taglib/ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/resources/ Removed: trunk/ui/misc/componentcontrol/pom.xml trunk/ui/misc/componentcontrol/src/main/config/ trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/component/ trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/renderkit/ trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/taglib/ trunk/ui/misc/componentcontrol/src/main/resources/ trunk/ui/misc/functions/pom.xml trunk/ui/misc/jquery/src/main/java/org/richfaces/component/AbstractJQuery.java trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryAttachType.java trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryTiming.java trunk/ui/misc/jquery/src/main/java/org/richfaces/component/package-info.java trunk/ui/misc/jquery/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java Log: Richfaces 4.0 restructurization of svn repository structure Deleted: trunk/ui/misc/componentcontrol/pom.xml =================================================================== --- trunk/ui/misc/componentcontrol/pom.xml 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/componentcontrol/pom.xml 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,133 +0,0 @@ -<!-- - 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. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>componentcontrol-ui</artifactId> - <name>Richfaces UI Components: Component control UI</name> - <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - </plugins> - </build> - - <dependencies> - <!-- runtime --> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - - <dependency> - <!-- todo remove this dependency --> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> - </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/</url> - </scm> -</project> \ No newline at end of file Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-componentcontrol.xml (from rev 18498, trunk/ui/misc/componentcontrol/pom.xml) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-componentcontrol.xml (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-componentcontrol.xml 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,133 @@ +<!-- + 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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>componentcontrol-ui</artifactId> + <name>Richfaces UI Components: Component control UI</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- runtime --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <!-- todo remove this dependency or move to test scope --> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + + <dependency> + <!-- todo remove this dependency --> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JSF with dependencies --> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + + <!-- tests --> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <!-- todo api? --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> +</project> \ No newline at end of file Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-functions.xml (from rev 18498, trunk/ui/misc/functions/pom.xml) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-functions.xml (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/pom-functions.xml 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,127 @@ +<!-- + 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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>functions-ui</artifactId> + <name>Richfaces UI Components: Functions UI</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- runtime --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <!-- todo remove this dependency or move to test scope --> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JSF with dependencies --> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + + <!-- tests --> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <!-- todo api? --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> +</project> \ No newline at end of file Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/config (from rev 18498, trunk/ui/misc/componentcontrol/src/main/config) Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component (from rev 18498, trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/component) Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/AbstractJQuery.java (from rev 18498, trunk/ui/misc/jquery/src/main/java/org/richfaces/component/AbstractJQuery.java) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/AbstractJQuery.java (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,63 @@ +/* + * 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.component; + +import javax.faces.component.UIComponentBase; + +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; + +/** + * @author nick + * + */ +@JsfComponent(type = AbstractJQuery.COMPONENT_TYPE, family = AbstractJQuery.COMPONENT_FAMILY, + renderer = @JsfRenderer(type = "org.richfaces.JQueryRenderer")) +public abstract class AbstractJQuery extends UIComponentBase { + + public static final String COMPONENT_TYPE = "org.richfaces.JQuery"; + + public static final String COMPONENT_FAMILY = "org.richfaces.JQuery"; + + //TODO nick - CDK should be doing this + public AbstractJQuery() { + setRendererType("org.richfaces.JQueryRenderer"); + } + + public abstract String getName(); + + public abstract String getSelector(); + + public abstract String getEvent(); + + public abstract String getQuery(); + + @Attribute(defaultValue = "JQueryAttachType.DEFAULT") + public abstract JQueryAttachType getAttachType(); + + @Attribute(defaultValue = "JQueryTiming.DEFAULT") + public abstract JQueryTiming getTiming(); + +} + Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryAttachType.java (from rev 18498, trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryAttachType.java) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryAttachType.java (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryAttachType.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,35 @@ +/* + * 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.component; + +/** + * @author nick + * + */ +public enum JQueryAttachType { + + bind, live, one; + + public static final JQueryAttachType DEFAULT = bind; + +} Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryTiming.java (from rev 18498, trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryTiming.java) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryTiming.java (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/JQueryTiming.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,35 @@ +/* + * 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.component; + +/** + * @author nick + * + */ +public enum JQueryTiming { + + immediate, domready; + + public static final JQueryTiming DEFAULT = domready; + +} Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/package-info-jquery.java (from rev 18498, trunk/ui/misc/jquery/src/main/java/org/richfaces/component/package-info.java) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/package-info-jquery.java (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/component/package-info-jquery.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -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 jQuery component + */ +@org.richfaces.cdk.annotations.TagLibrary(uri="http://richfaces.org/jquery", shortName="jquery") +package org.richfaces.component; Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit (from rev 18498, trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/renderkit) Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java (from rev 18498, trunk/ui/misc/jquery/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java) =================================================================== --- trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java (rev 0) +++ trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -0,0 +1,76 @@ +/* + * 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.renderkit; + +import java.util.HashMap; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.render.Renderer; + +import org.ajax4jsf.javascript.ScriptUtils; +import org.ajax4jsf.renderkit.RendererUtils; +import org.richfaces.component.AbstractJQuery; +import org.richfaces.component.JQueryTiming; +import org.richfaces.component.JQueryAttachType; +import org.richfaces.component.util.HtmlUtil; + +/** + * @author nick + * + */ +@ResourceDependencies({ + @ResourceDependency(name = "jquery.js"), + @ResourceDependency(library = "org.richfaces", name = "jquery.component.js") +}) +public abstract class JQueryRendererBase extends Renderer { + + private RendererUtils rendererUtils = RendererUtils.getInstance(); + + protected String getEscapedSelector(FacesContext context, UIComponent component) { + String selector = (String) component.getAttributes().get("selector"); + + if (selector != null) { + selector = HtmlUtil.expandIdSelector(selector, component, context); + } + + return selector; + } + + protected String getOptionsAsJavascriptString(FacesContext context, UIComponent component) { + AbstractJQuery jQuery = (AbstractJQuery) component; + + Map<String,Object> map = new HashMap<String, Object>(); + + rendererUtils.addToScriptHash(map, "selector", getEscapedSelector(context, jQuery)); + rendererUtils.addToScriptHash(map, "event", jQuery.getEvent()); + rendererUtils.addToScriptHash(map, "query", jQuery.getQuery()); + rendererUtils.addToScriptHash(map, "attachType", jQuery.getAttachType(), JQueryAttachType.DEFAULT.toString()); + rendererUtils.addToScriptHash(map, "timing", jQuery.getTiming(), JQueryTiming.DEFAULT.toString()); + + return ScriptUtils.toScript(map); + } +} Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/java/org/richfaces/taglib (from rev 18498, trunk/ui/misc/componentcontrol/src/main/java/org/richfaces/taglib) Copied: trunk/ui/misc/dist/richfaces-ui-misc-ui/src/main/resources (from rev 18498, trunk/ui/misc/componentcontrol/src/main/resources) Deleted: trunk/ui/misc/functions/pom.xml =================================================================== --- trunk/ui/misc/functions/pom.xml 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/functions/pom.xml 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,127 +0,0 @@ -<!-- - 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. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>functions-ui</artifactId> - <name>Richfaces UI Components: Functions UI</name> - <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - </plugins> - </build> - - <dependencies> - <!-- runtime --> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/</url> - </scm> -</project> \ No newline at end of file Deleted: trunk/ui/misc/jquery/src/main/java/org/richfaces/component/AbstractJQuery.java =================================================================== --- trunk/ui/misc/jquery/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/jquery/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,63 +0,0 @@ -/* - * 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.component; - -import javax.faces.component.UIComponentBase; - -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.JsfRenderer; - -/** - * @author nick - * - */ -@JsfComponent(type = AbstractJQuery.COMPONENT_TYPE, family = AbstractJQuery.COMPONENT_FAMILY, - renderer = @JsfRenderer(type = "org.richfaces.JQueryRenderer")) -public abstract class AbstractJQuery extends UIComponentBase { - - public static final String COMPONENT_TYPE = "org.richfaces.JQuery"; - - public static final String COMPONENT_FAMILY = "org.richfaces.JQuery"; - - //TODO nick - CDK should be doing this - public AbstractJQuery() { - setRendererType("org.richfaces.JQueryRenderer"); - } - - public abstract String getName(); - - public abstract String getSelector(); - - public abstract String getEvent(); - - public abstract String getQuery(); - - @Attribute(defaultValue = "JQueryAttachType.DEFAULT") - public abstract JQueryAttachType getAttachType(); - - @Attribute(defaultValue = "JQueryTiming.DEFAULT") - public abstract JQueryTiming getTiming(); - -} - Deleted: trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryAttachType.java =================================================================== --- trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryAttachType.java 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryAttachType.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,35 +0,0 @@ -/* - * 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.component; - -/** - * @author nick - * - */ -public enum JQueryAttachType { - - bind, live, one; - - public static final JQueryAttachType DEFAULT = bind; - -} Deleted: trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryTiming.java =================================================================== --- trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryTiming.java 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/jquery/src/main/java/org/richfaces/component/JQueryTiming.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,35 +0,0 @@ -/* - * 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.component; - -/** - * @author nick - * - */ -public enum JQueryTiming { - - immediate, domready; - - public static final JQueryTiming DEFAULT = domready; - -} Deleted: trunk/ui/misc/jquery/src/main/java/org/richfaces/component/package-info.java =================================================================== --- trunk/ui/misc/jquery/src/main/java/org/richfaces/component/package-info.java 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/jquery/src/main/java/org/richfaces/component/package-info.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,26 +0,0 @@ -/* - * 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 jQuery component - */ -@org.richfaces.cdk.annotations.TagLibrary(uri="http://richfaces.org/jquery", shortName="jquery") -package org.richfaces.component; Deleted: trunk/ui/misc/jquery/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java =================================================================== --- trunk/ui/misc/jquery/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java 2010-08-09 09:00:57 UTC (rev 18498) +++ trunk/ui/misc/jquery/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java 2010-08-09 09:36:20 UTC (rev 18499) @@ -1,76 +0,0 @@ -/* - * 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.renderkit; - -import java.util.HashMap; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.render.Renderer; - -import org.ajax4jsf.javascript.ScriptUtils; -import org.ajax4jsf.renderkit.RendererUtils; -import org.richfaces.component.AbstractJQuery; -import org.richfaces.component.JQueryTiming; -import org.richfaces.component.JQueryAttachType; -import org.richfaces.component.util.HtmlUtil; - -/** - * @author nick - * - */ -@ResourceDependencies({ - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(library = "org.richfaces", name = "jquery.component.js") -}) -public abstract class JQueryRendererBase extends Renderer { - - private RendererUtils rendererUtils = RendererUtils.getInstance(); - - protected String getEscapedSelector(FacesContext context, UIComponent component) { - String selector = (String) component.getAttributes().get("selector"); - - if (selector != null) { - selector = HtmlUtil.expandIdSelector(selector, component, context); - } - - return selector; - } - - protected String getOptionsAsJavascriptString(FacesContext context, UIComponent component) { - AbstractJQuery jQuery = (AbstractJQuery) component; - - Map<String,Object> map = new HashMap<String, Object>(); - - rendererUtils.addToScriptHash(map, "selector", getEscapedSelector(context, jQuery)); - rendererUtils.addToScriptHash(map, "event", jQuery.getEvent()); - rendererUtils.addToScriptHash(map, "query", jQuery.getQuery()); - rendererUtils.addToScriptHash(map, "attachType", jQuery.getAttachType(), JQueryAttachType.DEFAULT.toString()); - rendererUtils.addToScriptHash(map, "timing", jQuery.getTiming(), JQueryTiming.DEFAULT.toString()); - - return ScriptUtils.toScript(map); - } -}