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> <!-- Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/component/template.jspx =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/component/template.jspx 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/component/template.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="${package}.renderkit.${markup}.${className}Renderer" - baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase" + baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" component="${package}.component.UI${className}" <f:clientid var="clientId"/> Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/templates/taglib.vm =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/templates/taglib.vm 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/templates/taglib.vm 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> <facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> -<namespace>${library.taglib.uri}</namespace> +<namespace>${taglib.uri}</namespace> ${content} </facelet-taglib> \ No newline at end of file Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/templates/tld.vm =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/templates/tld.vm 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/templates/tld.vm 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,21 +2,21 @@ <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> <taglib> - <tlib-version>${library.taglib.tlibVersion}</tlib-version> - <jsp-version>${library.taglib.jspVersion}</jsp-version> -#if(${library.taglib.shortName}) - <short-name>${library.taglib.shortName}</short-name> + <tlib-version>${taglib.tlibVersion}</tlib-version> + <jsp-version>${taglib.jspVersion}</jsp-version> +#if(${taglib.shortName}) + <short-name>${taglib.shortName}</short-name> #end - <uri>${library.taglib.uri}</uri> -#if(${library.taglib.displayName}) - <display-name>${library.taglib.displayName}</display-name> + <uri>${taglib.uri}</uri> +#if(${taglib.displayName}) + <display-name>${taglib.displayName}</display-name> #end #if(${library.description}) <description>${library.description}</description> #end -#if(${library.taglib.validatorClass}) +#if(${taglib.validatorClass}) <validator> - <validator-class>${library.taglib.validatorClass}</validator-class> + <validator-class>${taglib.validatorClass}</validator-class> </validator> #end Modified: trunk/docs/ajaxguide/pom.xml =================================================================== --- trunk/docs/ajaxguide/pom.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/docs/ajaxguide/pom.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -32,7 +32,7 @@ <groupId> org.richfaces.ui </groupId> - <artifactId>richfaces-ui-core</artifactId> + <artifactId>core</artifactId> <version> 3.1.0-SNAPSHOT </version> Modified: trunk/samples/ajaxPortlet/src/main/webapp/jsf/repeater.xhtml =================================================================== --- trunk/samples/ajaxPortlet/src/main/webapp/jsf/repeater.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/ajaxPortlet/src/main/webapp/jsf/repeater.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <h:form id="portlet_form"> <h:panelGrid columns="2"> Modified: trunk/samples/ajaxPortlet/src/main/webapp/jsf/start.xhtml =================================================================== --- trunk/samples/ajaxPortlet/src/main/webapp/jsf/start.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/ajaxPortlet/src/main/webapp/jsf/start.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <h:form id="portlet_form"> <h:panelGrid columns="2"> Modified: trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataFilterSlider" prefix="ez" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/dataTableDemo/src/main/webapp/pages/ajax.jsp =================================================================== --- trunk/samples/dataTableDemo/src/main/webapp/pages/ajax.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/dataTableDemo/src/main/webapp/pages/ajax.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable" prefix="data" %> -<%@taglib prefix="a4j" uri="http://richfaces.org/ajax" %> +<%@taglib prefix="a4j" uri="http://richfaces.org/a4j" %> <html> <head> <title></title> Modified: trunk/samples/dataTableDemo/src/main/webapp/pages/colgroup.jsp =================================================================== --- trunk/samples/dataTableDemo/src/main/webapp/pages/colgroup.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/dataTableDemo/src/main/webapp/pages/colgroup.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable" prefix="data"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> <title></title> Modified: trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable" prefix="data" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <html> <head> <title></title> Modified: trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/drag-drop" prefix="dnd" %> Modified: trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml =================================================================== --- trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/gmap-sample/src/main/webapp/gmap.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" xmlns:gmap="http://labs.jboss.com/jbossrichfaces/ui/gmap" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <f:view contentType="text/html" > Modified: trunk/samples/inputNumberSliderDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/inputNumberSliderDemo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/inputNumberSliderDemo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/inputnumber-slider" prefix="rich" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <html> <head> Modified: trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -7,7 +7,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/modal-panel" prefix="mp" %> <html> Modified: trunk/samples/panel-sample/src/main/webapp/panel.xhtml =================================================================== --- trunk/samples/panel-sample/src/main/webapp/panel.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/panel-sample/src/main/webapp/panel.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:panel="http://labs.jboss.com/jbossrichfaces/ui/panel" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" <head> <style> Modified: trunk/samples/panel-sample/src/main/webapp/panel2.xhtml =================================================================== --- trunk/samples/panel-sample/src/main/webapp/panel2.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/panel-sample/src/main/webapp/panel2.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:panel="http://labs.jboss.com/jbossrichfaces/ui/panel" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <head> <style> .panel { Modified: trunk/samples/panelmenu-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/panelmenu-sample/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/panelmenu-sample/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%--@ taglib uri="http://richfaces.ajax4jsf.org/panelmenu" prefix="pm" %> <%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"--%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panelmenu" prefix="pm"%> <html> Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/pom.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -64,11 +64,6 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.12</version> @@ -401,21 +396,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core</artifactId> - <version>3.1.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> <version>${myfaces}</version> Modified: trunk/samples/portal-echo/src/main/webapp/jsf/repeater.xhtml =================================================================== --- trunk/samples/portal-echo/src/main/webapp/jsf/repeater.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/portal-echo/src/main/webapp/jsf/repeater.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <h:form id="portlet_form"> <h:panelGrid columns="2"> Modified: trunk/samples/portal-echo/src/main/webapp/jsf/start.xhtml =================================================================== --- trunk/samples/portal-echo/src/main/webapp/jsf/start.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/portal-echo/src/main/webapp/jsf/start.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <h:form id="portlet_form"> <a4j:outputPanel ajaxRendered="true"> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/columnsSorting.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> <html> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example1.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example1.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example1.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example10.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example10.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example10.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example2.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example2.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example2.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example3.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example3.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example3.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example4.jsp =================================================================== --- trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example4.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-art-datatable/src/main/webapp/pages/example4.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> 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-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> 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-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> 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-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/support/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition> <table border="0" cellpadding="0" cellspacing="1"> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j"> <ui:composition> <style type="text/css"> body{ Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j"> <ui:composition> Footer will be here </ui:composition>> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition> <div class="page_brick"></div> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <ui:composition> <rich:panel styleClass="panel_documents"> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> <head> Modified: trunk/samples/seamIntegration/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/pages/index.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/seamIntegration/src/main/webapp/pages/index.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" <f:view> Modified: trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <!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:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> <head><title>Simple repeater in seam</title></head> Modified: trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/suggestionbox" prefix="rich" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <html> <head> Modified: trunk/samples/tabPanelDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/tabPanelDemo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tabPanelDemo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tabPanel" prefix="tabs" %> <html> <head> Modified: trunk/samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp =================================================================== --- trunk/samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tabPanel" prefix="tabs" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panel" prefix="panel" %> <html> Modified: trunk/samples/togglePanel-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/togglePanel-sample/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/togglePanel-sample/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/togglePanel" prefix="rich" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panel" prefix="panel" %> Modified: trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> <html> <head> Modified: trunk/samples/tomahawkCompability/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/index.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/index.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" <f:view> Modified: trunk/samples/tomahawkCompability/src/main/webapp/pages/response.jsp =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/response.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/response.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <html> <head> <title>Response page</title> Modified: trunk/samples/tomahawkCompability/src/main/webapp/pages/tabbedPanel.jsp =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/tabbedPanel.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/tabbedPanel.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> <html> <head> Modified: trunk/samples/tomahawkCompability/src/main/webapp/pages/tree2.jsp =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/tree2.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/tree2.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> <html> Modified: trunk/samples/tooltip-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/tooltip-sample/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tooltip-sample/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%--@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"--%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tooltip" prefix="rich"%> <html> Modified: trunk/samples/tree-demo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/drag-drop" prefix="dnd" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="rich"%> <html> Modified: trunk/samples/tree-demo/src/main/webapp/pages/index2.jsp =================================================================== --- trunk/samples/tree-demo/src/main/webapp/pages/index2.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/tree-demo/src/main/webapp/pages/index2.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,7 +1,7 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="rich" %> <html> <head> Modified: trunk/samples/useCases/src/main/webapp/pages/actionparam.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/actionparam.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/actionparam.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j"> <body> <a4j:outputPanel id="messages"> <h:messages /> Modified: trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> <f:view> <h:form> Modified: trunk/samples/useCases/src/main/webapp/pages/ajaxdata.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/ajaxdata.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/ajaxdata.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" <head> Modified: trunk/samples/useCases/src/main/webapp/pages/controls.jsp =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/controls.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/controls.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@page contentType="text/html"%> <%@page pageEncoding="UTF-8"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> Modified: trunk/samples/useCases/src/main/webapp/pages/controls.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/controls.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/controls.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> <f:view> <head> Modified: trunk/samples/useCases/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/index.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/index.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" <f:view> Modified: trunk/samples/useCases/src/main/webapp/pages/prependId.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/prependId.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/prependId.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <!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:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> <body> Modified: trunk/samples/useCases/src/main/webapp/pages/push.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/push.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/push.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" <body> Modified: trunk/samples/useCases/src/main/webapp/pages/repeat.jsp =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/repeat.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/repeat.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> <title>Repeater with input components</title> Modified: trunk/samples/useCases/src/main/webapp/pages/repeat.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/repeat.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/repeat.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,6 +1,6 @@ <!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:a4j="http://richfaces.org/ajax" + xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> <head> Modified: trunk/samples/useCases/src/main/webapp/pages/repeater.jsp =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/repeater.jsp 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/repeater.jsp 2007-07-28 01:22:09 UTC (rev 1907) @@ -1,4 +1,4 @@ -<%@ taglib uri="http://richfaces.org/ajax" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> Modified: trunk/samples/useCases/src/main/webapp/pages/setCookie.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/setCookie.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/setCookie.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j"> <f:view> <head> <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8"/> Modified: trunk/samples/useCases/src/main/webapp/pages/testCookie.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/testCookie.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/useCases/src/main/webapp/pages/testCookie.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -3,7 +3,7 @@ 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:a4j="http://richfaces.org/a4j"> <f:view> <head> <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8"/> Modified: trunk/samples/virtualEarth-sample/src/main/webapp/virtualEarth.xhtml =================================================================== --- trunk/samples/virtualEarth-sample/src/main/webapp/virtualEarth.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/samples/virtualEarth-sample/src/main/webapp/virtualEarth.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" xmlns:ve="http://labs.jboss.com/jbossrichfaces/ui/virtualEarth" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <f:view contentType="text/html" > Modified: trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml =================================================================== --- trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:r="http://labs.jboss.com/jbossrichfaces/ui/ui/message" - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <head> <link rel="stylesheet" type="text/css" href="/rich-message-demo/css/app.css" /> </head> Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-28 01:22:09 UTC (rev 1907) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid... - xmlns:a4j="http://richfaces.org/ajax"> + xmlns:a4j="http://richfaces.org/a4j"> <body> <f:view> <h:form> Modified: trunk/ui/assembly/pom.xml =================================================================== --- trunk/ui/assembly/pom.xml 2007-07-28 00:14:21 UTC (rev 1906) +++ trunk/ui/assembly/pom.xml 2007-07-28 01:22:09 UTC (rev 1907) @@ -19,15 +19,44 @@ <library> <prefix>org.richfaces</prefix> <description>RichFaces components</description> + <taglibs> <taglib> - <shortName>rich</shortName> + <shortName>richfaces</shortName> <taglib>richfaces</taglib> <uri> http://richfaces.ajax4jsf.org/rich </uri> <displayName>RichFaces</displayName> + <excludeModules>core</excludeModules> </taglib> - + <taglib> + <shortName>rich</shortName> + <taglib>rich</taglib> + <uri> + http://richfaces.org/rich + </uri> + <displayName>RichFaces</displayName> + <excludeModules>core</excludeModules> + </taglib> + <taglib> + <shortName>a4j</shortName> + <taglib>ajax4jsf</taglib> + <uri> + http://richfaces.org/a4j + </uri> + <displayName>Ajax4Jsf</displayName> + <includeModules>core</includeModules> + </taglib> + <taglib> + <shortName>ajax</shortName> + <taglib>a4j</taglib> + <uri> + https://ajax4jsf.dev.java.net/ajax + </uri> + <displayName>RichFaces</displayName> + <includeModules>core</includeModules> + </taglib> + </taglibs> </library> </configuration> <executions> @@ -131,26 +160,26 @@ </execution> </executions> </plugin> ---> <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> <!-- append to the packaging 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>