[richfaces-svn-commits] JBoss Rich Faces SVN: r6018 - in tags: 3.1.4.SR1 and 159 other directories.

Author: alexsmirnov Date: 2008-02-11 14:17:32 -0500 (Mon, 11 Feb 2008) New Revision: 6018 Added: tags/3.1.4.SR1/ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/CompressedScriptRenderer.java tags/3.1.4.SR1/ui/assembly/src/main/config/ tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/ tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml Removed: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/ tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml Modified: tags/3.1.4.SR1/cdk/generator/pom.xml tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/pom.xml tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml tags/3.1.4.SR1/cdk/maven-archetype-jsfwebapp/pom.xml tags/3.1.4.SR1/cdk/maven-cdk-plugin/pom.xml tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java tags/3.1.4.SR1/cdk/maven-javascript-plugin/pom.xml tags/3.1.4.SR1/cdk/pom.xml tags/3.1.4.SR1/docs/faq/en/pom.xml tags/3.1.4.SR1/docs/faq/pom.xml tags/3.1.4.SR1/docs/highlight/pom.xml tags/3.1.4.SR1/docs/pom.xml tags/3.1.4.SR1/docs/userguide/en/pom.xml tags/3.1.4.SR1/docs/userguide/pom.xml tags/3.1.4.SR1/docs/xslt/en/pom.xml tags/3.1.4.SR1/docs/xslt/pom.xml tags/3.1.4.SR1/extensions/gwt/pom.xml tags/3.1.4.SR1/extensions/pom.xml tags/3.1.4.SR1/extensions/portlet/pom.xml tags/3.1.4.SR1/extensions/portletbridge/pom.xml tags/3.1.4.SR1/extensions/portletbridge/portletbridge-api/pom.xml tags/3.1.4.SR1/extensions/portletbridge/portletbridge-impl/pom.xml tags/3.1.4.SR1/extensions/seam/pom.xml tags/3.1.4.SR1/extensions/trinidad/pom.xml tags/3.1.4.SR1/framework/api-parent/pom.xml tags/3.1.4.SR1/framework/api/pom.xml tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java tags/3.1.4.SR1/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java tags/3.1.4.SR1/framework/impl-parent/pom.xml tags/3.1.4.SR1/framework/impl/pom.xml tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/VersionBean.java tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java tags/3.1.4.SR1/framework/impl/src/main/resources/META-INF/resources-config.xml tags/3.1.4.SR1/framework/pom.xml tags/3.1.4.SR1/framework/test/pom.xml tags/3.1.4.SR1/pom.xml tags/3.1.4.SR1/samples/ajaxPortlet/pom.xml tags/3.1.4.SR1/samples/calendar-sample/pom.xml tags/3.1.4.SR1/samples/contextMenuDemo/pom.xml tags/3.1.4.SR1/samples/dataFilterSliderDemo/pom.xml tags/3.1.4.SR1/samples/dataTableDemo/pom.xml tags/3.1.4.SR1/samples/datascroller-sample/pom.xml tags/3.1.4.SR1/samples/dragDropDemo/pom.xml tags/3.1.4.SR1/samples/dropdownmenu-sample/pom.xml tags/3.1.4.SR1/samples/effect-sample/pom.xml tags/3.1.4.SR1/samples/gmap-sample/pom.xml tags/3.1.4.SR1/samples/inputNumberSliderDemo/pom.xml tags/3.1.4.SR1/samples/inputNumberSpinnerDemo/pom.xml tags/3.1.4.SR1/samples/jQuery-sample/pom.xml tags/3.1.4.SR1/samples/listShuttleDemo/pom.xml tags/3.1.4.SR1/samples/local-value-demo/pom.xml tags/3.1.4.SR1/samples/modalpanel-sample/pom.xml tags/3.1.4.SR1/samples/orderingListDemo/pom.xml tags/3.1.4.SR1/samples/panel-sample/pom.xml tags/3.1.4.SR1/samples/panelbar-sample/pom.xml tags/3.1.4.SR1/samples/panelmenu-sample/pom.xml tags/3.1.4.SR1/samples/pom.xml tags/3.1.4.SR1/samples/portal-echo/pom.xml tags/3.1.4.SR1/samples/rich-message-demo/pom.xml tags/3.1.4.SR1/samples/richfaces-art-datatable/pom.xml tags/3.1.4.SR1/samples/richfaces-demo/pom.xml tags/3.1.4.SR1/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml tags/3.1.4.SR1/samples/richfaces-ear-demo/ejb/pom.xml tags/3.1.4.SR1/samples/richfaces-ear-demo/pom.xml tags/3.1.4.SR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml tags/3.1.4.SR1/samples/richfaces-ear-demo/webapp/pom.xml tags/3.1.4.SR1/samples/seamEAR/ear/pom.xml tags/3.1.4.SR1/samples/seamEAR/ejbs/pom.xml tags/3.1.4.SR1/samples/seamEAR/pom.xml tags/3.1.4.SR1/samples/seamEAR/primary-source/pom.xml tags/3.1.4.SR1/samples/seamEAR/projects/logging/pom.xml tags/3.1.4.SR1/samples/seamEAR/projects/pom.xml tags/3.1.4.SR1/samples/seamEAR/wars/pom.xml tags/3.1.4.SR1/samples/seamEAR/wars/seamWebapp/pom.xml tags/3.1.4.SR1/samples/seamIntegration/pom.xml tags/3.1.4.SR1/samples/seamPortletEar/ear/pom.xml tags/3.1.4.SR1/samples/seamPortletEar/pom.xml tags/3.1.4.SR1/samples/seamPortletEar/seamBooking/pom.xml tags/3.1.4.SR1/samples/seamPortletEar/seamBookingPortlet/pom.xml tags/3.1.4.SR1/samples/separator-sample/pom.xml tags/3.1.4.SR1/samples/simpleTogglePanel-sample/pom.xml tags/3.1.4.SR1/samples/skins/pom.xml tags/3.1.4.SR1/samples/suggestionbox-sample/pom.xml tags/3.1.4.SR1/samples/tabPanelDemo/pom.xml tags/3.1.4.SR1/samples/togglePanel-sample/pom.xml tags/3.1.4.SR1/samples/tomahawkCompability/pom.xml tags/3.1.4.SR1/samples/toolBarDemo/pom.xml tags/3.1.4.SR1/samples/tooltip-sample/pom.xml tags/3.1.4.SR1/samples/tree-demo/pom.xml tags/3.1.4.SR1/samples/treeModelDemo/pom.xml tags/3.1.4.SR1/samples/useCases/pom.xml tags/3.1.4.SR1/samples/virtualEarth-sample/pom.xml tags/3.1.4.SR1/sandbox/api/pom.xml tags/3.1.4.SR1/sandbox/impl/pom.xml tags/3.1.4.SR1/sandbox/pom.xml tags/3.1.4.SR1/sandbox/samples/dialog-window-sample/pom.xml tags/3.1.4.SR1/sandbox/samples/panel2-sample/pom.xml tags/3.1.4.SR1/sandbox/samples/pom.xml tags/3.1.4.SR1/sandbox/samples/rich-message-demo/pom.xml tags/3.1.4.SR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml tags/3.1.4.SR1/sandbox/ui/dialog-window/pom.xml tags/3.1.4.SR1/sandbox/ui/panel2/pom.xml tags/3.1.4.SR1/sandbox/ui/pom.xml tags/3.1.4.SR1/sandbox/ui/simpleTogglePanel2/pom.xml tags/3.1.4.SR1/sandbox/ui/state/pom.xml tags/3.1.4.SR1/test-applications/facelets/pom.xml tags/3.1.4.SR1/test-applications/jsp/pom.xml tags/3.1.4.SR1/test-applications/pom.xml tags/3.1.4.SR1/ui/assembly/pom.xml tags/3.1.4.SR1/ui/calendar/pom.xml tags/3.1.4.SR1/ui/componentControl/pom.xml tags/3.1.4.SR1/ui/contextMenu/pom.xml tags/3.1.4.SR1/ui/core/pom.xml tags/3.1.4.SR1/ui/create.bat tags/3.1.4.SR1/ui/create.sh tags/3.1.4.SR1/ui/dataFilterSlider/pom.xml tags/3.1.4.SR1/ui/dataTable/pom.xml tags/3.1.4.SR1/ui/datascroller/pom.xml tags/3.1.4.SR1/ui/drag-drop/pom.xml tags/3.1.4.SR1/ui/dropdown-menu/pom.xml tags/3.1.4.SR1/ui/effect/pom.xml tags/3.1.4.SR1/ui/gmap/pom.xml tags/3.1.4.SR1/ui/inputnumber-slider/pom.xml tags/3.1.4.SR1/ui/inputnumber-spinner/pom.xml tags/3.1.4.SR1/ui/insert/pom.xml tags/3.1.4.SR1/ui/jQuery/pom.xml tags/3.1.4.SR1/ui/listShuttle/pom.xml tags/3.1.4.SR1/ui/menu-components/pom.xml tags/3.1.4.SR1/ui/message/pom.xml tags/3.1.4.SR1/ui/modal-panel/pom.xml tags/3.1.4.SR1/ui/orderingList/pom.xml tags/3.1.4.SR1/ui/paint2D/pom.xml tags/3.1.4.SR1/ui/panel/pom.xml tags/3.1.4.SR1/ui/panelbar/pom.xml tags/3.1.4.SR1/ui/panelmenu/pom.xml tags/3.1.4.SR1/ui/pom.xml tags/3.1.4.SR1/ui/scrollableDataTable/pom.xml tags/3.1.4.SR1/ui/separator/pom.xml tags/3.1.4.SR1/ui/simpleTogglePanel/pom.xml tags/3.1.4.SR1/ui/spacer/pom.xml tags/3.1.4.SR1/ui/suggestionbox/pom.xml tags/3.1.4.SR1/ui/tabPanel/pom.xml tags/3.1.4.SR1/ui/togglePanel/pom.xml tags/3.1.4.SR1/ui/toolBar/pom.xml tags/3.1.4.SR1/ui/tooltip/pom.xml tags/3.1.4.SR1/ui/tree/pom.xml tags/3.1.4.SR1/ui/treeModel/pom.xml tags/3.1.4.SR1/ui/virtualEarth/pom.xml Log: mark 3.1.4 service release Copied: tags/3.1.4.SR1 (from rev 6013, tags/3.1.4.GA) Modified: tags/3.1.4.SR1/cdk/generator/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/generator/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/generator/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Java Server Faces component generator</name> <build> <plugins> Modified: tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/maven-archetype-jsf-component/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <configuration> <library> <prefix>${groupId}</prefix> Modified: tags/3.1.4.SR1/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/maven-archetype-jsfwebapp/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-archetype-jsfwebapp/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/cdk/maven-cdk-plugin/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/maven-cdk-plugin/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-cdk-plugin/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java =================================================================== --- tags/3.1.4.GA/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -40,6 +40,7 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; +import org.codehaus.plexus.velocity.DefaultVelocityComponent; import org.codehaus.plexus.velocity.VelocityComponent; /** @@ -156,9 +157,11 @@ library.setPrefix(project.getGroupId()); } + getLog().debug("Default prefix for a generated packages: "+library.getPrefix()); if (null == library.getDescription()) { library.setDescription(project.getDescription()); } + getLog().debug("Library description: "+library.getDescription()); if( null == library.getJsfVersion()){ String version = Library.JSF11; // Check version-specific methods in UIComponent class @@ -176,6 +179,10 @@ } library.setJsfVersion(version); } + + //velocity = new DefaultVelocityComponent(); + + getLog().debug("Generate files for a JSF "+library.getJsfVersion()); Renderkit[] renderkits = library.getRenderkits(); if (null != renderkits) { for (int i = 0; i < renderkits.length; i++) { @@ -233,6 +240,8 @@ if(null == taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + getLog().debug("Taglib uri is " + taglib.getUri()); + getLog().debug("Taglib shortname is " + taglib.getShortName()); if (null != library.getTaglibs() && library.getTaglibs().length > 0) { for (int i = 0; i < library.getTaglibs().length; i++) { Taglib t = library.getTaglibs()[i]; @@ -259,16 +268,16 @@ ClassLoader classLoader = Thread.currentThread() .getContextClassLoader(); try { - List compileClasspathElements = project + List<?> compileClasspathElements = project .getCompileClasspathElements(); String outputDirectory = project.getBuild().getOutputDirectory(); URL[] urls = new URL[compileClasspathElements.size() + 1]; int i = 0; - urls[i++] = new File(outputDirectory).toURL(); - for (Iterator iter = compileClasspathElements.iterator(); iter + urls[i++] = new File(outputDirectory).toURI().toURL(); + for (Iterator<?> iter = compileClasspathElements.iterator(); iter .hasNext();) { String element = (String) iter.next(); - urls[i++] = new File(element).toURL(); + urls[i++] = new File(element).toURI().toURL(); } if (useCCL) { @@ -306,7 +315,9 @@ if(null == taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + getLog().debug("Taglib uri is " + taglib.getUri()); + getLog().debug("Taglib shortname is " + taglib.getShortName()); } -} \ No newline at end of file +} Modified: tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java =================================================================== --- tags/3.1.4.GA/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -149,6 +149,13 @@ private MavenProject parentProject; /** + * The list of resources we want to transfer. + * + * @parameter default-value="src/main/config" + */ + private File config; + + /** * The directory for compiled classes. * * @parameter expression="${project.build.directory}" @@ -504,47 +511,25 @@ * @throws MojoExecutionException */ private void mergeFacesConfig(List models) throws MojoExecutionException { - StringBuffer config = new StringBuffer(); + StringBuffer facesConfig = new StringBuffer(); for (int i = 0; i < library.getRenderkits().length; i++) { Renderkit kit = library.getRenderkits()[i]; kit.setContent(new StringBuffer()); } + // Process all faces-config.xml from modules for (Iterator iter = models.iterator(); iter.hasNext();) { Model model = (Model) iter.next(); File moduleFacesConfig = new File(modulesDirectory, 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); - } - } + processFacesConfigFile(facesConfig, moduleFacesConfig); } + // Process faces-config from project resources + if (null !=config) { + processFacesConfigFile(facesConfig, new File(config, "META-INF/faces-config.xml")); + } VelocityContext context = new VelocityContext(); - context.put("content", config.toString()); + context.put("content", facesConfig.toString()); context.put("library", library); context.put("renderkits", Arrays.asList(library.getRenderkits())); try { @@ -557,6 +542,42 @@ } /** + * @param config + * @param moduleFacesConfig + * @throws MojoExecutionException + */ + private void processFacesConfigFile(StringBuffer config, + File moduleFacesConfig) throws MojoExecutionException { + if (moduleFacesConfig.exists()) { + getLog().info( + "Process "+moduleFacesConfig.getName()); + 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); + } + } + } + + /** * Merge XML files from extracted models to one in build directory. * * @param models @@ -586,42 +607,13 @@ for (Iterator iter = models.iterator(); iter.hasNext();) { Model model = (Model) iter.next(); File moduleDir = new File(modulesDirectory, 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),namespaceAware); - 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); - } - } + mergeXMLdir(moduleDir, commonXpath, keyXPath, namespaceAware, + keySet, content, xmls, split); } + if(null!=config){ + mergeXMLdir(config, commonXpath, keyXPath, namespaceAware, + keySet, content, xmls, split); + } if (xmls.size() > 0) { context.put("content", content.toString()); context.put("library", library); @@ -637,6 +629,58 @@ } } + /** + * @param moduleDir + * @param commonXpath + * @param keyXPath + * @param namespaceAware + * @param keySet + * @param content + * @param xmls + * @param split + * @throws IllegalStateException + * @throws MojoExecutionException + */ + private void mergeXMLdir(File moduleDir, String commonXpath, + String keyXPath, boolean namespaceAware, Set<String> keySet, + StringBuffer content, List<XMLBody> xmls, String[] split) + throws IllegalStateException, MojoExecutionException { + 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] ); + XMLBody configBody = new XMLBody(); + try { + configBody.loadXML(new FileInputStream(moduleFacesConfig),namespaceAware); + 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); + } + } + } + private void unpackArtifact(Artifact artifact, File moduleDir, boolean isResource) throws MojoExecutionException { try { Modified: tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java =================================================================== --- tags/3.1.4.GA/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Library.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -144,4 +144,8 @@ this.taglibs = taglibs; } + @Override + public String toString() { + return "JSF library "+getPrefix()+", desc: "+getDescription()+(null!=getTaglibs()?", libs: "+getTaglibs():""); + } } Modified: tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java =================================================================== --- tags/3.1.4.GA/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -220,4 +220,8 @@ _excludeTags = excludeTags; } + @Override + public String toString() { + return "Lib: "+getShortName()+", URL: "+getUri(); + } } Modified: tags/3.1.4.SR1/cdk/maven-javascript-plugin/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/maven-javascript-plugin/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/maven-javascript-plugin/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,7 +4,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: tags/3.1.4.SR1/cdk/pom.xml =================================================================== --- tags/3.1.4.GA/cdk/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/cdk/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: tags/3.1.4.SR1/docs/faq/en/pom.xml =================================================================== --- tags/3.1.4.GA/docs/faq/en/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/faq/en/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.faq</groupId> <artifactId>${translation}</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>jdocbook</packaging> <name>Richfaces Manual (${translation})</name> Modified: tags/3.1.4.SR1/docs/faq/pom.xml =================================================================== --- tags/3.1.4.GA/docs/faq/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/faq/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> <packaging>pom</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>FAQ</name> <description>Frequently asked questions</description> <pluginRepositories> Modified: tags/3.1.4.SR1/docs/highlight/pom.xml =================================================================== --- tags/3.1.4.GA/docs/highlight/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/highlight/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>highlight</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>RichFaces Code Highlighting</name> <dependencyManagement> Modified: tags/3.1.4.SR1/docs/pom.xml =================================================================== --- tags/3.1.4.GA/docs/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,12 +3,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>docs</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Project documentation</name> <packaging>pom</packaging> <!-- setup repositories, to build documentation separate from Java projects --> Modified: tags/3.1.4.SR1/docs/userguide/en/pom.xml =================================================================== --- tags/3.1.4.GA/docs/userguide/en/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/userguide/en/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>jdocbook</packaging> <name>Richfaces Manual (${translation})</name> Modified: tags/3.1.4.SR1/docs/userguide/pom.xml =================================================================== --- tags/3.1.4.GA/docs/userguide/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/userguide/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> Modified: tags/3.1.4.SR1/docs/xslt/en/pom.xml =================================================================== --- tags/3.1.4.GA/docs/xslt/en/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/xslt/en/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>xslt</artifactId> <groupId>org.richfaces.docs</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.xslt</groupId> <artifactId>en</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>jar</packaging> <name>Documentation stylesheets (English translation)</name> <description> Modified: tags/3.1.4.SR1/docs/xslt/pom.xml =================================================================== --- tags/3.1.4.GA/docs/xslt/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/docs/xslt/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>xslt</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>pom</packaging> <name>Documentation stylesheets</name> <description>Docbook documentation stylesheets</description> Modified: tags/3.1.4.SR1/extensions/gwt/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/gwt/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/gwt/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,7 +3,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: tags/3.1.4.SR1/extensions/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>extensions</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Richfaces extensions for a different environments</name> <packaging>pom</packaging> <modules> Modified: tags/3.1.4.SR1/extensions/portlet/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/portlet/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/portlet/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.extensions</groupId> <artifactId>portlet</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>ajax4jsf portlet brige</name> <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> <dependencies> @@ -56,12 +56,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>test</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/extensions/portletbridge/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/portletbridge/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/portletbridge/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.extensions</groupId> <artifactId>portletbridge</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Richfaces bridge for a portlet environment</name> <packaging>pom</packaging> <repositories> @@ -79,7 +79,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>test</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/extensions/portletbridge/portletbridge-api/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/portletbridge/portletbridge-api/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/portletbridge/portletbridge-api/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>portletbridge</artifactId> <groupId>org.richfaces.extensions</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>JSR-301 jsf-portlet brige api</name> <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> <build> Modified: tags/3.1.4.SR1/extensions/portletbridge/portletbridge-impl/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/portletbridge/portletbridge-impl/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/portletbridge/portletbridge-impl/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>portletbridge</artifactId> <groupId>org.richfaces.extensions</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>ajax4jsf portlet brige implementation</name> <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> <dependencies> @@ -20,18 +20,18 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <optional>true</optional> </dependency> <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <classifier>tests</classifier> <scope>test</scope> </dependency> Modified: tags/3.1.4.SR1/extensions/seam/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/seam/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/seam/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: tags/3.1.4.SR1/extensions/trinidad/pom.xml =================================================================== --- tags/3.1.4.GA/extensions/trinidad/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/extensions/trinidad/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: tags/3.1.4.SR1/framework/api/pom.xml =================================================================== --- tags/3.1.4.GA/framework/api/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <build> <plugins> <plugin> Modified: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- tags/3.1.4.GA/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -14,6 +14,7 @@ import javax.faces.el.VariableResolver; import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.util.URLToStreamHelper; public abstract class AjaxContext { @@ -126,8 +127,8 @@ String factoryClassName = DEFAULT_CONTEXT_CLASS; // Pluggable factories. InputStream input = null; // loader.getResourceAsStream(SERVICE_RESOURCE); - input = contextClassLoader - .getResourceAsStream(SERVICE_RESOURCE); + input = URLToStreamHelper.urlToStreamSafe(contextClassLoader + .getResource(SERVICE_RESOURCE)); // have services file. if (input != null) { try { @@ -189,4 +190,4 @@ public abstract String getSubmittedRegionClientId(FacesContext context); public abstract void saveViewState(FacesContext context) throws IOException; -} \ No newline at end of file +} Modified: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java =================================================================== --- tags/3.1.4.GA/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -32,6 +32,7 @@ import javax.faces.context.FacesContext; import javax.servlet.ServletException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -137,7 +138,8 @@ try { String resource = "META-INF/services/" + InternetResourceBuilder.class.getName(); - InputStream in = loader.getResourceAsStream(resource); + InputStream in = URLToStreamHelper.urlToStreamSafe( + loader.getResource(resource)); BufferedReader reader = new BufferedReader( new InputStreamReader(in)); String serviceClassName = reader.readLine(); Copied: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util (from rev 6013, branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util) Deleted: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java =================================================================== --- branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -1,82 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * 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.resource.util; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method. - * Contains one utility method that gets {@link InputStream} from {@link URL} with caching disabled. - * - * Created 07.02.2008 - * @author Nick Belaevski - * @since 3.2 - */ - -public final class URLToStreamHelper { - - private static final Log log = LogFactory.getLog(URLToStreamHelper.class); - - private URLToStreamHelper() { - super(); - } - - /** - * Returns {@link InputStream} corresponding to argument {@link URL} - * but with caching disabled - * - * @param url {@link URL} of the resource - * @return {@link InputStream} instance or <code>null</code> - * @throws IOException - */ - public static final InputStream urlToStream(URL url) throws IOException { - if (url != null) { - URLConnection connection = url.openConnection(); - try { - connection.setUseCaches(false); - } catch (IllegalArgumentException e) { - log.error(e.getLocalizedMessage(), e); - } - - return connection.getInputStream(); - } else { - return null; - } - } - - public static final InputStream urlToStreamSafe(URL url) { - try { - return urlToStream(url); - } catch (IOException e) { - // do nothing - } - - return null; - } - -} Copied: tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java (from rev 6013, branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java) =================================================================== --- tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java (rev 0) +++ tags/3.1.4.SR1/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -0,0 +1,82 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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.resource.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method. + * Contains one utility method that gets {@link InputStream} from {@link URL} with caching disabled. + * + * Created 07.02.2008 + * @author Nick Belaevski + * @since 3.2 + */ + +public final class URLToStreamHelper { + + private static final Log log = LogFactory.getLog(URLToStreamHelper.class); + + private URLToStreamHelper() { + super(); + } + + /** + * Returns {@link InputStream} corresponding to argument {@link URL} + * but with caching disabled + * + * @param url {@link URL} of the resource + * @return {@link InputStream} instance or <code>null</code> + * @throws IOException + */ + public static final InputStream urlToStream(URL url) throws IOException { + if (url != null) { + URLConnection connection = url.openConnection(); + try { + connection.setUseCaches(false); + } catch (IllegalArgumentException e) { + log.error(e.getLocalizedMessage(), e); + } + + return connection.getInputStream(); + } else { + return null; + } + } + + public static final InputStream urlToStreamSafe(URL url) { + try { + return urlToStream(url); + } catch (IOException e) { + // do nothing + } + + return null; + } + +} Modified: tags/3.1.4.SR1/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- tags/3.1.4.GA/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -33,6 +33,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,7 +75,8 @@ if (instance == null) { // Pluggable factories. InputStream input = null; // loader.getResourceAsStream(SERVICE_RESOURCE); - input = loader.getResourceAsStream(SERVICE_RESOURCE); + input = URLToStreamHelper.urlToStreamSafe( + loader.getResource(SERVICE_RESOURCE)); // have services file. if (input != null) { try { Modified: tags/3.1.4.SR1/framework/api-parent/pom.xml =================================================================== --- tags/3.1.4.GA/framework/api-parent/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/api-parent/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,13 +4,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <packaging>pom</packaging> <artifactId>api-parent</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Java Server Faces AJAX framework API Dependencies</name> <properties> <jsfVersion>1.1</jsfVersion> Modified: tags/3.1.4.SR1/framework/impl/pom.xml =================================================================== --- tags/3.1.4.GA/framework/impl/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,19 +3,19 @@ <parent> <artifactId>impl-parent</artifactId> <groupId>org.richfaces.framework</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <relativePath>../impl-parent/pom.xml</relativePath> </parent> --> <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Java Server Faces AJAX framework implementation</name> <build> <resources> @@ -261,7 +261,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <profiles> Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Properties; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -109,7 +110,8 @@ // try to find services in CLASSPATH try { ClassLoader cl = findClassLoader(); - InputStream is = cl.getResourceAsStream("META-INF/services/" + factoryId); + InputStream is = URLToStreamHelper.urlToStreamSafe( + cl.getResource("META-INF/services/" + factoryId)); if (is != null) { BufferedReader r = new BufferedReader(new InputStreamReader(is, "UTF-8")); try { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -36,6 +36,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.renderkit.RendererBase; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.RulesBase; @@ -272,7 +273,7 @@ public static PreparedTemplate compileResource(String resource) { HtmlCompiler compiler = new HtmlCompiler(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); - InputStream input = loader.getResourceAsStream(resource); + InputStream input = URLToStreamHelper.urlToStreamSafe(loader.getResource(resource)); // Since parsing exceptions handled by compiler, we can not check parameter. PreparedTemplate compile = compiler.compile(input, resource); if(null != input){ Copied: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/CompressedScriptRenderer.java (from rev 6013, branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/CompressedScriptRenderer.java) =================================================================== --- tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/CompressedScriptRenderer.java (rev 0) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/CompressedScriptRenderer.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -0,0 +1,33 @@ +/** + * + */ +package org.ajax4jsf.resource; + +/** + * @author asmirnov + * + */ +public class CompressedScriptRenderer extends OneTimeRenderer { + + protected String getTag() { + // TODO Auto-generated method stub + return "script"; + } + + protected String getHrefAttr() { + // TODO Auto-generated method stub + return "src"; + } + + protected String[][] getCommonAttrs() { + // TODO Auto-generated method stub + return new String[][]{{"type",getContentType()}}; + } + + public String getContentType() { + // TODO - use configurable encoding ? + return "text/javascript"; + } + + +} Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -47,10 +47,7 @@ import org.ajax4jsf.cache.CacheLoader; import org.ajax4jsf.cache.CacheManager; import org.ajax4jsf.cache.ServletContextInitMap; -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.ResourceContext; -import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.BaseFilter; import org.ajax4jsf.webapp.CacheContent; import org.ajax4jsf.webapp.WebXml; @@ -265,7 +262,7 @@ */ protected Properties getProperties(String name) { Properties properties = new Properties(); - InputStream props = BaseFilter.class.getResourceAsStream(name); + InputStream props = URLToStreamHelper.urlToStreamSafe(BaseFilter.class.getResource(name)); if (null != props) { try { properties.load(props); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -21,13 +21,9 @@ package org.ajax4jsf.resource; -import java.io.IOException; import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.Date; -import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.util.URLToStreamHelper; /** @@ -61,7 +57,7 @@ */ public InputStream getResourceAsStream(ResourceContext context) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); - return loader.getResourceAsStream(path); + return URLToStreamHelper.urlToStreamSafe(loader.getResource(path)); } public String getPath() { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -47,10 +47,7 @@ import javax.servlet.ServletContext; import org.ajax4jsf.Messages; -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.ResourceNotFoundException; -import org.ajax4jsf.resource.ResourceRenderer; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.util.base64.Codec; import org.ajax4jsf.webapp.WebXml; import org.apache.commons.digester.Digester; @@ -154,7 +151,7 @@ + resourceConfig.toExternalForm()); } - InputStream in = resourceConfig.openStream(); + InputStream in = URLToStreamHelper.urlToStream(resourceConfig); try { Digester digester = new Digester(); digester.setValidating(false); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -37,45 +37,13 @@ * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:04 $ * */ -public class ScriptRenderer extends OneTimeRenderer { +public class ScriptRenderer extends CompressedScriptRenderer { private static final String COMPRESS_SCRIPTS_PARAMETER = "org.ajax4jsf.COMPRESS_SCRIPT"; private static final Log _log = LogFactory.getLog(ScriptRenderer.class); /* (non-Javadoc) - * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() - */ - protected String getTag() { - // TODO Auto-generated method stub - return "script"; - } - - /* (non-Javadoc) - * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() - */ - protected String getHrefAttr() { - // TODO Auto-generated method stub - return "src"; - } - - /* (non-Javadoc) - * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() - */ - protected String[][] getCommonAttrs() { - // TODO Auto-generated method stub - return new String[][]{{"type",getContentType()}}; - } - - /* (non-Javadoc) - * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() - */ - public String getContentType() { - // TODO - use configurable encoding ? - return "text/javascript"; - } - - /* (non-Javadoc) * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) */ public int send(InternetResource base, ResourceContext context) throws IOException { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -32,6 +32,7 @@ import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -174,8 +175,8 @@ */ protected Properties getProperties(String name) { Properties properties = new Properties(); - InputStream props = CachedResourceBuilder.class - .getResourceAsStream(name); + InputStream props = URLToStreamHelper.urlToStreamSafe(CachedResourceBuilder.class + .getResource(name)); if (null != props) { try { properties.load(props); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -30,6 +30,7 @@ import javax.faces.FacesException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -108,7 +109,7 @@ Class serviceClass; try { String resource = "META-INF/services/" + name; - InputStream in = loader.getResourceAsStream(resource); + InputStream in = URLToStreamHelper.urlToStreamSafe(loader.getResource(resource)); BufferedReader reader = new BufferedReader( new InputStreamReader(in)); String serviceClassName = reader.readLine(); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -15,6 +15,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.nekko.NekkoParser; import org.ajax4jsf.webapp.tidy.TidyParser; import org.apache.commons.collections.ArrayStack; @@ -197,8 +198,8 @@ InputStream defaultprops = null; InputStream props = null; try { - defaultprops = TidyParser.class - .getResourceAsStream("tidy.properties"); + defaultprops = URLToStreamHelper.urlToStreamSafe(TidyParser.class + .getResource("tidy.properties")); if (null != defaultprops) { _tidyProperties.load(defaultprops); if (log.isDebugEnabled()) { @@ -209,8 +210,8 @@ } // Second part - user-defined properties. - props = Thread.currentThread().getContextClassLoader() - .getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe(Thread.currentThread().getContextClassLoader() + .getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); if (log.isDebugEnabled()) { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -27,6 +27,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.BaseXMLFilter; import org.ajax4jsf.webapp.HtmlParser; import org.apache.commons.collections.ArrayStack; @@ -94,12 +95,14 @@ _tidyProperties = new Properties(); InputStream props = null; try { - props = TidyXMLFilter.class.getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe( + TidyXMLFilter.class.getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); } // Second part - user-defined properties. - props = Thread.currentThread().getContextClassLoader().getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe( + Thread.currentThread().getContextClassLoader().getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); } Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -53,6 +53,7 @@ import javax.xml.transform.TransformerException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.xml.serializer.utils.MsgKey; import org.ajax4jsf.xml.serializer.utils.SystemIDResolver; import org.ajax4jsf.xml.serializer.utils.Utils; @@ -219,13 +220,15 @@ // requires a valid URI as parameter try { if (internal) { - is = CharInfo.class.getResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe( + CharInfo.class.getResource(entitiesResource)); } else { ClassLoader cl = ObjectFactory.findClassLoader(); if (cl == null) { - is = ClassLoader.getSystemResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe( + ClassLoader.getSystemResource(entitiesResource)); } else { - is = cl.getResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe(cl.getResource(entitiesResource)); } if (is == null) { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -49,6 +49,7 @@ import javax.xml.transform.OutputKeys; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.xml.serializer.utils.MsgKey; import org.ajax4jsf.xml.serializer.utils.Utils; import org.ajax4jsf.xml.serializer.utils.WrappedRuntimeException; @@ -401,16 +402,16 @@ .doPrivileged(new PrivilegedAction() { public Object run() { - return OutputPropertiesFactory.class - .getResourceAsStream(resourceName); + return URLToStreamHelper.urlToStreamSafe(OutputPropertiesFactory.class + .getResource(resourceName)); } }); } else { // User may be using older JDK ( JDK < 1.2 ) - is = OutputPropertiesFactory.class - .getResourceAsStream(resourceName); + is = URLToStreamHelper.urlToStreamSafe(OutputPropertiesFactory.class + .getResource(resourceName)); } bis = new BufferedInputStream(is); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -45,6 +45,8 @@ import java.io.FileNotFoundException; import java.io.InputStream; +import org.ajax4jsf.resource.util.URLToStreamHelper; + /** * This class is duplicated for each Xalan-Java subpackage so keep it in sync. * It is package private and therefore is not exposed as part of the Xalan-Java @@ -125,9 +127,9 @@ InputStream getResourceAsStream(ClassLoader cl, String name) { InputStream ris; if (cl == null) { - ris = ClassLoader.getSystemResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(ClassLoader.getSystemResource(name)); } else { - ris = cl.getResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(cl.getResource(name)); } return ris; } Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -49,6 +49,8 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import org.ajax4jsf.resource.util.URLToStreamHelper; + /** * This class is duplicated for each Xalan-Java subpackage so keep it in sync. * It is package private and therefore is not exposed as part of the Xalan-Java @@ -132,9 +134,9 @@ public Object run() { InputStream ris; if (cl == null) { - ris = ClassLoader.getSystemResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(ClassLoader.getSystemResource(name)); } else { - ris = cl.getResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(cl.getResource(name)); } return ris; } Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/richfaces/VersionBean.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -37,7 +37,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = "4.GA" ; + public static final String REVISION = "4.SR1" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version(); Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -24,6 +24,7 @@ import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.tidy.TidyParser; import org.ajax4jsf.webapp.tidy.TidyXMLFilter; import org.richfaces.component.TemplateComponent; @@ -59,7 +60,8 @@ Properties tidyProperties = new Properties(); InputStream propertiesStream = null; try { - propertiesStream = TidyXMLFilter.class.getResourceAsStream("tidy.properties"); + propertiesStream = URLToStreamHelper.urlToStreamSafe( + TidyXMLFilter.class.getResource("tidy.properties")); tidyProperties.load(propertiesStream); } finally { if (propertiesStream != null) { Modified: tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2008-02-11 19:17:32 UTC (rev 6018) @@ -39,12 +39,10 @@ import javax.faces.el.ValueBinding; import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.util.ELUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; -import org.richfaces.skin.SkinNotFoundException; /** * Implementation of {@link SkinFactory} with building skins from properties @@ -159,7 +157,7 @@ URL url = (URL) properties.nextElement(); InputStream propertyStream = null; try { - propertyStream = url.openStream(); + propertyStream = URLToStreamHelper.urlToStream(url); defaultProperties.load(propertyStream); } catch (IOException e) { // DO Nothing... @@ -294,7 +292,7 @@ URL url = (URL) properties.nextElement(); InputStream propertyStream = null; try { - propertyStream = url.openStream(); + propertyStream = URLToStreamHelper.urlToStream(url); skinProperties.load(propertyStream); loadedPropertiesCount++; } catch (IOException e) { Modified: tags/3.1.4.SR1/framework/impl/src/main/resources/META-INF/resources-config.xml =================================================================== --- tags/3.1.4.GA/framework/impl/src/main/resources/META-INF/resources-config.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl/src/main/resources/META-INF/resources-config.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -18,10 +18,15 @@ <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> <resource > - <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> - <path>/org/ajax4jsf/javascript/scripts/form.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> + <name>/org/ajax4jsf/framework.pack.js</name> + <path>org/ajax4jsf/framework.pack.js</path> + <renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/> </resource> + <resource > + <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> + <path>/org/ajax4jsf/javascript/scripts/form.js</path> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> + </resource> <resource class="org.richfaces.renderkit.html.GradientA"> <name>org.richfaces.renderkit.html.GradientA</name> </resource> Modified: tags/3.1.4.SR1/framework/impl-parent/pom.xml =================================================================== --- tags/3.1.4.GA/framework/impl-parent/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/impl-parent/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,12 +5,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>impl-parent</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>pom</packaging> <name> Java Server Faces AJAX framework implementation parent file @@ -203,7 +203,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <properties> Modified: tags/3.1.4.SR1/framework/pom.xml =================================================================== --- tags/3.1.4.GA/framework/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <dependencies /> Modified: tags/3.1.4.SR1/framework/test/pom.xml =================================================================== --- tags/3.1.4.GA/framework/test/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/framework/test/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> <dependencies> @@ -42,7 +42,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>htmlunit</groupId> Modified: tags/3.1.4.SR1/pom.xml =================================================================== --- tags/3.1.4.GA/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,7 +4,7 @@ <artifactId>root</artifactId> <packaging>pom</packaging> <name>Jboss RichFaces project</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> @@ -157,9 +157,9 @@ </license> </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/3.1.4... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags... - <url>https://svn.jboss.org/repos/richfaces/tags/3.1.4.GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/3.1.4... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags... + <url>https://svn.jboss.org/repos/richfaces/tags/3.1.4.SR1</url> </scm> <profiles> <profile> Modified: tags/3.1.4.SR1/samples/ajaxPortlet/pom.xml =================================================================== --- tags/3.1.4.GA/samples/ajaxPortlet/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/ajaxPortlet/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>portalAjaxSample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <description>Ajax JSF sample portlet</description> <build> @@ -24,7 +24,7 @@ <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -54,7 +54,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <!-- <dependency> Modified: tags/3.1.4.SR1/samples/calendar-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/calendar-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/calendar-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,29 +3,29 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>calendar-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>calendar-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>calendar</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/contextMenuDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/contextMenuDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/contextMenuDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,44 +2,44 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>contextMenuDemo</artifactId> <packaging>war</packaging> <name>contextMenuDemo Maven Webapp</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/dataFilterSliderDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/dataFilterSliderDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/dataFilterSliderDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,29 +2,29 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>dataFilterSliderDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>dataFilterSliderDemo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataFilterSlider</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/dataTableDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/dataTableDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/dataTableDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dataTableDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <url>http://maven.apache.org</url> @@ -18,12 +18,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/datascroller-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/datascroller-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/datascroller-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>datascroller-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>datascroller</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/dragDropDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/dragDropDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/dragDropDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dragDropDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>Drag/Drop demo app</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/dropdownmenu-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/dropdownmenu-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/dropdownmenu-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dropdownmenu-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,17 +17,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dropdown-menu</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/effect-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/effect-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/effect-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>effect-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>effect Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>effect</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/gmap-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/gmap-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/gmap-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>gmap-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>gmap-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>gmap</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/inputNumberSliderDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/inputNumberSliderDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/inputNumberSliderDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>inputNumberSliderDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-slider</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/inputNumberSpinnerDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/inputNumberSpinnerDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>inputNumberSpinnerDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/jQuery-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/jQuery-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/jQuery-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>jQuery-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>jQuery-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/listShuttleDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/listShuttleDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/listShuttleDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.1.4.SR1/samples/local-value-demo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/local-value-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/local-value-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,24 +2,24 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>local-value-demo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>richfaces-local-value-demo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>provided</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/modalpanel-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/modalpanel-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/modalpanel-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>modalpanel-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>modalpanel-sample Maven Webapp</name> <dependencies> Modified: tags/3.1.4.SR1/samples/orderingListDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/orderingListDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/orderingListDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/panel-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/panel-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/panel-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,24 +2,24 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panel-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>panel-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/panelbar-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/panelbar-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/panelbar-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panelbar-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panelbar</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/panelmenu-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/panelmenu-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/panelmenu-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,24 +3,24 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panelmenu-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>panelmenu-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panelmenu</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/pom.xml =================================================================== --- tags/3.1.4.GA/samples/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,14 +2,14 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> <packaging>pom</packaging> <name>RichFaces Components Examples</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <url>http://labs.jboss.com/jbossrichfaces/samples</url> <properties> <!-- --> @@ -66,12 +66,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> @@ -360,7 +360,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/samples/portal-echo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/portal-echo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/portal-echo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,13 +5,13 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>portal-echo</artifactId> <packaging>war</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <description>Ajax JSF sample portlet</description> <build> <defaultGoal>package</defaultGoal> Modified: tags/3.1.4.SR1/samples/rich-message-demo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/rich-message-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/rich-message-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,29 +3,29 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>rich-message-demo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>rich-message-demo</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/richfaces-art-datatable/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-art-datatable/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-art-datatable/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,19 +3,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-art-datatable</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>richfaces-art-datatableDemo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/richfaces-demo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-demo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>richfaces-demo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -24,7 +24,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>provided</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -47,13 +47,13 @@ <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> <param-value>NEKO</param-value> </context-param> - <!--context-param> + <context-param> <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>DEFAULT</param-value> - </context-param--> + <param-value>ALL</param-value> + </context-param> <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>DEFAULT</param-value> + <param-value>ALL</param-value> </context-param> <filter> Modified: tags/3.1.4.SR1/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-ear-demo/ejb/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-ear-demo/ejb/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,14 +4,14 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> <packaging>ejb</packaging> <name>ejb</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <url>http://maven.apache.org</url> <dependencies> <dependency> @@ -23,7 +23,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/samples/richfaces-ear-demo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-ear-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-ear-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,14 +4,14 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-ear-demo</artifactId> <name>JSF 1.2/Jee5 enterprise application demo</name> <packaging>pom</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <build> <pluginManagement> <plugins> Modified: tags/3.1.4.SR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,32 +4,32 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>richfacesEAR</artifactId> <name>richfacesEAR</name> <packaging>ear</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <url>http://maven.apache.org</url> <dependencies> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>ejb</type> </dependency> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>ejb-client</type> </dependency> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>webapp</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>war</type> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- tags/3.1.4.GA/samples/richfaces-ear-demo/webapp/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/richfaces-ear-demo/webapp/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,14 +4,14 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>webapp</artifactId> <packaging>war</packaging> <name>webapp Maven Webapp</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <url>http://maven.apache.org</url> <build> <finalName>webapp</finalName> @@ -48,17 +48,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <optional>true</optional> </dependency> <dependency> @@ -71,7 +71,7 @@ <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>ejb-client</type> <scope>provided</scope> <optional>true</optional> Modified: tags/3.1.4.SR1/samples/seamEAR/ear/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/ear/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/ear/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -6,18 +6,18 @@ <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ear</artifactId> <packaging>ear</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>ear assembly</name> <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/samples/seamEAR/ejbs/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/ejbs/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/ejbs/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -6,12 +6,12 @@ <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ejbs</artifactId> <packaging>ejb</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>enterprise java beans</name> <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <dependencies> <dependency> @@ -32,7 +32,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/samples/seamEAR/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -6,12 +6,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> --> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <artifactId>seamEAR</artifactId> <packaging>pom</packaging> <name>seam EAR project</name> @@ -58,23 +58,23 @@ org.richfaces.samples.seamEAR.projects </groupId> <artifactId>logging</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>primary-source</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR.wars</groupId> <artifactId>seamWebapp</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>war</type> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ejbs</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>ejb</type> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/seamEAR/primary-source/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/primary-source/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/primary-source/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <dependencies> <dependency> Modified: tags/3.1.4.SR1/samples/seamEAR/projects/logging/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/projects/logging/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/projects/logging/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -7,6 +7,6 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>projects</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> </project> Modified: tags/3.1.4.SR1/samples/seamEAR/projects/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/projects/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/projects/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -1,14 +1,14 @@ <project> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.seamEAR</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <artifactId>projects</artifactId> <packaging>pom</packaging> <name>sub projects</name> <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modules> <module>logging</module> Modified: tags/3.1.4.SR1/samples/seamEAR/wars/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/wars/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/wars/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,11 +4,11 @@ <artifactId>wars</artifactId> <packaging>pom</packaging> <name>wars</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modules> <module>seamWebapp</module> Modified: tags/3.1.4.SR1/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -10,7 +10,7 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>wars</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <build> <finalName>seamWebapp</finalName> @@ -42,17 +42,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>provided</scope> </dependency> <dependency> Modified: tags/3.1.4.SR1/samples/seamIntegration/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamIntegration/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamIntegration/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,14 +5,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>seamIntegration</artifactId> <packaging>war</packaging> <name>seamIntegration Maven Webapp</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <build> <finalName>seamIntegration</finalName> <plugins> Modified: tags/3.1.4.SR1/samples/seamPortletEar/ear/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamPortletEar/ear/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamPortletEar/ear/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,14 +3,14 @@ <parent> <artifactId>seamPortletEar</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.seamPortletEar</groupId> <artifactId>portletEar</artifactId> <packaging>ear</packaging> <name>Seam Portlet Ear</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <dependencies> <dependency> <groupId>org.jboss.seam</groupId> Modified: tags/3.1.4.SR1/samples/seamPortletEar/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamPortletEar/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamPortletEar/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,12 +4,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> --> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <artifactId>seamPortletEar</artifactId> <packaging>pom</packaging> <name>seam EAR portlet project</name> @@ -57,13 +57,13 @@ <dependency> <groupId>org.richfaces.samples.seamPortletEar</groupId> <artifactId>seamBookingPortlet</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>war</type> </dependency> <dependency> <groupId>org.richfaces.samples.seamPortletEar</groupId> <artifactId>seamBooking</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <type>ejb</type> </dependency> <dependency> Modified: tags/3.1.4.SR1/samples/seamPortletEar/seamBooking/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamPortletEar/seamBooking/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamPortletEar/seamBooking/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,14 +3,14 @@ <parent> <artifactId>seamPortletEar</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.seamPortletEar</groupId> <artifactId>seamBooking</artifactId> <name>seamBooking</name> <packaging>ejb</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <dependencies> <dependency> <groupId>junit</groupId> @@ -32,7 +32,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>javax.ejb</groupId> Modified: tags/3.1.4.SR1/samples/seamPortletEar/seamBookingPortlet/pom.xml =================================================================== --- tags/3.1.4.GA/samples/seamPortletEar/seamBookingPortlet/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/seamPortletEar/seamBookingPortlet/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,14 +2,14 @@ <parent> <artifactId>seamPortletEar</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.seamPortletEar</groupId> <artifactId>seamBookingPortlet</artifactId> <packaging>war</packaging> <name>seamBookingPortlet Maven Webapp</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <build> <finalName>seamBookingPortlet</finalName> <plugins> @@ -105,7 +105,7 @@ <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -120,7 +120,7 @@ <dependency> <groupId>org.richfaces.extensions.portletbridge</groupId> <artifactId>portletbridge-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -135,12 +135,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>provided</scope> </dependency> <dependency> Modified: tags/3.1.4.SR1/samples/separator-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/separator-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/separator-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>separator-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>separator</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/simpleTogglePanel-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/simpleTogglePanel-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>simpleTogglePanel-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>simpleTogglePanel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/skins/pom.xml =================================================================== --- tags/3.1.4.GA/samples/skins/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/skins/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.1.4.SR1/samples/suggestionbox-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/suggestionbox-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/suggestionbox-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>suggestionbox-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>suggestionbox-sample Maven Webapp</name> <build> @@ -17,17 +17,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/tabPanelDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/tabPanelDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/tabPanelDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tabPanelDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,22 +17,22 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tabPanel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/togglePanel-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/togglePanel-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/togglePanel-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>togglePanel-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,17 +17,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>togglePanel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/tomahawkCompability/pom.xml =================================================================== --- tags/3.1.4.GA/samples/tomahawkCompability/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/tomahawkCompability/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tomahawkCompability</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>tomahawkCompability Maven Webapp</name> <properties> Modified: tags/3.1.4.SR1/samples/toolBarDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/toolBarDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/toolBarDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,12 +2,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>toolBarDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>toolBar</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/samples/tooltip-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/tooltip-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/tooltip-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,29 +3,29 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tooltip-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>tooltip-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tooltip</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/samples/tree-demo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/tree-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/tree-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,29 +2,29 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tree-demo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>tree-demo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/treeModelDemo/pom.xml =================================================================== --- tags/3.1.4.GA/samples/treeModelDemo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/treeModelDemo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,24 +3,24 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>treeModelDemo</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>Tree Model Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>treeModel</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/samples/useCases/pom.xml =================================================================== --- tags/3.1.4.GA/samples/useCases/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/useCases/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -5,12 +5,12 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>useCases</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>useCases Maven Webapp</name> <build> Modified: tags/3.1.4.SR1/samples/virtualEarth-sample/pom.xml =================================================================== --- tags/3.1.4.GA/samples/virtualEarth-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/samples/virtualEarth-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -4,19 +4,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>virtualEarth-sample</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <packaging>war</packaging> <name>gmap-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>virtualEarth</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> <build> Modified: tags/3.1.4.SR1/sandbox/api/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/api/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/api/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,18 +2,18 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/sandbox/impl/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/impl/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/impl/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,28 +2,28 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> <name>Richfaces Sandbox Implementation</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <dependencies> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: tags/3.1.4.SR1/sandbox/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.1.4.SR1/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/samples/dialog-window-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/samples/dialog-window-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -15,12 +15,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>dialog-window</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/sandbox/samples/panel2-sample/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/samples/panel2-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/samples/panel2-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -15,12 +15,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>panel2</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/sandbox/samples/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/samples/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/samples/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.1.4.SR1/sandbox/samples/rich-message-demo/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/samples/rich-message-demo/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/samples/rich-message-demo/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.demo</groupId> @@ -13,17 +13,17 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>message</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>simpleTogglePanel2</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/sandbox/ui/dialog-window/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/ui/dialog-window/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/ui/dialog-window/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -39,12 +39,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>provided</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/sandbox/ui/panel2/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/ui/panel2/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/ui/panel2/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/sandbox/ui/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/ui/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/ui/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -3,7 +3,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: tags/3.1.4.SR1/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/ui/simpleTogglePanel2/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/ui/simpleTogglePanel2/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/sandbox/ui/state/pom.xml =================================================================== --- tags/3.1.4.GA/sandbox/ui/state/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/sandbox/ui/state/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/test-applications/facelets/pom.xml =================================================================== --- tags/3.1.4.GA/test-applications/facelets/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/test-applications/facelets/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.1.4.SR1/test-applications/jsp/pom.xml =================================================================== --- tags/3.1.4.GA/test-applications/jsp/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/test-applications/jsp/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.1.4.SR1/test-applications/pom.xml =================================================================== --- tags/3.1.4.GA/test-applications/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/test-applications/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <relativePath>../samples</relativePath> </parent> @@ -43,11 +43,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.1.4.GA</rfVersion> + <rfVersion>3.1.4.SR1</rfVersion> </properties> <modules> Modified: tags/3.1.4.SR1/ui/assembly/pom.xml =================================================================== --- tags/3.1.4.GA/ui/assembly/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/assembly/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <configuration> <library> <prefix>org.richfaces</prefix> Copied: tags/3.1.4.SR1/ui/assembly/src/main/config (from rev 6013, branches/3.1.x/ui/assembly/src/main/config) Copied: tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF (from rev 6013, branches/3.1.x/ui/assembly/src/main/config/META-INF) Deleted: tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml =================================================================== --- branches/3.1.x/ui/assembly/src/main/config/META-INF/resources-config.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resource-config> - <resource > - <name>/org/richfaces/ui.pack.js</name> - <path>org/richfaces/ui.pack.js</path> - <renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/> - </resource> - <resource> - <name>/org/richfaces/skin.xcss</name> - <path>org/richfaces/skin.xcss</path> - </resource> -</resource-config> \ No newline at end of file Copied: tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml (from rev 6013, branches/3.1.x/ui/assembly/src/main/config/META-INF/resources-config.xml) =================================================================== --- tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml (rev 0) +++ tags/3.1.4.SR1/ui/assembly/src/main/config/META-INF/resources-config.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> + <resource > + <name>/org/richfaces/ui.pack.js</name> + <path>org/richfaces/ui.pack.js</path> + <renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/> + </resource> + <resource> + <name>/org/richfaces/skin.xcss</name> + <path>org/richfaces/skin.xcss</path> + </resource> +</resource-config> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/calendar/pom.xml =================================================================== --- tags/3.1.4.GA/ui/calendar/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/calendar/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> @@ -45,13 +45,13 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> Modified: tags/3.1.4.SR1/ui/componentControl/pom.xml =================================================================== --- tags/3.1.4.GA/ui/componentControl/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/componentControl/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> Modified: tags/3.1.4.SR1/ui/contextMenu/pom.xml =================================================================== --- tags/3.1.4.GA/ui/contextMenu/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/contextMenu/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,12 +44,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/core/pom.xml =================================================================== --- tags/3.1.4.GA/ui/core/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/core/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/create.bat =================================================================== --- tags/3.1.4.GA/ui/create.bat 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/create.bat 2008-02-11 19:17:32 UTC (rev 6018) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.1.4.GA -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.1.4.SR1 -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Modified: tags/3.1.4.SR1/ui/create.sh =================================================================== --- tags/3.1.4.GA/ui/create.sh 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/create.sh 2008-02-11 19:17:32 UTC (rev 6018) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component \ - -DarchetypeVersion=3.1.4.GA -DgroupId=org.richfaces.ui -DartifactId=$1 + -DarchetypeVersion=3.1.4.SR1 -DgroupId=org.richfaces.ui -DartifactId=$1 Modified: tags/3.1.4.SR1/ui/dataFilterSlider/pom.xml =================================================================== --- tags/3.1.4.GA/ui/dataFilterSlider/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/dataFilterSlider/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/dataTable/pom.xml =================================================================== --- tags/3.1.4.GA/ui/dataTable/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/dataTable/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> --> </dependencies> Modified: tags/3.1.4.SR1/ui/datascroller/pom.xml =================================================================== --- tags/3.1.4.GA/ui/datascroller/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/datascroller/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/drag-drop/pom.xml =================================================================== --- tags/3.1.4.GA/ui/drag-drop/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/drag-drop/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> --> </dependencies> Modified: tags/3.1.4.SR1/ui/dropdown-menu/pom.xml =================================================================== --- tags/3.1.4.GA/ui/dropdown-menu/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/dropdown-menu/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,12 +44,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/effect/pom.xml =================================================================== --- tags/3.1.4.GA/ui/effect/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/effect/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/gmap/pom.xml =================================================================== --- tags/3.1.4.GA/ui/gmap/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/gmap/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/inputnumber-slider/pom.xml =================================================================== --- tags/3.1.4.GA/ui/inputnumber-slider/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/inputnumber-slider/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/inputnumber-spinner/pom.xml =================================================================== --- tags/3.1.4.GA/ui/inputnumber-spinner/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/inputnumber-spinner/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.1.4.SR1/ui/insert/pom.xml =================================================================== --- tags/3.1.4.GA/ui/insert/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/insert/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/jQuery/pom.xml =================================================================== --- tags/3.1.4.GA/ui/jQuery/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/jQuery/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/listShuttle/pom.xml =================================================================== --- tags/3.1.4.GA/ui/listShuttle/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/listShuttle/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: tags/3.1.4.SR1/ui/menu-components/pom.xml =================================================================== --- tags/3.1.4.GA/ui/menu-components/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/menu-components/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/message/pom.xml =================================================================== --- tags/3.1.4.GA/ui/message/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/message/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Message</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/modal-panel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/modal-panel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/modal-panel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/orderingList/pom.xml =================================================================== --- tags/3.1.4.GA/ui/orderingList/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/orderingList/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/paint2D/pom.xml =================================================================== --- tags/3.1.4.GA/ui/paint2D/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/paint2D/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/panel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/panel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/panel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/panelbar/pom.xml =================================================================== --- tags/3.1.4.GA/ui/panelbar/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/panelbar/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.1.4.SR1/ui/panelmenu/pom.xml =================================================================== --- tags/3.1.4.GA/ui/panelmenu/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/panelmenu/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/pom.xml =================================================================== --- tags/3.1.4.GA/ui/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -134,12 +134,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>test</scope> </dependency> <dependency> Modified: tags/3.1.4.SR1/ui/scrollableDataTable/pom.xml =================================================================== --- tags/3.1.4.GA/ui/scrollableDataTable/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/scrollableDataTable/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <name>Scrollable Data Table</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -71,12 +71,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <scope>test</scope> </dependency> </dependencies> Modified: tags/3.1.4.SR1/ui/separator/pom.xml =================================================================== --- tags/3.1.4.GA/ui/separator/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/separator/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.1.4.SR1/ui/simpleTogglePanel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/simpleTogglePanel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/simpleTogglePanel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/spacer/pom.xml =================================================================== --- tags/3.1.4.GA/ui/spacer/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/spacer/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/suggestionbox/pom.xml =================================================================== --- tags/3.1.4.GA/ui/suggestionbox/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/suggestionbox/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/tabPanel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/tabPanel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/tabPanel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/togglePanel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/togglePanel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/togglePanel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/toolBar/pom.xml =================================================================== --- tags/3.1.4.GA/ui/toolBar/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/toolBar/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/tooltip/pom.xml =================================================================== --- tags/3.1.4.GA/ui/tooltip/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/tooltip/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/tree/pom.xml =================================================================== --- tags/3.1.4.GA/ui/tree/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/tree/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/treeModel/pom.xml =================================================================== --- tags/3.1.4.GA/ui/treeModel/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/treeModel/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <id>generate-sources</id> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.1.4.SR1/ui/virtualEarth/pom.xml =================================================================== --- tags/3.1.4.GA/ui/virtualEarth/pom.xml 2008-02-11 17:37:55 UTC (rev 6013) +++ tags/3.1.4.SR1/ui/virtualEarth/pom.xml 2008-02-11 19:17:32 UTC (rev 6018) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.4.GA</version> + <version>3.1.4.SR1</version> <executions> <execution> <phase>generate-sources</phase>