July 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r1907 - in trunk: cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/templates and 54 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-07-27 21:22:09 -0400 (Fri, 27 Jul 2007) New Revision: 1907 Added: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyAttachedLibraryMojo.java Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/templates/_compName.jspx trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java trunk/cdk/maven-cdk-plugin/src/main/resources/component/config.xml trunk/cdk/maven-cdk-plugin/src/main/resources/component/template.jspx trunk/cdk/maven-cdk-plugin/src/main/resources/templates/taglib.vm trunk/cdk/maven-cdk-plugin/src/main/resources/templates/tld.vm trunk/docs/ajaxguide/pom.xml trunk/samples/ajaxPortlet/src/main/webapp/jsf/repeater.xhtml trunk/samples/ajaxPortlet/src/main/webapp/jsf/start.xhtml trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp trunk/samples/dataTableDemo/src/main/webapp/pages/ajax.jsp trunk/samples/dataTableDemo/src/main/webapp/pages/colgroup.jsp trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml trunk/samples/inputNumberSliderDemo/src/main/webapp/pages/index.jsp trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp trunk/samples/panel-sample/src/main/webapp/panel.xhtml trunk/samples/panel-sample/src/main/webapp/panel2.xhtml trunk/samples/panelmenu-sample/src/main/webapp/pages/index.jsp trunk/samples/pom.xml trunk/samples/portal-echo/src/main/webapp/jsf/repeater.xhtml trunk/samples/portal-echo/src/main/webapp/jsf/start.xhtml trunk/samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example1.jsp trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example10.jsp trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example2.jsp trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example3.jsp trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example4.jsp trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml trunk/samples/seamIntegration/src/main/webapp/pages/index.xhtml trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp trunk/samples/tabPanelDemo/src/main/webapp/pages/index.jsp trunk/samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp trunk/samples/togglePanel-sample/src/main/webapp/pages/index.jsp trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp trunk/samples/tomahawkCompability/src/main/webapp/pages/index.xhtml trunk/samples/tomahawkCompability/src/main/webapp/pages/response.jsp trunk/samples/tomahawkCompability/src/main/webapp/pages/tabbedPanel.jsp trunk/samples/tomahawkCompability/src/main/webapp/pages/tree2.jsp trunk/samples/tooltip-sample/src/main/webapp/pages/index.jsp trunk/samples/tree-demo/src/main/webapp/pages/index.jsp trunk/samples/tree-demo/src/main/webapp/pages/index2.jsp trunk/samples/useCases/src/main/webapp/pages/actionparam.xhtml trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml trunk/samples/useCases/src/main/webapp/pages/ajaxdata.xhtml trunk/samples/useCases/src/main/webapp/pages/controls.jsp trunk/samples/useCases/src/main/webapp/pages/controls.xhtml trunk/samples/useCases/src/main/webapp/pages/index.xhtml trunk/samples/useCases/src/main/webapp/pages/prependId.xhtml trunk/samples/useCases/src/main/webapp/pages/push.xhtml trunk/samples/useCases/src/main/webapp/pages/repeat.jsp trunk/samples/useCases/src/main/webapp/pages/repeat.xhtml trunk/samples/useCases/src/main/webapp/pages/repeater.jsp trunk/samples/useCases/src/main/webapp/pages/setCookie.xhtml trunk/samples/useCases/src/main/webapp/pages/testCookie.xhtml trunk/samples/virtualEarth-sample/src/main/webapp/virtualEarth.xhtml trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml trunk/ui/assembly/pom.xml trunk/ui/core/pom.xml Log: Generate a set of taglibs in assembly project. Change taglibs URL's to a final values. Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -9,7 +9,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <configuration> <library> <prefix>${groupId}</prefix> Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/templates/_compName.jspx =================================================================== --- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/templates/_compName.jspx 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/templates/_compName.jspx 2007-07-28 01:22:09 UTC (rev 1907) @@ -6,7 +6,7 @@ xmlns:u=" http://ajax4jsf.org/cdk/u" xmlns:x=" http://ajax4jsf.org/cdk/x" class="${groupId}.renderkit.html.${artifactId}Renderer" - baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase" + baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" component="${groupId}.component.UI${artifactId}" > <f:clientid var="clientId"/> Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2007-07-28 01:22:09 UTC (rev 1907) @@ -230,6 +230,15 @@ taglib.setShortName(project.getArtifactId()); } + if(null == taglib.getTaglib()){ + taglib.setTaglib(taglib.getShortName()); + } + if (null != library.getTaglibs() && library.getTaglibs().length > 0) { + for (int i = 0; i < library.getTaglibs().length; i++) { + Taglib t = library.getTaglibs()[i]; + checkTaglib(t); + } + } return taglib; } @@ -280,4 +289,24 @@ return createProjectClassLoader(project, true); } + protected void checkTaglib(Taglib taglib) { + if (null == taglib.getDisplayName()) { + taglib.setDisplayName(library.getTaglib().getDisplayName()); + } + if (null == taglib.getShortName()) { + taglib.setShortName(library.getTaglib().getShortName()); + } + if (null == taglib.getJspVersion()) { + taglib.setJspVersion(library.getTaglib().getJspVersion()); + } + if (null == taglib.getUri()) { + taglib.setUri(library.getTaglib().getUri() + "/" + + taglib.getShortName()); + } + if(null == taglib.getTaglib()){ + taglib.setTaglib(taglib.getShortName()); + } + + } + } \ No newline at end of file Added: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyAttachedLibraryMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyAttachedLibraryMojo.java (rev 0) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyAttachedLibraryMojo.java 2007-07-28 01:22:09 UTC (rev 1907) @@ -0,0 +1,721 @@ +/** + * 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.builder.mojo; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.ajax4jsf.builder.config.ParsingException; +import org.ajax4jsf.builder.xml.XMLBody; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.model.Dependency; +import org.apache.maven.model.Model; +import org.apache.maven.model.Parent; +import org.apache.maven.model.Resource; +import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.apache.maven.model.io.xpp3.MavenXpp3Writer; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.MavenProjectHelper; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.shared.io.scan.ResourceInclusionScanner; +import org.apache.maven.shared.io.scan.SimpleResourceInclusionScanner; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.exception.MethodInvocationException; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.codehaus.plexus.archiver.UnArchiver; +import org.codehaus.plexus.archiver.manager.ArchiverManager; +import org.codehaus.plexus.util.DirectoryScanner; + +/** + * This plugin assembly full components library from modules, included in parent + * project. Steps to create library : 1. Got parent project, and check modules + * included in them. 2. For every module , build project and got it properties. + * 3. Resolve module artifact, check for "jar" type and include/exclude + * criteria. for accepted modules, unpack it to classes directory, and put + * config files in separate directories. 4. Append unpacked directory to + * resources, included in result jar. 5. Merge all META-INF/faces-config.xml , + * *.tld, *.taglib.xml , resources-config.xml into ones. 6. append dependencies + * of included projects to this. + * + * @author shura + * @goal attached + * @phase package + * @aggregator + */ +public class AssemblyAttachedLibraryMojo extends AbstractCDKMojo { + + private static final String TEMPLATES_PREFIX = "/templates/"; + + private static final String TEMPLATES12_PREFIX = "/templates12/"; + + private static final String FACES_CONFIG_TEMPLATE = "faces-config.vm"; + + private static final String RESOURCES_CONFIG_TEMPLATE = "resources-config.vm"; + + private static final String TLD_TEMPLATE = "tld.vm"; + + private static final String TAGLIB_TEMPLATE = "taglib.vm"; + + /** + * Used to look up Artifacts in the remote repository. + * + * @component + */ + private org.apache.maven.artifact.factory.ArtifactFactory factory; + + /** + * Used to look up Artifacts in the remote repository. + * + * @component + */ + private org.apache.maven.artifact.resolver.ArtifactResolver resolver; + + /** + * The local repository. + * + * @parameter expression="${localRepository}" + */ + private ArtifactRepository localRepository; + + /** + * To look up Archiver/UnArchiver implementations + * + * @component + */ + private ArchiverManager archiverManager; + + /** + * Project builder + * + * @component + */ + private MavenProjectBuilder mavenProjectBuilder; + + /** + * Maven ProjectHelper + * + * @component + */ + private MavenProjectHelper projectHelper; + + /** + * The reactor projects. + * + * @parameter expression="${reactorProjects}" + * @required + * @readonly + */ + private List reactorProjects; + + /** + * The reactor projects. + * + * @parameter expression="${project.parent}" + * @readonly + */ + private MavenProject parentProject; + + /** + * The directory for compiled classes. + * + * @parameter expression="${project.build.directory}" + * @required + * @readonly + */ + private File buildDirectory; + + /** + * The directory for compiled classes. + * + * @parameter expression="${project.build.directory}/pom.xml" + * @required + * @readonly + */ + private File generatedPom; + + /** + * The directory for compiled classes. + * + * @parameter expression="${project.build.directory}/src" + * @required + * @readonly + */ + private File modulesSrc; + + /** + * @parameter + */ + private String templates; + + /** + * @parameter + */ + private String includeTld = "META-INF/*.tld"; + + /** + * @parameter + */ + private String includeTaglib = "META-INF/*.taglib.xml"; + + + /** + * @parameter + */ + private Taglib[] taglibs; + + /** + * + */ + public AssemblyAttachedLibraryMojo() { + // used for plexus init. + } + + /* + * (non-Javadoc) + * + * @see org.apache.maven.plugin.Mojo#execute() + */ + public void execute() throws MojoExecutionException, MojoFailureException { + if(null != reactorProjects){ + getLog().info("Reactor projects"); + for (Iterator iterator = reactorProjects.iterator(); iterator.hasNext();) { + MavenProject reactor = (MavenProject) iterator.next(); + getLog().info("Project "+reactor.getGroupId()+":"+reactor.getArtifactId()); + } + } + // assemblyProjects(); + + } + + /** + * @throws MojoFailureException + * @throws MojoExecutionException + */ + protected void assemblyProjects() throws MojoFailureException, + MojoExecutionException { + // Parent project not set for a custom lifecycles. Try to load artifact. + if (null == parentProject || null == parentProject.getFile()) { + Parent parentModel = project.getModel().getParent(); + if (null != parentModel) { + String relativePath = parentModel.getRelativePath(); + File parentPom = new File(project.getFile().getAbsoluteFile().getParentFile(), relativePath); + if (parentPom.isDirectory()) { + parentPom = new File(parentPom, "pom.xml"); + } + if (parentPom.exists()) { + try { + parentProject = mavenProjectBuilder.build(parentPom, + localRepository, null); + } catch (ProjectBuildingException e) { + throw new MojoFailureException("Error get parent project for a components library"); + } + } else { + throw new MojoFailureException("Parent project pom file not found for a components library"); + } + }else { + throw new MojoFailureException("Components library project must have parent pom with components modules"); + } + + } + if (null != parentProject) { + this.checkLibraryConfig(); + if (null == templates) { + templates = Library.JSF12.equals(library.getJsfVersion()) ? TEMPLATES12_PREFIX + : TEMPLATES_PREFIX; + } + Model generatedProject; + try { + MavenXpp3Reader reader = new MavenXpp3Reader(); + generatedProject = reader + .read(new FileReader(project.getFile())); + } catch (Exception e1) { + throw new MojoExecutionException("Unable to read local POM", e1); + } + List modules = parentProject.getModules(); + List models = new ArrayList(modules.size()); + Map<String, Dependency> projectsDependencies = new HashMap<String, Dependency>(); + for (Iterator iter = modules.iterator(); iter.hasNext();) { + String moduleName = (String) iter.next(); + getLog().info("Parent project have module " + moduleName); + Model model; + File f = new File(parentProject.getBasedir(), moduleName + + "/pom.xml"); + if (f.exists()) { + try { + model = mavenProjectBuilder.build(f, localRepository, + null).getModel(); + } catch (ProjectBuildingException e) { + throw new MojoExecutionException( + "Unable to read local module-POM", e); + } + } else { + getLog().warn("No filesystem module-POM available"); + + model = new Model(); + model.setName(moduleName); + model.setUrl(moduleName); + } + if (project.getGroupId().equals(model.getGroupId()) + && "jar".equals(model.getPackaging()) + && (!project.getArtifactId().equals( + model.getArtifactId()))) { + // TODO - check include/exclude + getLog().debug( + "Project " + model.getName() + + " included to library set"); + List dependencies = model.getDependencies(); + for (Iterator iterator = dependencies.iterator(); iterator + .hasNext();) { + Dependency dependency = (Dependency) iterator.next(); + getLog().debug( + dependency.getClass().getName() + " : " + + dependency + " with key: " + + dependency.getManagementKey()); + if (!"test".equals(dependency.getScope())) { + projectsDependencies.put(dependency + .getManagementKey(), dependency); + + } + } + models.add(model); + } + } + // Remove modules projects from dependencise + Set<String> unwanted = new HashSet<String>(projectsDependencies + .size()); + for (Iterator iter = models.iterator(); iter.hasNext();) { + Model model = (Model) iter.next(); + for (Iterator iterator = projectsDependencies.values() + .iterator(); iterator.hasNext();) { + Dependency dependency = (Dependency) iterator.next(); + if (model.getGroupId().equals(dependency.getGroupId()) + && model.getArtifactId().equals( + dependency.getArtifactId())) { + getLog().debug( + "Remove dependency of library module " + + dependency.getManagementKey()); + unwanted.add(dependency.getManagementKey()); + } + } + // Got module and unpack it to target directory. + Artifact artifact = factory.createBuildArtifact(model + .getGroupId(), model.getArtifactId(), model + .getVersion(), model.getPackaging()); + File moduleDir = new File(buildDirectory, model.getArtifactId()); + unpackArtifact(artifact, moduleDir, true); + artifact = factory.createArtifactWithClassifier(model + .getGroupId(), model.getArtifactId(), model + .getVersion(), "jar", "sources"); + unpackArtifact(artifact, modulesSrc, false); + } + // Add projects dependencies to this project + projectsDependencies.keySet().removeAll(unwanted); + generatedProject.getDependencies().addAll( + projectsDependencies.values()); + writePom(generatedProject); + mergeFacesConfig(models); + File resourcesConfig = new File(outputDirectory, + "META-INF/resources-config.xml"); + mergeXML(models, "META-INF/resources-config.xml", + RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", "name/text()", + new VelocityContext(), resourcesConfig); + File tld = new File(outputDirectory, "META-INF/" + + library.getTaglib().getShortName() + ".tld"); + mergeXML(models, includeTld, TLD_TEMPLATE, + "/taglib/tag | /taglib/listener", + null, new VelocityContext(), tld); + File taglib = new File(outputDirectory, "META-INF/" + + library.getTaglib().getShortName() + ".taglib.xml"); + mergeXML(models, includeTaglib, TAGLIB_TEMPLATE, + "/facelet-taglib/tag | /facelet-taglib/function", + null, new VelocityContext(), taglib); + }else { + throw new MojoFailureException("Components library project must have parent pom with components modules"); + } + } + + /** + * @param models + * @throws MojoExecutionException + */ + private void mergeFacesConfig(List models) throws MojoExecutionException { + StringBuffer config = new StringBuffer(); + for (int i = 0; i < library.getRenderkits().length; i++) { + Renderkit kit = library.getRenderkits()[i]; + kit.setContent(new StringBuffer()); + } + for (Iterator iter = models.iterator(); iter.hasNext();) { + Model model = (Model) iter.next(); + File moduleFacesConfig = new File(buildDirectory, model + .getArtifactId() + + "/META-INF/faces-config.xml"); + if (moduleFacesConfig.exists()) { + getLog().info( + "Process faces-config.xml for module " + + model.getArtifactId()); + XMLBody configBody = new XMLBody(); + try { + configBody.loadXML(new FileInputStream(moduleFacesConfig)); + config + .append(configBody + .getContent("/faces-config/*[name()!=\'render-kit\']")); + for (int i = 0; i < library.getRenderkits().length; i++) { + Renderkit kit = library.getRenderkits()[i]; + kit + .getContent() + .append( + configBody + .getContent("/faces-config/render-kit[child::render-kit-id='" + + kit.getName() + + "']/renderer")); + } + } catch (FileNotFoundException e) { + throw new MojoExecutionException( + "Could't read faces-config file", e); + } catch (ParsingException e) { + throw new MojoExecutionException( + "Error parsing faces-config file", e); + } + } + } + VelocityContext context = new VelocityContext(); + context.put("content", config.toString()); + context.put("library", library); + context.put("renderkits", Arrays.asList(library.getRenderkits())); + try { + writeParsedTemplate(templates + FACES_CONFIG_TEMPLATE, context, + new File(outputDirectory, "META-INF/faces-config.xml")); + } catch (Exception e) { + throw new MojoExecutionException( + "Error to process faces-config template", e); + } + } + + /** + * Merge XML files from extracted models to one in build directory. + * + * @param models + * models collected in library. + * @param filename + * relative path to config file in models/output. + * @param templateName - + * name of velocity template for result file. + * @param commonXpath - + * XPath expression fof common part of result file. + * @param keyXPath - XPath expression for key part of common parts + * @param keySet - {@link Set} to check for duplicate keys. Must not be null + * @param context - + * Velocity context for template processing. + * @throws MojoExecutionException + */ + private void mergeXML(List models, String filename, String templateName, + String commonXpath, String keyXPath, VelocityContext context, File target) + throws MojoExecutionException { + Set<String> keySet = new HashSet<String>(); + StringBuffer content = new StringBuffer(); + List<XMLBody> xmls = new ArrayList<XMLBody>(models.size()); + String[] split = filename.split(","); + for (Iterator iter = models.iterator(); iter.hasNext();) { + Model model = (Model) iter.next(); + File moduleDir = new File(buildDirectory, model.getArtifactId()); + DirectoryScanner ds = new DirectoryScanner(); + ds.setFollowSymlinks(true); + ds.setBasedir(moduleDir); + ds.setIncludes(split); + ds.addDefaultExcludes(); + ds.scan(); + String[] files = ds.getIncludedFiles(); + for (int i = 0; i < files.length; i++) { + File moduleFacesConfig = new File(moduleDir, files[i]); + getLog().info( + "Process " + files[i] + " for module " + + model.getArtifactId()); + XMLBody configBody = new XMLBody(); + try { + configBody.loadXML(new FileInputStream(moduleFacesConfig)); + xmls.add(configBody); + if (commonXpath != null) { + if (keyXPath == null) { + content.append(configBody.getContent(commonXpath)); + } else { + content.append(configBody.getContentUnique(commonXpath, keyXPath, keySet)); + } + } else { + content.append(configBody.getContent()); + } + } catch (FileNotFoundException e) { + throw new MojoExecutionException("Could't read file " + + moduleFacesConfig.getPath(), e); + } catch (ParsingException e) { + throw new MojoExecutionException( + "Error parsing config file " + + moduleFacesConfig.getPath(), e); + } + } + } + if (xmls.size() > 0) { + context.put("content", content.toString()); + context.put("library", library); + context.put("models", models); + context.put("xmls", xmls); + try { + writeParsedTemplate(templates + templateName, context, target); + } catch (Exception e) { + throw new MojoExecutionException("Error to process template " + + templateName + " for files " + filename, e); + } + + } + } + + private void unpackArtifact(Artifact artifact, File moduleDir, + boolean isResource) throws MojoExecutionException { + try { + resolver.resolve(artifact, Collections.EMPTY_LIST, localRepository); + unpack(artifact.getFile(), moduleDir); + if (isResource) { + Resource resource = new Resource(); + resource.setDirectory(moduleDir.getPath()); + resource.addExclude("META-INF/faces-config.xml"); + resource.addExclude("META-INF/resources-config.xml"); + resource.addExclude("META-INF/*.taglib.xml"); + resource.addExclude("META-INF/*.tld"); + project.addResource(resource); + + } + } catch (ArtifactResolutionException e) { + getLog().error("Error with resolve artifact " + artifact, e); + } catch (ArtifactNotFoundException e) { + getLog().error("Not found artifact " + artifact, e); + } + } + + private List<MavenProject> populateReactorProjects() { + List<MavenProject> projects = new ArrayList<MavenProject>(); + if (reactorProjects != null && reactorProjects.size() > 1) { + Iterator reactorItr = reactorProjects.iterator(); + + while (reactorItr.hasNext()) { + MavenProject reactorProject = (MavenProject) reactorItr.next(); + + if (reactorProject != null + && reactorProject.getParent() != null + && project.getArtifactId().equals( + reactorProject.getParent().getArtifactId())) { + String name = reactorProject.getGroupId() + ":" + + reactorProject.getArtifactId(); + getLog().info("Have reactor project with name " + name); + projects.add(reactorProject); + } + } + } + return projects; + } + + /** + * Unpacks the archive file. + * + * @param file + * File to be unpacked. + * @param location + * Location where to put the unpacked files. + */ + private void unpack(File file, File location) throws MojoExecutionException { + + getLog().debug( + "Unpack file " + file.getAbsolutePath() + " to: " + + location.getAbsolutePath()); + try { + location.mkdirs(); + + UnArchiver unArchiver; + + unArchiver = archiverManager.getUnArchiver(file); + + unArchiver.setSourceFile(file); + + unArchiver.setDestDirectory(location); + + unArchiver.setOverwrite(true); + + unArchiver.extract(); + + } catch (Exception e) { + throw new MojoExecutionException("Error unpacking file: " + file + + " to: " + location + "\r\n" + e.toString(), e); + } + } + + private void writePom(Model pom) throws MojoExecutionException { + MavenXpp3Writer pomWriter = new MavenXpp3Writer(); + try { + FileWriter out = new FileWriter(generatedPom); + pomWriter.write(out, pom); + } catch (IOException e) { + throw new MojoExecutionException("Error for write generated pom", e); + } + + } + + /** + * @return the archiverManager + */ + public ArchiverManager getArchiverManager() { + return this.archiverManager; + } + + /** + * @param archiverManager + * the archiverManager to set + */ + public void setArchiverManager(ArchiverManager archiverManager) { + this.archiverManager = archiverManager; + } + + /** + * @return the buildDirectory + */ + public File getBuildDirectory() { + return this.buildDirectory; + } + + /** + * @param buildDirectory + * the buildDirectory to set + */ + public void setBuildDirectory(File buildDirectory) { + this.buildDirectory = buildDirectory; + } + + /** + * @return the factory + */ + public org.apache.maven.artifact.factory.ArtifactFactory getFactory() { + return this.factory; + } + + /** + * @param factory + * the factory to set + */ + public void setFactory( + org.apache.maven.artifact.factory.ArtifactFactory factory) { + this.factory = factory; + } + + /** + * @return the localRepository + */ + public ArtifactRepository getLocalRepository() { + return this.localRepository; + } + + /** + * @param localRepository + * the localRepository to set + */ + public void setLocalRepository(ArtifactRepository localRepository) { + this.localRepository = localRepository; + } + + /** + * @return the mavenProjectBuilder + */ + public MavenProjectBuilder getMavenProjectBuilder() { + return this.mavenProjectBuilder; + } + + /** + * @param mavenProjectBuilder + * the mavenProjectBuilder to set + */ + public void setMavenProjectBuilder(MavenProjectBuilder mavenProjectBuilder) { + this.mavenProjectBuilder = mavenProjectBuilder; + } + + /** + * @return the parentProject + */ + public MavenProject getParentProject() { + return this.parentProject; + } + + /** + * @param parentProject + * the parentProject to set + */ + public void setParentProject(MavenProject parentProject) { + this.parentProject = parentProject; + } + + /** + * @return the reactorProjects + */ + public List getReactorProjects() { + return this.reactorProjects; + } + + /** + * @param reactorProjects + * the reactorProjects to set + */ + public void setReactorProjects(List reactorProjects) { + this.reactorProjects = reactorProjects; + } + + /** + * @return the resolver + */ + public org.apache.maven.artifact.resolver.ArtifactResolver getResolver() { + return this.resolver; + } + + /** + * @param resolver + * the resolver to set + */ + public void setResolver( + org.apache.maven.artifact.resolver.ArtifactResolver resolver) { + this.resolver = resolver; + } + +} Property changes on: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyAttachedLibraryMojo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2007-07-28 01:22:09 UTC (rev 1907) @@ -187,13 +187,8 @@ * @parameter */ private String includeTaglib = "META-INF/*.taglib.xml"; - - - /** - * @parameter - */ - private Taglib[] taglibs; + /** * */ @@ -207,12 +202,242 @@ * @see org.apache.maven.plugin.Mojo#execute() */ public void execute() throws MojoExecutionException, MojoFailureException { + setupParentProject(); + checkLibraryConfig(); + if (null == templates) { + templates = Library.JSF12.equals(library.getJsfVersion()) ? TEMPLATES12_PREFIX + : TEMPLATES_PREFIX; + } + List models = extractModules(); + mergeFacesConfig(models); + File resourcesConfig = new File(outputDirectory, + "META-INF/resources-config.xml"); + mergeXML(models, "META-INF/resources-config.xml", + RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", + "name/text()", new VelocityContext(), resourcesConfig); + if (null != library.getTaglibs() && library.getTaglibs().length > 0) { + for (int i = 0; i < library.getTaglibs().length; i++) { + Taglib taglib = library.getTaglibs()[i]; + List taglibModels; + if (taglib.getIncludeModules() == null + && taglib.getExcludeModules() == null) { + taglibModels = models; + } else { + String[] includeModules = null; + String[] excludeModules = null; + if (null != taglib.getIncludeModules()) { + includeModules = taglib.getIncludeModules().split(","); + Arrays.sort(includeModules); + } + if (null != taglib.getExcludeModules()) { + excludeModules = taglib.getExcludeModules().split(","); + Arrays.sort(excludeModules); + } + taglibModels = new ArrayList(); + for (Iterator iterator = models.iterator(); iterator + .hasNext();) { + Model model = (Model) iterator.next(); + String id = model.getArtifactId(); + if((includeModules == null || Arrays.binarySearch(includeModules, id)>=0)&&(excludeModules == null || Arrays.binarySearch(excludeModules, id)<0)){ + taglibModels.add(model); + } + } + } + generateTaglib(taglibModels, taglib); + } + } else { + generateTaglib(models, library.getTaglib()); + } + } + + /** + * @param models + * @throws MojoExecutionException + */ + private void generateTaglib(List models, Taglib taglib) + throws MojoExecutionException { + VelocityContext taglibContext = new VelocityContext(); + taglibContext.put("taglib", taglib); + // Build includes/excludes Xpath condition + String nameTag = "name"; + createTagCondition(taglib, nameTag); + File tld = new File(outputDirectory, "META-INF/" + + taglib.getTaglib() + ".tld"); + mergeXML(models, includeTld, TLD_TEMPLATE, "/taglib/tag" + + createTagCondition(taglib, "name") + " | /taglib/listener", + null, new VelocityContext(taglibContext), tld); + File faceletsTaglib = new File(outputDirectory, "META-INF/" + + taglib.getTaglib() + ".taglib.xml"); + mergeXML(models, includeTaglib, TAGLIB_TEMPLATE, "/facelet-taglib/tag" + + createTagCondition(taglib, "tag-name") + + " | /facelet-taglib/function", null, new VelocityContext( + taglibContext), faceletsTaglib); + } + + /** + * @param taglib + * @param nameTag + */ + private String createTagCondition(Taglib taglib, String nameTag) { + StringBuffer condition = new StringBuffer(); + if (taglib.getIncludeTags() != null || taglib.getExcludeTags() != null) { + condition.append('['); + if (taglib.getIncludeTags() != null) { + condition.append('('); + String[] includes = taglib.getIncludeTags().split(","); + for (int i = 0; i < includes.length; i++) { + String includeTag = includes[i]; + if (i != 0) { + condition.append(" or "); + } + condition.append("normalize-space(").append(nameTag) + .append(")='").append(includeTag).append("'"); + } + condition.append(')'); + } + if (taglib.getIncludeTags() != null + && taglib.getExcludeTags() != null) { + condition.append(" and "); + } + if (taglib.getExcludeTags() != null) { + condition.append('('); + String[] excludes = taglib.getExcludeTags().split(","); + for (int i = 0; i < excludes.length; i++) { + String includeTag = excludes[i]; + if (i != 0) { + condition.append(" and "); + } + condition.append("normalize-space(").append(nameTag) + .append(")!='").append(includeTag).append("'"); + } + condition.append(')'); + } + condition.append(']'); + } + return condition.toString(); + } + + /** + * @return + * @throws MojoExecutionException + */ + private List extractModules() throws MojoExecutionException { + List modules = parentProject.getModules(); + List models = new ArrayList(modules.size()); + Map<String, Dependency> projectsDependencies = new HashMap<String, Dependency>(); + for (Iterator iter = modules.iterator(); iter.hasNext();) { + String moduleName = (String) iter.next(); + getLog().info("Parent project have module " + moduleName); + Model model; + File f = new File(parentProject.getBasedir(), moduleName + + "/pom.xml"); + if (f.exists()) { + try { + model = mavenProjectBuilder.build(f, localRepository, null) + .getModel(); + } catch (ProjectBuildingException e) { + throw new MojoExecutionException( + "Unable to read local module-POM", e); + } + } else { + getLog().warn("No filesystem module-POM available"); + + model = new Model(); + model.setName(moduleName); + model.setUrl(moduleName); + } + if (project.getGroupId().equals(model.getGroupId()) + && "jar".equals(model.getPackaging()) + && (!project.getArtifactId().equals(model.getArtifactId()))) { + // TODO - check include/exclude + getLog().debug( + "Project " + model.getName() + + " included to library set"); + List dependencies = model.getDependencies(); + for (Iterator iterator = dependencies.iterator(); iterator + .hasNext();) { + Dependency dependency = (Dependency) iterator.next(); + getLog().debug( + dependency.getClass().getName() + " : " + + dependency + " with key: " + + dependency.getManagementKey()); + if (!"test".equals(dependency.getScope())) { + projectsDependencies.put(dependency.getManagementKey(), + dependency); + + } + } + models.add(model); + } + } + // Remove modules projects from dependencise + Set<String> unwanted = new HashSet<String>(projectsDependencies.size()); + for (Iterator iter = models.iterator(); iter.hasNext();) { + Model model = (Model) iter.next(); + for (Iterator iterator = projectsDependencies.values().iterator(); iterator + .hasNext();) { + Dependency dependency = (Dependency) iterator.next(); + if (model.getGroupId().equals(dependency.getGroupId()) + && model.getArtifactId().equals( + dependency.getArtifactId())) { + getLog().debug( + "Remove dependency of library module " + + dependency.getManagementKey()); + unwanted.add(dependency.getManagementKey()); + } + } + // Got module and unpack it to target directory. + Artifact artifact = factory.createBuildArtifact(model.getGroupId(), + model.getArtifactId(), model.getVersion(), model + .getPackaging()); + File moduleDir = new File(buildDirectory, model.getArtifactId()); + unpackArtifact(artifact, moduleDir, true); + artifact = factory + .createArtifactWithClassifier(model.getGroupId(), model + .getArtifactId(), model.getVersion(), "jar", + "sources"); + unpackArtifact(artifact, modulesSrc, false); + } + // Add projects dependencies to this project + projectsDependencies.keySet().removeAll(unwanted); + setupGeneratedProject(projectsDependencies); + return models; + } + + /** + * @param projectsDependencies + * @throws MojoExecutionException + */ + private void setupGeneratedProject( + Map<String, Dependency> projectsDependencies) + throws MojoExecutionException { + Model generatedProject; + try { + MavenXpp3Reader reader = new MavenXpp3Reader(); + generatedProject = reader.read(new FileReader(project.getFile())); + } catch (Exception e1) { + throw new MojoExecutionException("Unable to read local POM", e1); + } + generatedProject.getDependencies() + .addAll(projectsDependencies.values()); + writePom(generatedProject); + project.setDependencies(new ArrayList(projectsDependencies.values())); + project.setFile(generatedPom); + } + + /** + * Check parent project, build if nesessary. + * + * @throws MojoFailureException + */ + protected void setupParentProject() throws MojoFailureException { // Parent project not set for a custom lifecycles. Try to load artifact. if (null == parentProject || null == parentProject.getFile()) { Parent parentModel = project.getModel().getParent(); if (null != parentModel) { String relativePath = parentModel.getRelativePath(); - File parentPom = new File(project.getFile().getAbsoluteFile().getParentFile(), relativePath); + File parentPom = new File(project.getFile().getAbsoluteFile() + .getParentFile(), relativePath); if (parentPom.isDirectory()) { parentPom = new File(parentPom, "pom.xml"); } @@ -220,133 +445,24 @@ try { parentProject = mavenProjectBuilder.build(parentPom, localRepository, null); + if (null == parentProject) { + throw new MojoFailureException( + "Components library project must have parent pom with components modules"); + } } catch (ProjectBuildingException e) { - throw new MojoFailureException("Error get parent project for a components library"); + throw new MojoFailureException( + "Error get parent project for a components library"); } } else { - throw new MojoFailureException("Parent project pom file not found for a components library"); + throw new MojoFailureException( + "Parent project pom file not found for a components library"); } - }else { - throw new MojoFailureException("Components library project must have parent pom with components modules"); + } else { + throw new MojoFailureException( + "Components library project must have parent pom with components modules"); } } - if (null != parentProject) { - this.checkLibraryConfig(); - if (null == templates) { - templates = Library.JSF12.equals(library.getJsfVersion()) ? TEMPLATES12_PREFIX - : TEMPLATES_PREFIX; - } - Model generatedProject; - try { - MavenXpp3Reader reader = new MavenXpp3Reader(); - generatedProject = reader - .read(new FileReader(project.getFile())); - } catch (Exception e1) { - throw new MojoExecutionException("Unable to read local POM", e1); - } - List modules = parentProject.getModules(); - List models = new ArrayList(modules.size()); - Map<String, Dependency> projectsDependencies = new HashMap<String, Dependency>(); - for (Iterator iter = modules.iterator(); iter.hasNext();) { - String moduleName = (String) iter.next(); - getLog().info("Parent project have module " + moduleName); - Model model; - File f = new File(parentProject.getBasedir(), moduleName - + "/pom.xml"); - if (f.exists()) { - try { - model = mavenProjectBuilder.build(f, localRepository, - null).getModel(); - } catch (ProjectBuildingException e) { - throw new MojoExecutionException( - "Unable to read local module-POM", e); - } - } else { - getLog().warn("No filesystem module-POM available"); - - model = new Model(); - model.setName(moduleName); - model.setUrl(moduleName); - } - if (project.getGroupId().equals(model.getGroupId()) - && "jar".equals(model.getPackaging()) - && (!project.getArtifactId().equals( - model.getArtifactId()))) { - // TODO - check include/exclude - getLog().debug( - "Project " + model.getName() - + " included to library set"); - List dependencies = model.getDependencies(); - for (Iterator iterator = dependencies.iterator(); iterator - .hasNext();) { - Dependency dependency = (Dependency) iterator.next(); - getLog().debug( - dependency.getClass().getName() + " : " - + dependency + " with key: " - + dependency.getManagementKey()); - if (!"test".equals(dependency.getScope())) { - projectsDependencies.put(dependency - .getManagementKey(), dependency); - - } - } - models.add(model); - } - } - // Remove modules projects from dependencise - Set<String> unwanted = new HashSet<String>(projectsDependencies - .size()); - for (Iterator iter = models.iterator(); iter.hasNext();) { - Model model = (Model) iter.next(); - for (Iterator iterator = projectsDependencies.values() - .iterator(); iterator.hasNext();) { - Dependency dependency = (Dependency) iterator.next(); - if (model.getGroupId().equals(dependency.getGroupId()) - && model.getArtifactId().equals( - dependency.getArtifactId())) { - getLog().debug( - "Remove dependency of library module " - + dependency.getManagementKey()); - unwanted.add(dependency.getManagementKey()); - } - } - // Got module and unpack it to target directory. - Artifact artifact = factory.createBuildArtifact(model - .getGroupId(), model.getArtifactId(), model - .getVersion(), model.getPackaging()); - File moduleDir = new File(buildDirectory, model.getArtifactId()); - unpackArtifact(artifact, moduleDir, true); - artifact = factory.createArtifactWithClassifier(model - .getGroupId(), model.getArtifactId(), model - .getVersion(), "jar", "sources"); - unpackArtifact(artifact, modulesSrc, false); - } - // Add projects dependencies to this project - projectsDependencies.keySet().removeAll(unwanted); - generatedProject.getDependencies().addAll( - projectsDependencies.values()); - writePom(generatedProject); - mergeFacesConfig(models); - File resourcesConfig = new File(outputDirectory, - "META-INF/resources-config.xml"); - mergeXML(models, "META-INF/resources-config.xml", - RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", "name/text()", - new VelocityContext(), resourcesConfig); - File tld = new File(outputDirectory, "META-INF/" - + library.getTaglib().getShortName() + ".tld"); - mergeXML(models, includeTld, TLD_TEMPLATE, - "/taglib/tag | /taglib/listener", - null, new VelocityContext(), tld); - File taglib = new File(outputDirectory, "META-INF/" - + library.getTaglib().getShortName() + ".taglib.xml"); - mergeXML(models, includeTaglib, TAGLIB_TEMPLATE, - "/facelet-taglib/tag | /facelet-taglib/function", - null, new VelocityContext(), taglib); - }else { - throw new MojoFailureException("Components library project must have parent pom with components modules"); - } - } /** @@ -417,15 +533,17 @@ * name of velocity template for result file. * @param commonXpath - * XPath expression fof common part of result file. - * @param keyXPath - XPath expression for key part of common parts - * @param keySet - {@link Set} to check for duplicate keys. Must not be null + * @param keyXPath - + * XPath expression for key part of common parts + * @param keySet - + * {@link Set} to check for duplicate keys. Must not be null * @param context - * Velocity context for template processing. * @throws MojoExecutionException */ private void mergeXML(List models, String filename, String templateName, - String commonXpath, String keyXPath, VelocityContext context, File target) - throws MojoExecutionException { + String commonXpath, String keyXPath, VelocityContext context, + File target) throws MojoExecutionException { Set<String> keySet = new HashSet<String>(); StringBuffer content = new StringBuffer(); List<XMLBody> xmls = new ArrayList<XMLBody>(models.size()); @@ -453,7 +571,8 @@ if (keyXPath == null) { content.append(configBody.getContent(commonXpath)); } else { - content.append(configBody.getContentUnique(commonXpath, keyXPath, keySet)); + content.append(configBody.getContentUnique( + commonXpath, keyXPath, keySet)); } } else { content.append(configBody.getContent()); Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java 2007-07-28 01:22:09 UTC (rev 1907) @@ -44,6 +44,11 @@ private Renderkit[] _renderkits; /** + * @parameter + */ + private Taglib[] taglibs; + + /** * @return the prefix */ public String getPrefix() { @@ -125,4 +130,18 @@ } } + /** + * @return the taglibs + */ + public Taglib[] getTaglibs() { + return taglibs; + } + + /** + * @param taglibs the taglibs to set + */ + public void setTaglibs(Taglib[] taglibs) { + this.taglibs = taglibs; + } + } Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2007-07-28 01:22:09 UTC (rev 1907) @@ -29,7 +29,7 @@ */ public class Taglib { - private File _taglib; + private String _taglib; private String _uri; @@ -97,14 +97,14 @@ /** * @return the taglib */ - public File getTaglib() { + public String getTaglib() { return this._taglib; } /** * @param taglib the taglib to set */ - public void setTaglib(File taglib) { + public void setTaglib(String taglib) { this._taglib = taglib; } Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/component/config.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/component/config.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/component/config.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -18,7 +18,7 @@ <name>${name}</name> <classname>${package}.taglib.${className}Tag</classname> <superclass> - org.ajax4jsf.framework.taglib.HtmlComponentTagBase + org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass> </tag>  <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <outputDirectory>${project.build.directory}/dist</outputDirectory> <descriptors> - <descriptor>src/main/assembly/richfaces.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> + <descriptor>${basedir}/src/main/assembly/richfaces.xml</descriptor> + <descriptor>${basedir}/src/main/assembly/src.xml</descriptor> </descriptors> </configuration> <executions> <execution> <id>make-assembly</id> - <phase>package</phase>  + <phase>package</phase> <goals> <goal>attached</goal> </goals> </execution> </executions> </plugin> +--> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> Modified: trunk/ui/core/pom.xml =================================================================== --- trunk/ui/core/pom.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/ui/core/pom.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -8,7 +8,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core</artifactId> + <artifactId>core</artifactId> <name>Java Server Faces AJAX framework</name> <build> <plugins> @@ -35,7 +35,7 @@ <library> <prefix>org.richfaces</prefix> <taglib> - <uri>http://richfaces.org/ajax</uri> + <uri>http://richfaces.org/a4j</uri> <shortName>a4j</shortName> <displayName>Core ajax components tags</displayName> </taglib>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1906 - in trunk/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-07-27 20:14:21 -0400 (Fri, 27 Jul 2007) New Revision: 1906 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.html trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.html trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml Log: jsFunction and poll are added Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2007-07-27 16:34:06 UTC (rev 1905) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2007-07-28 00:14:21 UTC (rev 1906) @@ -1,10 +1,20 @@ package org.richfaces.demo.ajaxsupport; +import java.util.Date; + public class UserBean { private String name; private java.lang.Integer screenWidth; private java.lang.Integer screenHeight; private String job; + private Date date; + private Boolean pollEnabled; + + public UserBean() { + super(); + pollEnabled=true; + } + public String getName() { return this.name; } @@ -45,5 +55,21 @@ public void setJob(String job) { this.job = job; } + + public Date getDate() { + return new Date(); + } + + public void setDate(Date date) { + this.date = date; + } + + public Boolean getPollEnabled() { + return pollEnabled; + } + + public void setPollEnabled(Boolean pollEnabled) { + this.pollEnabled = pollEnabled; + } } Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-27 16:34:06 UTC (rev 1905) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-28 00:14:21 UTC (rev 1906) @@ -40,7 +40,7 @@ form= ajaxSupport, Ajax Form, /images/ico_common.gif, /images/cn_ajaxForm.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/form.jsf support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/support.jsf jsFunction= ajaxSupport, JavaScript Function, /images/ico_common.gif, /images/cn_jsFunction.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/jsFunction.jsf -poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf +poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_poll.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/poll.jsf push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf ajaxListener= ajaxSupport, Ajax Listener, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.html =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.html (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.html 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1 @@ +TODO: source should be added \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/source/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1 @@ +x \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1,66 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <p>a4j:jsFunction component is very similar to a4j:commandButton, but allows to peform + Ajax request from Javascript code directly. The component sends a request using + a standard JSF approach, so, the JSF form is required. The folowing example + shows how the part of the page is re-rendered when user hover over the names. + </p> + + <div class="sample-container" > + <rich:separator lineType="solid" height="1" /> + <table width="400"> + <tbody> + <tr> + <td onmouseover="updateName('Alex')" onmouseout="updateName('')" > Alex</td> + <td onmouseover="updateName('Jonh')" onmouseout="updateName('')" > Jonh</td> + <td onmouseover="updateName('Roger')" onmouseout="updateName('')" > Roger</td> + </tr> + <tr> + <td colspan="3"><h:outputText id="showname" value="Name: #{userBean.name}" /></td> + </tr> + </tbody> + </table> + + <a4j:form> + <a4j:jsFunction name="updateName" reRender="showname"> + <a4j:actionparam name="param1" assignTo="#{userBean.name}" /> + </a4j:jsFunction> + </a4j:form> + + <rich:separator height="1" style="padding-top:10px" /> + </div> + <p> + <b>name</b> attribute defines the name of the function that will be generated. You + can use it as a regular Javascript function name to invoke. a4j:actionparam + is used to pass the function arguments (you can use f:param as well). The order and + the number of parameters correspond to the arguments of the called function. The + value(s) of the a4j:actionparam will be replaced with the value of function arguments + before the Ajax request is sent. To read more about a4j:action param visit + <h:outputLink value="#{facesContext.externalContext.requestContextPath}/richfaces/actionparam.jsf?c=actionparam"> + <h:outputText value="'Ajax Paramemeter' section" /> + </h:outputLink>. + </p> + <p> + As for any other Ajax components, you can use <b>reRender</b> attribute to update the area(s) of the page + after Ajax response returns back. Also, you can use <b>data</b> attribute and <b>oncomplete</b> attribute to + take the data from the server and use them for Javascript call them. For additional information about + Javascript oriented and other important attributes of a4j:jsFunction read + <h:outputLink value="#{facesContext.externalContext.requestContextPath}/richfaces/ajaxAttributes.jsf?c=ajaxattributes"> + <h:outputText value="'Ajax Attribute' section" /> + </h:outputLink>. + </p> + </ui:define> + <ui:define name="sources"> + Here is a fragment of page sources for the given example: + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/jsFunction/source/usage.html" class="source_frame"/> + </ui:define> + </ui:composition> +</html> \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.html =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.html (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.html 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1 @@ +TODO: source should be added \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/source/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1 @@ +x \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1,92 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + + <p>a4j:poll is one of the way how you can orginize the periodical polling of server data and + updating the page. a4j:poll is a standard RichFaces Ajax component. So, you can use the same + approach as for a4j:commandButton for example. I.e. you can use action attribute to invoke the + actiom method and reRender attribute to update area(s) on the client when Ajax response returns + back. RichFaces use the standard form based request, so having the form around the + a4j:poll component is required. + </p> + <p>The following example shown how the date and time is updated on the page based on the data + taken from the server.</p> + <div class="sample-container" > + <rich:separator height="1"/> + <a4j:region> + <h:form> + <a4j:poll id="poll" interval="500" enabled="#{userBean.pollEnabled}" reRender="serverDate" /> + </h:form> + </a4j:region> + <h:form> + <h:panelGrid columns="2" width="80%"> + <a4j:commandButton style="width:120px" id="control" value="#{userBean.pollEnabled?'Stop':'Start'} Polling" + reRender="poll, control"> + <a4j:actionparam name="polling" value="#{!userBean.pollEnabled}" + assignTo="#{userBean.pollEnabled}"/> + </a4j:commandButton> + <h:outputText id="serverDate" style="font-size:16px" value="Server Date: #{userBean.date}" /> + </h:panelGrid> + </h:form> + <rich:separator height="1" style="padding-top:10px"/> + </div> + + <p><b>interval</b> attribute defines the interval in ms between the previous response and the + next request. So, the total period between two request generated by a4j:poll is a sum of interval + and server response time. + </p> + <p> + <b>timeout</b> attribute defines the time in ms how long the client will wait for server response. + if Ajax response does not come during this period, the connection is aborted and the next + request is sent. By default, the timeout is not set. + </p> + <p> + <b>enabled</b> attribute defines should the a4j:poll send request or not. You can use EL + to point to the bean property that will be the flag. Re-render the a4j:poll component itself + to apply the current value. See the example how to accomplish this task. + </p> + <p> + a4j:poll sends requests in parallel with user activities. The intersections + between a4j:poll Ajax requests and other Ajax requests are possible. This might causes + unpredictable glitches. Especially, it is true for the earlier version of JSF implementations + when the parallel requests to the server was not expected. To avoid problem, try to follow + very simple rules: + <ul> + <li>Have a separate form for a4j:poll. Note, that other fields will be included in + request and processed on the server if the form contains not only a4j:poll;</li> + <li>Surround a4j:poll with a4j:region. This allow to limit the part of the component + tree that will be processed for each Ajax request;</li> + <li>Try to avoid updating the same server data that might be updated by the Ajax requests + produced by the user activities. If you need this, be sure your code allows to access + the data from parallel thread without conflicts;</li> + <li>Try to avoid re-rendering the area(s) with input field and other form controls. + This causes the losing of input focus because the old elements are removed before + the update with the upcomming ones</li> + <li>Try to re-render as little area(s) on the client as possible. Try do not have + intersections between the areas re-rendered by a4j:poll and areas re-rendered + by other Ajax components;</li> + <li>Use the eventsQueue with the same name as the name for other Ajax components. + This allows to queue the Ajax request and avoid updating the server side data + and re-rendering the page area(s) in parallet;</li> + <li>Set the reasonable interval. Note that each Ajax request restores the session + and component tree as well as processes the whole JSF lifecycle. Too often requests + just degrade the overall performance of application</li> + </ul> + + </p> + + + </ui:define> + <ui:define name="sources"> + Here is a fragment of page sources for the given example: + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/poll/source/usage.html" class="source_frame"/> + </ui:define> + </ui:composition> +</html> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -0,0 +1,17 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Poll</ui:define> + <ui:define name="body"> + <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tab label="Usage"> + <ui:include src="/richfaces/poll/usage.xhtml"/> + </rich:tab> + </rich:tabPanel> + </ui:define> +</ui:composition> +</html> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-07-27 16:34:06 UTC (rev 1905) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-07-28 00:14:21 UTC (rev 1906) @@ -32,7 +32,8 @@ </tbody> </table> -<h:graphicImage value="#{componentNavigator.currentComponent.captionImage}" height="40" alt="" border="0" styleClass="component_name"/> +<h:graphicImage value="#{componentNavigator.currentComponent.captionImage}" + rendered="#{componentNavigator.currentComponent.captionImage!=''}" height="40" alt="" border="0" styleClass="component_name"/> <table cellpadding="0" cellspacing="0" border="0" class="content_container" width="100%"> <tbody>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1905 - in trunk/ui/dropdown-menu/src/main: templates/org/richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-07-27 12:34:06 -0400 (Fri, 27 Jul 2007) New Revision: 1905 Modified: trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx Log: http://jira.jboss.com/jira/browse/RF-493 Modified: trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-27 16:32:41 UTC (rev 1904) +++ trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-27 16:34:06 UTC (rev 1905) @@ -75,7 +75,7 @@ writer.startElement("div", layer); writer.writeAttribute("id", clientId+"_menu", null); writer.writeAttribute("class", "dr-menu-list-border rich-menu-list-border", null); - writer.writeAttribute("style", "visibility: hidden; z-index:100; ", null); + writer.writeAttribute("style", "visibility: hidden; z-index: 2; ", null); writer.startElement("div", layer); writer.writeAttribute("class", "dr-menu-list-bg rich-menu-list-bg", null); encodeItems(context, layer); @@ -104,7 +104,7 @@ .getUri(context, null), null); writer.writeAttribute("id", clientId+"_menu_iframe", null); writer.writeAttribute("class", "underneath_iframe", null); - writer.writeAttribute("style", "position:absolute", null); + writer.writeAttribute("style", "position:absolute; z-index: 1;", null); writer.endElement("iframe"); writer.startElement("script", layer); Modified: trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx =================================================================== --- trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-27 16:32:41 UTC (rev 1904) +++ trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-27 16:34:06 UTC (rev 1905) @@ -42,7 +42,7 @@ <![CDATA[}]]> </jsp:scriptlet> - <div style="margin: 0px; padding: 0px; border: 0px; position: relative;"> + <div style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index:100;"> <vcp:body> <f:call name="renderChildren" /> </vcp:body>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1904 - trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-07-27 12:32:41 -0400 (Fri, 27 Jul 2007) New Revision: 1904 Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessagesHtmlBaseRenderer.java Log: add log Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessagesHtmlBaseRenderer.java =================================================================== --- trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessagesHtmlBaseRenderer.java 2007-07-27 16:31:38 UTC (rev 1903) +++ trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessagesHtmlBaseRenderer.java 2007-07-27 16:32:41 UTC (rev 1904) @@ -134,7 +134,11 @@ // renderComponentOuterStyles(uiMessages, context, writer); } - + + if(log.isInfoEnabled()){ + log.info("start render messages"); + } + while(messagesIter.hasNext()){ FacesMessage facesMsg = (FacesMessage)(messagesIter.next()); @@ -164,6 +168,11 @@ requestMap.put(var, facesMsg); try { + + if(log.isInfoEnabled()){ + log.info("start render children of " + uiMessages.getClientId(context) + " component"); + } + renderChildren(context, uiMessages); } finally { @@ -210,6 +219,10 @@ uiMessages = (UIRichMessages)component; + if(log.isInfoEnabled()){ + log.info("start render label HTML"); + } + boolean isTooltip = getUtils().isBooleanAttribute(uiMessages, "tooltip"); boolean showSummary = uiMessages.isShowSummary(); @@ -281,6 +294,10 @@ return; } + if(log.isInfoEnabled()){ + log.info("start render marker HTML: " + markerFacet.getClientId(context)); + } + uiMessages = (UIRichMessages)component; if(uiMessages.isWroteTable()){ @@ -315,6 +332,10 @@ uiMessages = (UIRichMessages)component; + if(log.isInfoEnabled()){ + log.info("start render component outer styles: " + uiMessages.getClientId(context)); + } + String parentStyle = (String)uiMessages.getAttributes().get("style"); String parentClass = (String)uiMessages.getAttributes().get("styleClass");

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1903 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: vkorluzhenko Date: 2007-07-27 12:31:38 -0400 (Fri, 27 Jul 2007) New Revision: 1903 Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml Log: http://jira.jboss.com/jira/browse/RF-505 Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-07-27 16:11:00 UTC (rev 1902) +++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-07-27 16:31:38 UTC (rev 1903) @@ -155,23 +155,23 @@ <itemizedlist> <listitem> - <para>top-left - a menu attached to the top-right corner of the label</para> + <para>top-left - a menu drops to the top and left</para> </listitem> <listitem> - <para>top-right - a menu attached to the top-left corner of the label</para> + <para>top-right - a menu drops to the top and right</para> </listitem> <listitem> - <para>bottom-left - a menu attached to the bottom-right corner of the label</para> + <para>bottom-left - a menu drops to the bottom and left</para> </listitem> <listitem> - <para>bottom-right - a menu attached to the bottom-left corner of the label</para> + <para>bottom-right - a menu drops to the bottom and right</para> </listitem> <listitem> - <para>auto - a smart positioning activation</para> + <para>auto - smart positioning activation</para> </listitem> </itemizedlist> @@ -179,19 +179,19 @@ <itemizedlist> <listitem> - <para>tr - top-right point of the label element</para> + <para>tr - a menu is attached to the top-right point of the button element</para> </listitem> <listitem> - <para>tl - top-left point of the label element</para> + <para>tl - a menu is attached to the top-left point of the button element</para> </listitem> <listitem> - <para>br - bottom-right point of the label element</para> + <para>br - a menu is attached to the bottom-right point of the button element</para> </listitem> <listitem> - <para>bl - bottom-left point of the label element</para> + <para>bl - a menu is attached to the bottom-left point of the button element</para> </listitem> <listitem> Modified: trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-07-27 16:11:00 UTC (rev 1902) +++ trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-07-27 16:31:38 UTC (rev 1903) @@ -96,11 +96,11 @@ </para> <para>Possible values are:</para> <itemizedlist> - <listitem><para>left - down - a submenu is attached to the left side of the menu and is dropping down;</para></listitem> - <listitem><para>left - up - a submenu is attached to the left side of the menu and is dropping up;</para></listitem> - <listitem><para>right - down - a submenu is attached to the right side of the menu and is dropping down;</para></listitem> - <listitem><para>right - up - a submenu is attached to the right side of the menu and is dropping up;</para></listitem> - <listitem><para>auto - smart positioning activated.</para></listitem> + <listitem><para>left - down - a submenu is attached to the left side of the menu and is dropping down</para></listitem> + <listitem><para>left - up - a submenu is attached to the left side of the menu and is dropping up</para></listitem> + <listitem><para>right - down - a submenu is attached to the right side of the menu and is dropping down</para></listitem> + <listitem><para>right - up - a submenu is attached to the right side of the menu and is dropping up</para></listitem> + <listitem><para>auto - smart positioning activation</para></listitem> </itemizedlist> <para> By default, the "direction" attribute is set to "auto".

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1902 - trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2007-07-27 12:11:00 -0400 (Fri, 27 Jul 2007) New Revision: 1902 Modified: trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: Popup mode: positioning improvements Iframe fixes Date string parsing using pattern added Other improvements and fixes Modified: trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-27 16:05:46 UTC (rev 1901) +++ trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-27 16:11:00 UTC (rev 1902) @@ -24,7 +24,7 @@ var match; if (typeof jointPoint=='object') {ox = jointPoint.x; oy=jointPoint.y} - else if ( jointPoint && (match=jointPoint.toLowerCase().match(re)) ) + else if ( jointPoint && (match=jointPoint.toLowerCase().match(re))!=null ) { if (match[2]=='right') ox+=baseElementDim.width; if (match[1]=='bottom') oy+=baseElementDim.height; @@ -34,7 +34,7 @@ } // direction - if (direction && (match=direction.toLowerCase().match(re)) ) + if (direction && (match=direction.toLowerCase().match(re))!=null ) { var d = direction.toLowerCase().split('-'); if (match[2]=='left') ox-=elementDim.width; @@ -161,6 +161,15 @@ return {left:windowOffset.left, top:windowOffset.top, right: windowDim.width+windowOffset.left, bottom: windowDim.height+windowOffset.top}; } +Richfaces.Calendar.joinArray = function(array, begin, end, separator) +{ + var value = ''; + if (array.length!=0) value = begin+array.pop()+end; + while (array.length) + value = begin+array.pop()+end+separator+value; + return value; +} + /*Richfaces.Calendar.getPageDimensions = function() { var x,y; var test1 = document.body.scrollHeight; @@ -213,10 +222,19 @@ * Date: * d - 1-31 * dd+ - 01-31 */ +Object.extend(Date, { + getDefaultMonthNames: function(shortNames) + { + return (shortNames + ? ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'] + : ['January','February','March','April','May','June','July','August','September','October','November','December']); + } +}); Object.extend(Date.prototype, { + format : function(pattern, monthNames, monthNamesShort) { - if (!monthNames) monthNames = ['January','February','March','April','May','June','July','August','September','October','November','December']; - if (!monthNamesShort) monthNamesShort = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; + if (!monthNames) monthNames = Date.getDefaultMonthNames(); + if (!monthNamesShort) monthNamesShort = Date.getDefaultMonthNames(true); var d = this; var mm; var dd; return pattern.replace(/(yy^y|y+|M^M|MM^M|MMM^M|M+|d^d|d+)/g, function($1) { @@ -237,6 +255,48 @@ } }); +Object.extend(Date, { + parseDate: function(dateString, pattern, monthNames, monthNamesShort) + { + if (!monthNames) monthNames = Date.getDefaultMonthNames(); + if (!monthNamesShort) monthNamesShort = Date.getDefaultMonthNames(true); + + var counter=1; + var y,m,d; + + pattern = pattern.replace(/([.*+?^<>=!:${}()|[\]\/\\])/g, '\\$1'); + pattern = pattern.replace(/(yy^y|y+|M^M|MM^M|MMM^M|M+|d^d|d+)/g, + function($1) { + switch ($1) { + case 'yy' : y=counter; counter++; return '(\\d{2})'; + case 'MM' : m=counter; counter++; return '(\\d{2})'; + case 'M' : m=counter; counter++; return '(\\d{1,2})'; + case 'd' : d=counter; counter++; return '(\\d{1,2})'; + case 'MMM': m=counter; counter++; return '('+monthNamesShort.join('|')+')'; + } + // y+,M+,d+ + var ch = $1.charAt(0); + if (ch=='y') {y=counter; counter++; return '(\\d{4})'}; + if (ch=='M') {m=counter; counter++; return '('+monthNames.join('|')+')'}; + if (ch=='d') {d=counter; counter++; return '(\\d{2})'}; + } + ); + + var re = new RegExp(pattern,'i'); + var match = dateString.match(re); + if (match!=null) + { + var month; + var yy = parseInt(match[y]); if (isNaN(yy)) return null; else if (yy<70) yy+=2000; else if (yy<100) yy+=1900; + var mm = parseInt(match[m]); if (isNaN(mm)) mm = match[m]; else if (mm<1 || mm>12) return null; + var days = 32 - new Date(mm+'/32/'+yy).getDate(); + var dd = parseInt(match[d]); if (isNaN(dd) || dd<1 || dd>days) return null; + return new Date(mm+'/'+dd+'/'+yy); + } + return null; + } +}); + function isLeapYear(year) { return new Date(year, 1, 29).getDate()==29; } @@ -451,7 +511,7 @@ doCollapse: function() { if (/*!this.params.popup || */!this.isVisible) return; - + Element.hide(this.IFRAME_ID); Element.hide(this.id); this.isVisible = false; @@ -460,6 +520,14 @@ doExpand: function() { if (/*!this.params.popup || */this.isVisible) return; + var field = $(this.POPUP_INPUT_ID); +/* if (field) + { + var date = Date.parseDate(field.value, this.params.datePattern, this.params.monthLabels, this.params.monthLabelsShort); + this.selectedDate = Date.parseDate(field.value, this.params.datePattern, this.params.monthLabels, this.params.monthLabelsShort); + if (this.selectedDate==null) this.currebn + }*/ + var base = $(this.POPUP_ID); var e = $(this.id); var iframe = $(this.IFRAME_ID); @@ -888,7 +956,7 @@ selectDate: function(date) { if (date) { - date = new Date(date); + if (typeof date=='string') date = Date.parseDate(date,this.params.datePattern, this.params.monthLabels, this.params.monthLabelsShort) if (this.selectedDate && this.selectedDate == date) return; this.selectedDate = date; }

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1901 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-07-27 12:05:46 -0400 (Fri, 27 Jul 2007) New Revision: 1901 Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_jsFunction.gif trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml Log: demos added Copied: trunk/samples/richfaces-demo/src/main/webapp/images/cn_jsFunction.gif (from rev 1874, trunk/samples/richfaces-demo/src/main/webapp/images/cn_javascript_function.gif) =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_jsFunction.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-07-27 16:04:53 UTC (rev 1900) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -239,8 +239,7 @@ </p> <div class="esample"> <pre> - <a4j:commandButton value="Update" data="<span>#</span>{userBean.name}" oncomplete="showTheName(data.name)" /> -</h:inputText> +<a4j:commandButton value="Update" data="<span>#</span>{userBean.name}" oncomplete="showTheName(data.name)" /> </pre> </div> <p> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml 2007-07-27 16:04:53 UTC (rev 1900) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -21,7 +21,7 @@ </p> <div class="sample-container" > - <rich:separator width="1" /> + <rich:separator height="1" /> <a4j:form> <h:panelGrid columns="3"> @@ -36,7 +36,7 @@ <h:outputText value="!" rendered="#{not empty userBean.name}" /> </h:panelGroup> - <rich:separator width="1" style="padding-top:10px" /> + <rich:separator height="1" style="padding-top:10px" /> </div> <p> For additional information about attributes of this compponent read Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-07-27 16:04:53 UTC (rev 1900) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/main.xhtml"> - <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Form</ui:define> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Button</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml 2007-07-27 16:04:53 UTC (rev 1900) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -21,7 +21,7 @@ </p> <div class="sample-container" > - <rich:separator width="1" /> + <rich:separator height="1" /> <a4j:form> <h:panelGrid columns="3"> @@ -38,7 +38,7 @@ <h:outputText value="!" rendered="#{not empty userBean.name}" /> </h:panelGroup> - <rich:separator width="1" style="padding-top:10px" /> + <rich:separator height="1" style="padding-top:10px" /> </div> <p> For additional information about attributes of this compponent read @@ -50,7 +50,7 @@ </ui:define> <ui:define name="sources"> Here is a fragment of page sources for the given example: - <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/commandButton/source/usage.html" class="source_frame"/> + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/commandLink/source/usage.html" class="source_frame"/> </ui:define> </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2007-07-27 16:04:53 UTC (rev 1900) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/main.xhtml"> - <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Form</ui:define> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Link</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml 2007-07-27 16:05:46 UTC (rev 1901) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax JS Function</ui:define> + <ui:define name="body"> + <ui:include src="/richfaces/jsFunction/usage.xhtml"/> + + </ui:define> +</ui:composition> +</html>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1900 - trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-07-27 12:04:53 -0400 (Fri, 27 Jul 2007) New Revision: 1900 Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties Log: jsFunction added Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-27 15:39:12 UTC (rev 1899) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-27 16:04:53 UTC (rev 1900) @@ -39,7 +39,7 @@ commandLink= ajaxSupport, Command Link, /images/ico_common.gif, /images/cn_commandLink.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/commandLink.jsf form= ajaxSupport, Ajax Form, /images/ico_common.gif, /images/cn_ajaxForm.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/form.jsf support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/support.jsf -jsFunction= ajaxSupport, JavaScript Function, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf +jsFunction= ajaxSupport, JavaScript Function, /images/ico_common.gif, /images/cn_jsFunction.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/jsFunction.jsf poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1899 - trunk/docs/userguide/en/src/main/docbook/modules.

by richfaces-svn-commits＠lists.jboss.org

Author: vkorluzhenko Date: 2007-07-27 11:39:12 -0400 (Fri, 27 Jul 2007) New Revision: 1899 Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml Log: http://jira.jboss.com/jira/browse/RF-507 Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-07-27 15:37:52 UTC (rev 1898) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-07-27 15:39:12 UTC (rev 1899) @@ -108,7 +108,7 @@ url="http://labs.jboss.com/wiki/RichFacesArticleDataTable" >here</ulink>.</para> <para>Source code (SVN) could be found <ulink - url="http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces-samples/richface..." + url="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/richfaces-art-data..." >here</ulink>.</para> <para> Online demo for a Web application is available <ulink url=" http://livedemo.exadel.com/richfaces-art-datatable/"

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r1898 - trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-07-27 11:37:52 -0400 (Fri, 27 Jul 2007) New Revision: 1898 Modified: trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java Log: fixed tests according to changed layout Modified: trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java =================================================================== --- trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-27 15:01:42 UTC (rev 1897) +++ trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-27 15:37:52 UTC (rev 1898) @@ -8,6 +8,8 @@ import javax.faces.component.UIOutput; import javax.faces.component.html.HtmlOutputText; +import org.ajax4jsf.javascript.AjaxScript; +import org.ajax4jsf.javascript.PrototypeScript; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; import org.richfaces.component.UIScrollableGridColumn; @@ -29,9 +31,8 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); - javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript"); + javaScripts.add(AjaxScript.class.getName()); + javaScripts.add(PrototypeScript.class.getName()); javaScripts.add("org/richfaces/renderkit/html/scripts/scrollable-grid.js"); } @@ -160,7 +161,7 @@ } assertTrue(res); - if(!elemClassAttr.contains("ClientUI_Grid_HSplit")){ + if(!elemClassAttr.contains("dr-sgrid-hsplit")){ boolean templates = elem.getId().equals(grid.getId()+ "_GridBodyTemplate") || elem.getId().equals(grid.getId()+ "_GridFooterTemplate") || elem.getId().equals(grid.getId()+ "_GridHeaderTemplate"); assertTrue(templates);

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2007