August 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r18520 - in root/sandbox/examples/richfaces-showcase-gae: src/main/java/org/richfaces and 1 other directories.

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

Author: nbelaevski Date: 2010-08-09 13:48:08 -0400 (Mon, 09 Aug 2010) New Revision: 18520 Removed: root/sandbox/examples/richfaces-showcase-gae/src/main/java/org/richfaces/resource/ Modified: root/sandbox/examples/richfaces-showcase-gae/pom.xml root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml Log: GAE showcase switched to core implementation of external static resources Modified: root/sandbox/examples/richfaces-showcase-gae/pom.xml =================================================================== --- root/sandbox/examples/richfaces-showcase-gae/pom.xml 2010-08-09 17:47:05 UTC (rev 18519) +++ root/sandbox/examples/richfaces-showcase-gae/pom.xml 2010-08-09 17:48:08 UTC (rev 18520) @@ -215,7 +215,7 @@ </resource> <resource> <directory>${project.build.directory}/generated-resources</directory> - <targetPath>resources</targetPath> + <targetPath>static-resources</targetPath> </resource> </webResources> </configuration> @@ -244,17 +244,23 @@ <skin>wine</skin> </skins> <includedContentTypes> + <include>application/javascript</include> + <include>text/css</include> <include>image/.+</include> </includedContentTypes> <fileNameMappings> <property> - <name>^org\.richfaces\.renderkit\.html\.(images\.)?</name> - <value>org.richfaces/images/</value> + <name>^\Qorg.richfaces.renderkit.html\E</name> + <value>org.richfaces/images</value> </property> <property> - <name>^org\.richfaces\.demo\.images\.</name> - <value>org.richfaces.demo/images/</value> + <name>^\Qorg.richfaces.renderkit.html.images\E</name> + <value>org.richfaces/images</value> </property> + <property> + <name>^css/</name> + <value>org.richfaces/css/</value> + </property> </fileNameMappings> </configuration> </execution> Modified: root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml 2010-08-09 17:47:05 UTC (rev 18519) +++ root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml 2010-08-09 17:48:08 UTC (rev 18520) @@ -20,7 +20,4 @@ <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - <application> - <resource-handler>org.richfaces.resource.DictionaryResourceHandlerImpl</resource-handler> - </application> </faces-config> \ No newline at end of file Modified: root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml =================================================================== --- root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml 2010-08-09 17:47:05 UTC (rev 18519) +++ root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml 2010-08-09 17:48:08 UTC (rev 18520) @@ -27,7 +27,13 @@ <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> </context-param> + <context-param> + <param-name>org.richfaces.staticResourceLocation</param-name> + <param-value>#{facesContext.externalContext.requestContextPath}/static-resources/#{resourceLocation}</param-value> + </context-param> + + <context-param> <description> Set this flag to true if you want the JavaServer Faces Reference Implementation to validate the XML in your

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18519 - in root/sandbox/cdk/maven-resources-plugin/src: main/java/org/richfaces/cdk and 1 other directories.

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

Author: nbelaevski Date: 2010-08-09 13:47:05 -0400 (Mon, 09 Aug 2010) New Revision: 18519 Modified: root/sandbox/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java Log: Minor updates in static resources handling Modified: root/sandbox/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml =================================================================== --- root/sandbox/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml 2010-08-09 17:46:24 UTC (rev 18518) +++ root/sandbox/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml 2010-08-09 17:47:05 UTC (rev 18519) @@ -39,15 +39,15 @@ <fileNameMappings> <property> <name>^\Qorg.richfaces.renderkit.html\E</name> - <value>org.richfaces/images/</value> + <value>org.richfaces/images</value> </property> <property> <name>^\Qorg.richfaces.renderkit.html.images\E</name> - <value>org.richfaces/images/</value> + <value>org.richfaces/images</value> </property> <property> <name>^css/</name> - <value>org.richfaces/css/</value> + <value>org.richfaces/css</value> </property> </fileNameMappings> </configuration> Modified: root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java =================================================================== --- root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2010-08-09 17:46:24 UTC (rev 18518) +++ root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2010-08-09 17:47:05 UTC (rev 18519) @@ -263,18 +263,20 @@ scanDynamicResources(cpResources); scanStaticResources(resourceRoots); - File outputDirFile = new File(outputDir); - if (!outputDirFile.exists()) { - outputDirFile = new File(project.getBuild().getDirectory(), outputDir); + File resourceOutputDir = new File(outputDir); + if (!resourceOutputDir.exists()) { + resourceOutputDir = new File(project.getBuild().getDirectory(), outputDir); } + File resourceMappingDir = new File(project.getBuild().getOutputDirectory()); + ResourceHandler resourceHandler = new DynamicResourceHandler(new StaticResourceHandler(resourceRoots)); // TODO set webroot faces = new FacesImpl(null, new FileNameMapperImpl(Maps.fromProperties(fileNameMappings)), resourceHandler); faces.start(); - ResourceWriterImpl resourceWriter = new ResourceWriterImpl(outputDirFile); + ResourceWriterImpl resourceWriter = new ResourceWriterImpl(resourceOutputDir, resourceMappingDir); ResourceTaskFactoryImpl taskFactory = new ResourceTaskFactoryImpl(faces); taskFactory.setResourceWriter(resourceWriter); Modified: root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java =================================================================== --- root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java 2010-08-09 17:46:24 UTC (rev 18518) +++ root/sandbox/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java 2010-08-09 17:47:05 UTC (rev 18519) @@ -29,15 +29,16 @@ import java.io.InputStream; import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import javax.faces.application.Resource; import org.richfaces.application.ServiceTracker; import org.richfaces.cdk.FileNameMapper; import org.richfaces.cdk.ResourceWriter; +import org.richfaces.resource.ResourceFactory; import com.google.common.base.Strings; +import com.google.common.collect.Maps; import com.google.common.io.ByteStreams; /** @@ -46,13 +47,16 @@ */ public class ResourceWriterImpl implements ResourceWriter { - private File baseDir; + private File resourceContentsDir; - private Map<String, String> processedResources = new ConcurrentHashMap<String, String>(); + private File resourceMappingDir; - public ResourceWriterImpl(File baseDir) { - this.baseDir = baseDir; - baseDir.mkdirs(); + private Map<String, String> processedResources = Maps.newConcurrentMap(); + + public ResourceWriterImpl(File resourceContentsDir, File resourceMappingDir) { + this.resourceContentsDir = resourceContentsDir; + this.resourceMappingDir = resourceMappingDir; + resourceContentsDir.mkdirs(); } private String getResourceQualifier(Resource resource) { @@ -65,9 +69,9 @@ private File getRoot(String rootName) { if (!Strings.isNullOrEmpty(rootName)) { - return new File(baseDir, rootName); + return new File(resourceContentsDir, rootName); } else { - return baseDir; + return resourceContentsDir; } } @@ -118,7 +122,8 @@ //TODO separate mappings file location FileOutputStream fos = null; try { - File mappingsFile = new File(baseDir, "org.richfaces/resource-mappings.properties"); + File mappingsFile = new File(resourceMappingDir, ResourceFactory.STATIC_RESOURCE_MAPPINGS); + mappingsFile.delete(); mappingsFile.getParentFile().mkdirs(); mappingsFile.createNewFile();

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18518 - in trunk/core: impl/src/main/java/org/ajax4jsf/context and 4 other directories.

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

Author: nbelaevski Date: 2010-08-09 13:46:24 -0400 (Mon, 09 Aug 2010) New Revision: 18518 Added: trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java Modified: trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java trunk/core/impl/src/main/java/org/richfaces/skin/CompositeSkinImpl.java trunk/core/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java trunk/core/impl/src/test/java/org/richfaces/skin/SkinTestCase.java trunk/core/impl/src/test/resources/META-INF/skins/dynatest_base.skin.properties trunk/core/impl/src/test/resources/META-INF/skins/style_base.skin.properties Log: Skin updates Mapping for static resources Modified: trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/api/src/main/java/org/richfaces/resource/ResourceFactory.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -32,6 +32,10 @@ public static final String STATIC_RESOURCE_MAPPINGS = "META-INF/richfaces/static-resource-mappings.properties"; + public static final String SKINNED_RESOURCE_PREFIX = "%skin%/"; + + //TODO implement resource mappings + public abstract Resource createResource(String resourceName, String libraryName, String contentType); public abstract Resource createResource(FacesContext context, ResourceCodecData resourceData); Modified: trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -69,6 +69,10 @@ public static final String SKIN = "org.richfaces.skin"; public static final String BASE_SKIN = "org.richfaces.baseSkin"; + public static final String STATIC_RESOURCE_LOCATION = "org.richfaces.staticResourceLocation"; + + public static final String STATIC_RESOURCE_LOCATION_VARIABLE = "resourceLocation"; + private static final String[] RESOURCES_TTL_ARRAY = { RESOURCES_TTL }; private static final String[] RESOURCES_CACHE_SIZE_ARRAY = { RESOURCES_CACHE_SIZE }; @@ -143,6 +147,10 @@ return evaluateInitParameter(context, BASE_SKIN); } + public static String getStaticResourceLocation(FacesContext context) { + return (String) evaluateInitParameter(context, STATIC_RESOURCE_LOCATION); + } + static int getInteger(FacesContext context, String[] paramNames, int defaultValue) { String initParameter = getInitParameter(context, paramNames); Added: trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Map; + +import javax.faces.application.Resource; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.context.ContextInitParameters; +import org.richfaces.skin.SkinFactory; + +import com.google.common.base.Joiner; + +/** + * @author Nick Belaevski + * + */ +public class ExternalStaticResource extends Resource { + + private static final Joiner RESOURCE_PATH_JOINER = Joiner.on('/').skipNulls(); + + private String location; + + private boolean skinDependent; + + public ExternalStaticResource(String location, boolean skinDependent) { + super(); + this.location = location; + this.skinDependent = skinDependent; + } + + private String getResourceLocation(FacesContext facesContext) { + String skinName = null; + + if (skinDependent) { + SkinFactory skinFactory = SkinFactory.getInstance(facesContext); + skinName = skinFactory.getSkin(facesContext).getName(); + } + + return RESOURCE_PATH_JOINER.join(skinName, location); + } + + @Override + public InputStream getInputStream() throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public Map<String, String> getResponseHeaders() { + throw new UnsupportedOperationException(); + } + + @Override + public String getRequestPath() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap(); + Object resourceVarValue = requestMap.get(ContextInitParameters.STATIC_RESOURCE_LOCATION_VARIABLE); + try { + String resourceLocation = getResourceLocation(facesContext); + + requestMap.put(ContextInitParameters.STATIC_RESOURCE_LOCATION_VARIABLE, resourceLocation); + + //TODO pass via ViewHandler? + return ContextInitParameters.getStaticResourceLocation(facesContext); + } finally { + requestMap.remove(ContextInitParameters.STATIC_RESOURCE_LOCATION_VARIABLE); + if (resourceVarValue != null) { + requestMap.put(ContextInitParameters.STATIC_RESOURCE_LOCATION_VARIABLE, resourceVarValue); + } + } + } + + @Override + public URL getURL() { + //TODO - review + throw new UnsupportedOperationException(); + } + + @Override + public boolean userAgentNeedsUpdate(FacesContext context) { + throw new UnsupportedOperationException(); + } + +} Modified: trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -35,10 +35,10 @@ import org.richfaces.application.DependencyInjector; import org.richfaces.application.ServiceTracker; -import org.richfaces.skin.SkinFactory; import org.richfaces.util.PropertiesUtil; import org.richfaces.util.Util; +import com.google.common.base.Joiner; import com.google.common.collect.Maps; /** @@ -47,75 +47,110 @@ */ public class ResourceFactoryImpl implements ResourceFactory { - private static final String SKINNED_RESOURCE_PREFIX = "%skin%/"; - + private static final Joiner RESOURCE_QUALIFIER_JOINER = Joiner.on(':').skipNulls(); + private static final ResourceLogger LOGGER = ResourceLogger.INSTANCE; - private static class ResourceLocator { - - private String resourcePath; - - public ResourceLocator(String resourcePath) { - super(); - this.resourcePath = resourcePath; + private static class ExternalStaticResourceFactory { + + private String resourceName; + + private String libraryName; + + private String resourceLocation; + + private boolean skinDependent; + + public Resource createResource() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + ExternalStaticResource resource = new ExternalStaticResource(resourceLocation, skinDependent); + + resource.setResourceName(resourceName); + resource.setLibraryName(libraryName); + resource.setContentType(facesContext.getExternalContext().getMimeType(resourceLocation)); + + return resource; } - public String locateResource(FacesContext facesContext) { - return resourcePath; + public void setResourceName(String resourceName) { + this.resourceName = resourceName; } - - } - private static final class SkinResourceLocator extends ResourceLocator { - - public SkinResourceLocator(String resourcePath) { - super(resourcePath); + public void setLibraryName(String libraryName) { + this.libraryName = libraryName; } - @Override - public String locateResource(FacesContext facesContext) { - SkinFactory skinFactory = SkinFactory.getInstance(facesContext); + public void setResourceLocation(String resourceLocation) { + this.resourceLocation = resourceLocation; + } - String skinName = skinFactory.getSkin(facesContext).getName(); - return skinName + '/' + super.locateResource(facesContext); + public void setSkinDependent(boolean skinDependent) { + this.skinDependent = skinDependent; } } - + private ResourceHandler defaultHandler; - - private Map<String, ResourceLocator> resourceLocatorsMap; - + + private Map<String, ExternalStaticResourceFactory> externalStaticResourceFactories; + public ResourceFactoryImpl(ResourceHandler defaultHandler) { super(); this.defaultHandler = defaultHandler; + + initializeExternalResourcesMap(); + } + + private String getResourceNameFromQualifier(String qualifier) { + int idx = qualifier.lastIndexOf(':'); + if (idx < 0) { + return qualifier; + } - initializeResourceLocatorsMap(); + return qualifier.substring(idx + 1); } + + private String getLibraryNameFromQualifier(String qualifier) { + int idx = qualifier.lastIndexOf(':'); + if (idx < 0) { + return null; + } + + return qualifier.substring(0, idx); + } - private void initializeResourceLocatorsMap() { - resourceLocatorsMap = Maps.newHashMap(); - + private String getResourceQualifier(String resourceName, String libraryName) { + return RESOURCE_QUALIFIER_JOINER.join(libraryName, resourceName); + } + + private void initializeExternalResourcesMap() { + externalStaticResourceFactories = Maps.newHashMap(); + Properties properties = new Properties(); - PropertiesUtil.loadProperties(properties, "META-INF/resources/org.richfaces/resource-mappings.properties"); - + PropertiesUtil.loadProperties(properties, ResourceFactory.STATIC_RESOURCE_MAPPINGS); + Set<Entry<Object, Object>> entries = properties.entrySet(); for (Entry<Object, Object> entry : entries) { - String resourceKey = (String) entry.getKey(); - - ResourceLocator resourceLocator; - String resourcePath = (String) entry.getValue(); - if (resourcePath.startsWith(SKINNED_RESOURCE_PREFIX)) { - resourceLocator = new SkinResourceLocator(resourcePath.substring(SKINNED_RESOURCE_PREFIX.length())); - } else { - resourceLocator = new ResourceLocator(resourcePath); + String resourceQualifier = (String) entry.getKey(); + + String resourceLocation = (String) entry.getValue(); + boolean skinDependent = false; + if (resourceLocation.startsWith(SKINNED_RESOURCE_PREFIX)) { + resourceLocation = resourceLocation.substring(SKINNED_RESOURCE_PREFIX.length()); + skinDependent = true; } - resourceLocatorsMap.put(resourceKey, resourceLocator); + ExternalStaticResourceFactory factory = new ExternalStaticResourceFactory(); + factory.setResourceLocation(resourceLocation); + factory.setSkinDependent(skinDependent); + factory.setResourceName(getResourceNameFromQualifier(resourceQualifier)); + factory.setLibraryName(getLibraryNameFromQualifier(resourceQualifier)); + + externalStaticResourceFactories.put(resourceQualifier, factory); } - - resourceLocatorsMap = Collections.unmodifiableMap(resourceLocatorsMap); + + externalStaticResourceFactories = Collections.unmodifiableMap(externalStaticResourceFactories); } - + private String extractParametersFromResourceName(String resourceName) { if (!(resourceName.lastIndexOf("?") != -1)) { return resourceName; @@ -128,17 +163,17 @@ if (sourceResource != null) { return new CompiledCSSResource(sourceResource); } - + return null; } - + protected void injectProperties(Object resource, Map<String, String> parameters) { FacesContext facesContext = FacesContext.getCurrentInstance(); Map<Object, Object> attributes = facesContext.getAttributes(); try { attributes.put(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME, parameters); - ServiceTracker.getService(DependencyInjector.class).inject(facesContext,resource); + ServiceTracker.getService(DependencyInjector.class).inject(facesContext, resource); } finally { attributes.remove(ResourceParameterELResolver.CONTEXT_ATTRIBUTE_NAME); } @@ -146,7 +181,7 @@ /** * Should be called only if {@link #isResourceExists(String)} returns <code>true</code> - * + * * @param resourceName * @return */ @@ -163,26 +198,27 @@ DynamicResource annotation = loadedClass.getAnnotation(DynamicResource.class); legitimateResource = (annotation != null); if (legitimateResource) { - LOGGER.debug( - MessageFormat.format("Dynamic resource annotation is present on resource class {0}", resourceName)); + LOGGER.debug(MessageFormat.format("Dynamic resource annotation is present on resource class {0}", + resourceName)); } else { - LOGGER.debug( - MessageFormat.format("Dynamic resource annotation is not present on resource class {0}", resourceName)); + LOGGER.debug(MessageFormat.format( + "Dynamic resource annotation is not present on resource class {0}", resourceName)); } if (!legitimateResource) { // TODO resource marker extension name? - URL resourceMarkerUrl = contextClassLoader.getResource("META-INF/" + resourceName + ".resource.properties"); + URL resourceMarkerUrl = contextClassLoader.getResource("META-INF/" + resourceName + + ".resource.properties"); legitimateResource = resourceMarkerUrl != null; if (LOGGER.isDebugEnabled()) { if (legitimateResource) { - LOGGER.debug( - MessageFormat.format("Marker file for {0} resource found in classpath", resourceName)); + LOGGER.debug(MessageFormat.format("Marker file for {0} resource found in classpath", + resourceName)); } else { - LOGGER.debug( - MessageFormat.format("Marker file for {0} resource does not exist", resourceName)); + LOGGER.debug(MessageFormat.format("Marker file for {0} resource does not exist", + resourceName)); } } } @@ -209,22 +245,24 @@ resource.setResourceName(resourceName); if (LOGGER.isDebugEnabled()) { - LOGGER.debug(MessageFormat.format("Successfully created instance of {0} resource", - resourceName)); + LOGGER.debug(MessageFormat + .format("Successfully created instance of {0} resource", resourceName)); } } } catch (ClassNotFoundException e) { - //do nothing + // do nothing } catch (Exception e) { - LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); + LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", + resourceName); } catch (LinkageError e) { - LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", resourceName); + LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}", + resourceName); } } return resource; } - + public Resource createResource(FacesContext context, ResourceCodecData resourceData) { String resourceName = resourceData.getResourceName(); @@ -246,14 +284,11 @@ String requestedVersion = resourceData.getVersion(); if (LOGGER.isDebugEnabled()) { - LOGGER.debug( - MessageFormat.format( - "Client requested {0} version of resource, server has {1} version", - String.valueOf(requestedVersion), String.valueOf(existingVersion))); + LOGGER.debug(MessageFormat.format("Client requested {0} version of resource, server has {1} version", + String.valueOf(requestedVersion), String.valueOf(existingVersion))); } - if ((existingVersion != null) && (requestedVersion != null) - && !existingVersion.equals(requestedVersion)) { + if ((existingVersion != null) && (requestedVersion != null) && !existingVersion.equals(requestedVersion)) { LOGGER.logResourceProblem(context, null, "Resource {0} of version {1} was not found", resourceName, requestedVersion); return null; @@ -269,27 +304,33 @@ LOGGER.debug("Resource state data decoded as null"); } } - + Util.restoreResourceState(context, resource, decodedData); - + return resource; } - + public Resource createResource(String resourceName, String libraryName, String contentType) { + String resourceQualifier = getResourceQualifier(resourceName, libraryName); + ExternalStaticResourceFactory externalStaticResourceFactory = externalStaticResourceFactories.get(resourceQualifier); + if (externalStaticResourceFactory != null) { + return externalStaticResourceFactory.createResource(); + } + Resource result = null; Map<String, String> params = Util.parseResourceParameters(resourceName); resourceName = extractParametersFromResourceName(resourceName); if (resourceName.endsWith(".ecss")) { - //TODO nick - params? + // TODO nick - params? result = createCompiledCSSResource(resourceName, libraryName); } else { - //TODO nick - libraryName as package name? + // TODO nick - libraryName as package name? if ((resourceName != null) && ((libraryName == null) || (libraryName.length() == 0))) { result = createHandlerDependentResource(resourceName, params); } } - + return result; } - + } Modified: trunk/core/impl/src/main/java/org/richfaces/skin/CompositeSkinImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/skin/CompositeSkinImpl.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/main/java/org/richfaces/skin/CompositeSkinImpl.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -21,16 +21,35 @@ package org.richfaces.skin; +import java.util.Arrays; +import java.util.List; + import javax.faces.context.FacesContext; +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.collect.Iterables; + /** * @author nick belaevski */ final class CompositeSkinImpl extends AbstractSkin { + private static final Joiner DASH_JOINER = Joiner.on('-').skipNulls(); + + private static final Function<Skin, String> SKIN_NAME_FUNCTION = new Function<Skin, String>() { + public String apply(Skin from) { + if (from == null) { + return null; + } + + return from.getName(); + }; + }; + private int hashCode = 0; - private Skin[] skinsChain; + private List<Skin> skinsChain; /** * @param properties @@ -38,7 +57,7 @@ CompositeSkinImpl(Skin... skinsChain) { // TODO Auto-generated constructor stub - this.skinsChain = skinsChain; + this.skinsChain = Arrays.asList(skinsChain); } public boolean containsProperty(String name) { @@ -56,15 +75,7 @@ } public String getName() { - for (Skin skin : skinsChain) { - if (skin == null) { - continue; - } - - return skin.getName(); - } - - throw new IllegalStateException(); + return DASH_JOINER.join(Iterables.transform(skinsChain, SKIN_NAME_FUNCTION)); } public int hashCode(FacesContext context) { Modified: trunk/core/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -64,9 +64,13 @@ if (skin == null) { Skin mainSkin = getSkinOrName(context, false); Skin baseSkin = getSkinOrName(context, true); - Skin defaultSkin = getDefaultSkin(context); - skin = new CompositeSkinImpl(mainSkin, baseSkin, defaultSkin); + if (mainSkin != null || baseSkin != null) { + skin = new CompositeSkinImpl(mainSkin, baseSkin); + } else { + skin = new CompositeSkinImpl(getDefaultSkin(context)); + } + context.getAttributes().put(SKIN_KEY, skin); } @@ -77,9 +81,13 @@ Skin skin = (Skin) context.getAttributes().get(BASE_SKIN_KEY); if (skin == null) { Skin baseSkin = getSkinOrName(context, true); - Skin defaultSkin = getDefaultSkin(context); - - skin = new CompositeSkinImpl(baseSkin, defaultSkin); + + if (baseSkin != null) { + skin = new CompositeSkinImpl(baseSkin); + } else { + skin = new CompositeSkinImpl(getDefaultSkin(context)); + } + context.getAttributes().put(BASE_SKIN_KEY, skin); } Modified: trunk/core/impl/src/test/java/org/richfaces/skin/SkinTestCase.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/skin/SkinTestCase.java 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/test/java/org/richfaces/skin/SkinTestCase.java 2010-08-09 17:46:24 UTC (rev 18518) @@ -129,7 +129,7 @@ /* * Test method for 'org.richfaces.skin.SkinFactory.getSkin(FacesContext)' */ - @SkinParameters(skinName = "test") + @SkinParameters(skinName = "test", baseSkinName = "DEFAULT") public void testSkinReferences() { SkinFactory factory = SkinFactory.getInstance(); @@ -280,6 +280,20 @@ */ public void testGetSkinName() {} + @SkinParameters(skinName = "plain") + public void testPlainSkin() throws Exception { + SkinFactory factory = (SkinFactory) SkinFactory.getInstance(); + + assertNull(factory.getSkin(facesContext).getParameter(facesContext, Skin.GENERAL_BACKGROUND_COLOR)); + } + + @SkinParameters(baseSkinName = "plain") + public void testPlainSkinBase() throws Exception { + SkinFactory factory = (SkinFactory) SkinFactory.getInstance(); + + assertNull(factory.getBaseSkin(facesContext).getParameter(facesContext, Skin.GENERAL_BACKGROUND_COLOR)); + } + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) private @interface SkinParameters { Modified: trunk/core/impl/src/test/resources/META-INF/skins/dynatest_base.skin.properties =================================================================== --- trunk/core/impl/src/test/resources/META-INF/skins/dynatest_base.skin.properties 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/test/resources/META-INF/skins/dynatest_base.skin.properties 2010-08-09 17:46:24 UTC (rev 18518) @@ -1 +1,2 @@ +baseSkin=DEFAULT customFormColor=#AAA Modified: trunk/core/impl/src/test/resources/META-INF/skins/style_base.skin.properties =================================================================== --- trunk/core/impl/src/test/resources/META-INF/skins/style_base.skin.properties 2010-08-09 16:39:18 UTC (rev 18517) +++ trunk/core/impl/src/test/resources/META-INF/skins/style_base.skin.properties 2010-08-09 17:46:24 UTC (rev 18518) @@ -1,3 +1,4 @@ +baseSkin=DEFAULT intermediateTextColor=green.intermediate intermediateTextSizeBase=10px additionalBaseTextColor=&textColor

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18517 - in trunk/ui/iteration: ui and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-08-09 12:39:18 -0400 (Mon, 09 Aug 2010) New Revision: 18517 Modified: trunk/ui/iteration/api/pom.xml trunk/ui/iteration/ui/pom.xml Log: Richfaces 4.0 restructurization of svn repository structure Modified: trunk/ui/iteration/api/pom.xml =================================================================== --- trunk/ui/iteration/api/pom.xml 2010-08-09 16:03:38 UTC (rev 18516) +++ trunk/ui/iteration/api/pom.xml 2010-08-09 16:39:18 UTC (rev 18517) @@ -60,6 +60,11 @@ <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency>  <dependency> Modified: trunk/ui/iteration/ui/pom.xml =================================================================== --- trunk/ui/iteration/ui/pom.xml 2010-08-09 16:03:38 UTC (rev 18516) +++ trunk/ui/iteration/ui/pom.xml 2010-08-09 16:39:18 UTC (rev 18517) @@ -33,12 +33,26 @@ <artifactId>richfaces-ui-iteration-ui</artifactId> <name>Richfaces UI Components: Iteration UI</name> <packaging>jar</packaging> + + <properties> + <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> + </properties> + <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <configuration> + <fail>false</fail> + </configuration> + </plugin> </plugins> </build> @@ -124,6 +138,11 @@ <artifactId>jsf-mock</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${org.richfaces.cdk.version}</version> + </dependency> </dependencies> <scm> @@ -131,5 +150,4 @@ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/datascro...</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> - </project> \ No newline at end of file

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18516 - in root/tests/metamer/trunk/application: src/main/java/org/richfaces/tests/metamer/bean and 43 other directories.

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

Author: ppitonak(a)redhat.com Date: 2010-08-09 12:03:38 -0400 (Mon, 09 Aug 2010) New Revision: 18516 Modified: root/tests/metamer/trunk/application/ root/tests/metamer/trunk/application/.gitignore root/tests/metamer/trunk/application/assembler.xml root/tests/metamer/trunk/application/pom.xml root/tests/metamer/trunk/application/readme.txt root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java root/tests/metamer/trunk/application/src/main/resources/log4j.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JAjaxBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JLogBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JParamBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JPollBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JPushBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JRepeatBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/CommandButtonBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichComponentControlBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataGridBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataTableBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichListBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTogglePanelBean.properties root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/model/capitals.xml root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/model/employees.xml root/tests/metamer/trunk/application/src/main/resources/version.properties root/tests/metamer/trunk/application/src/main/webapp/META-INF/.gitignore root/tests/metamer/trunk/application/src/main/webapp/META-INF/MANIFEST.MF root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/.gitignore root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/faces-config.xml root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/jboss-scanning.xml root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/jboss-web.xml root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/wrapped.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/event-producer.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml root/tests/metamer/trunk/application/src/main/webapp/index.xhtml root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jActionListener.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jAjax.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandLink.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jJSFunction.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jLog.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jMediaOutput.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jOutputPanel.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jParam.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPoll.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPush.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jQueue.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRepeat.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/commandButton.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss root/tests/metamer/trunk/application/src/main/webapp/resources/css/richComponentControl.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataGrid.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataScroller.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataTable.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richFunctions.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richJQuery.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richList.css root/tests/metamer/trunk/application/src/main/webapp/resources/css/richPanel.css root/tests/metamer/trunk/application/src/main/webapp/resources/demo/actionComposite.xhtml root/tests/metamer/trunk/application/src/main/webapp/resources/flash/text.swf root/tests/metamer/trunk/application/src/main/webapp/resources/images/back.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/cancel.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/female.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/help.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/home.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/male.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/refresh.png root/tests/metamer/trunk/application/src/main/webapp/resources/images/richfaces.jpg root/tests/metamer/trunk/application/src/main/webapp/resources/images/wait.gif root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/css/attributes.ecss root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/css/testPageLink.ecss root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/testPageLink.xhtml root/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js root/tests/metamer/trunk/application/src/main/webapp/resources/script/date-format.js root/tests/metamer/trunk/application/src/main/webapp/resources/script/swfobject.js root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml root/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java Log: * subversion property svn:keywords "Revision" set on all sources Property changes on: root/tests/metamer/trunk/application ___________________________________________________________________ Name: svn:ignore - .checkstyle .classpath .project .settings target + .checkstyle .classpath .project .settings target nbactions.xml nb-configuration.xml Property changes on: root/tests/metamer/trunk/application/.gitignore ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/assembler.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/pom.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/readme.txt ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/log4j.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JAjaxBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JLogBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JParamBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JPollBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JPushBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JRepeatBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/CommandButtonBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichComponentControlBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataGridBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataScrollerBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichDataTableBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichListBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTogglePanelBean.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/model/capitals.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/model/employees.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/resources/version.properties ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/META-INF/.gitignore ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/.gitignore ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/jboss-scanning.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/wrapped.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/event-producer.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richSubTableToggleControl/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Modified: root/tests/metamer/trunk/application/src/main/webapp/index.xhtml =================================================================== --- root/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-08-09 16:00:24 UTC (rev 18515) +++ root/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-08-09 16:03:38 UTC (rev 18516) @@ -34,7 +34,7 @@ <h1>Metamer: RichFaces Testing Application</h1> <h:form id="linksForm"> <h:panelGrid id="components" columns="3" columnClasses="valign-top,valign-top,valign-top"> - <h:panelGroup id="a4jComponents" layout="block" style="width: 300px;"> + <h:panelGroup id="a4jComponents" layout="block" style="width: 350px;"> <ul> <a4j:repeat value="#{richBean.a4JComponents}" var="comp"> <li><h:link outcome="/components/#{comp}/list" value="#{richBean.components[comp]}" styleClass="link"/></li> @@ -42,7 +42,7 @@ </ul> </h:panelGroup> - <h:panelGroup id="richComponents" layout="block" style="width: 300px;"> + <h:panelGroup id="richComponents" layout="block" style="width: 350px;"> <ul> <a4j:repeat value="#{richBean.richComponents}" var="comp"> <li><h:link outcome="/components/#{comp}/list" value="#{richBean.components[comp]}" styleClass="link"/></li> @@ -50,7 +50,7 @@ </ul> </h:panelGroup> - <h:panelGroup id="otherComponents" layout="block" style="width: 300px;"> + <h:panelGroup id="otherComponents" layout="block" style="width: 350px;"> <ul> <a4j:repeat value="#{richBean.otherComponents}" var="comp"> <li><h:link outcome="/components/#{comp}/list" value="#{richBean.components[comp]}" styleClass="link"/></li> @@ -59,7 +59,7 @@ </h:panelGroup> </h:panelGrid> - <hr style="width: 900px; margin-left: 0px;"/> + <hr style="width: 1050px; margin-left: 0px;"/> #{a4j.version} #{metamer.fullVersion} Property changes on: root/tests/metamer/trunk/application/src/main/webapp/index.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jActionListener.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jAjax.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandLink.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jJSFunction.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jLog.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jMediaOutput.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jOutputPanel.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jParam.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPoll.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPush.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jQueue.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRepeat.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/commandButton.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richComponentControl.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataGrid.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataScroller.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataTable.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richFunctions.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richJQuery.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richList.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/css/richPanel.css ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/demo/actionComposite.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/flash/text.swf ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/back.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/cancel.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/female.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/help.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/home.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/male.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/refresh.png ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/richfaces.jpg ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/images/wait.gif ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/css/attributes.ecss ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/css/testPageLink.ecss ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/metamer/testPageLink.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/script/common.js ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/script/date-format.js ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/resources/script/swfobject.js ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: root/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java ___________________________________________________________________ Name: svn:keywords + Revision

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18515 - in trunk/ui: iteration/ui and 2 other directories.

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

Author: Alex.Kolonitsky Date: 2010-08-09 12:00:24 -0400 (Mon, 09 Aug 2010) New Revision: 18515 Modified: trunk/ui/iteration/api/pom.xml trunk/ui/iteration/ui/pom.xml trunk/ui/misc/ui/pom.xml trunk/ui/parent/pom.xml Log: Richfaces 4.0 restructurization of svn repository structure Modified: trunk/ui/iteration/api/pom.xml =================================================================== --- trunk/ui/iteration/api/pom.xml 2010-08-09 15:46:51 UTC (rev 18514) +++ trunk/ui/iteration/api/pom.xml 2010-08-09 16:00:24 UTC (rev 18515) @@ -22,16 +22,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-aggregator</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-api</artifactId> - <name>Richfaces UI Components: Datascroller API</name> + <artifactId>richfaces-ui-iteration-api</artifactId> + <name>Richfaces UI Components: Iteration API</name> <packaging>jar</packaging> <dependencies> Modified: trunk/ui/iteration/ui/pom.xml =================================================================== --- trunk/ui/iteration/ui/pom.xml 2010-08-09 15:46:51 UTC (rev 18514) +++ trunk/ui/iteration/ui/pom.xml 2010-08-09 16:00:24 UTC (rev 18515) @@ -24,15 +24,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-aggregator</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-ui</artifactId> - <name>Richfaces UI Components: Datascroller UI</name> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <name>Richfaces UI Components: Iteration UI</name> <packaging>jar</packaging> <build> <plugins> @@ -62,7 +61,7 @@ <dependency> <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>datascroller-api</artifactId> + <artifactId>richfaces-ui-iteration-api</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/ui/misc/ui/pom.xml =================================================================== --- trunk/ui/misc/ui/pom.xml 2010-08-09 15:46:51 UTC (rev 18514) +++ trunk/ui/misc/ui/pom.xml 2010-08-09 16:00:24 UTC (rev 18515) @@ -17,15 +17,15 @@ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-assembler</artifactId> + <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.misc</groupId> @@ -41,20 +41,6 @@ </properties> <dependencies> -  - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>componentcontrol-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>functions-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>jquery-ui</artifactId> - </dependency> -  <dependency> <groupId>${jsf2.api.groupid}</groupId> @@ -65,9 +51,14 @@ <artifactId>annotations</artifactId> <version>${org.richfaces.cdk.version}</version> </dependency> - -  <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>${project.version}</version> + </dependency> + +  + <dependency> <groupId>${jsf2.api.groupid}</groupId> <artifactId>${jsf2.api.artifactid}</artifactId> <scope>provided</scope> @@ -92,7 +83,7 @@ <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> - +  <dependency> <groupId>${jsf2.impl.groupid}</groupId> @@ -124,7 +115,7 @@ <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-mock</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> <profiles> @@ -153,46 +144,46 @@ </execution> </executions> </plugin> - <plugin> - <!– collecting jsdoc –> - <groupId>gr.abiss.mvn.plugins</groupId> - <artifactId>maven-jstools-plugin</artifactId> - <executions> - <execution> - <id>jsdoc</id> - <phase>prepare-package</phase> - <configuration> - <outputBaseDirectory>${basedir}/target</outputBaseDirectory> - <jsDir>${basedir}/target/dependency</jsDir> - <includes>**/*.js</includes> - <caseSensitive>true</caseSensitive> - </configuration> - <goals> - <goal>jsdoc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <!– pack jsdoc to jar –> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>pack-jsodcs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classesDirectory>${basedir}/target/jsdoc</classesDirectory> - <classifier>jsdoc</classifier> - </configuration> - </execution> - </executions> - </plugin> ---> - <plugin>  <artifactId>maven-javadoc-plugin</artifactId> <version>2.7</version> @@ -205,12 +196,12 @@ </goals> <configuration> <sourcepath>${basedir}/target/dependency</sourcepath> - +  </configuration> </execution> </executions> @@ -219,10 +210,12 @@ </build> </profile> </profiles> - + <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richf...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richface...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richf... + </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richface... + </developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> \ No newline at end of file Modified: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2010-08-09 15:46:51 UTC (rev 18514) +++ trunk/ui/parent/pom.xml 2010-08-09 16:00:24 UTC (rev 18515) @@ -29,13 +29,14 @@ <version>9</version> </parent> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-parent</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Miscellanous Parent</name> <packaging>pom</packaging> <properties> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> @@ -71,11 +72,6 @@ </dependency> <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <version>${org.richfaces.cdk.version}</version> @@ -151,8 +147,88 @@ </plugin> </plugins> + </build> + <dependencies> +  + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> +  + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>test</scope> + </dependency> + <dependency> +  + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <profiles> <profile> <id>release</id>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18514 - in root/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 2 other directories.

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

Author: ppitonak(a)redhat.com Date: 2010-08-09 11:46:51 -0400 (Mon, 09 Aug 2010) New Revision: 18514 Added: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/ root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java Log: RFPL-742 * added rich:toggleControl Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-08-09 15:28:50 UTC (rev 18513) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-08-09 15:46:51 UTC (rev 18514) @@ -117,6 +117,7 @@ components.put("richPanel", "Rich Panel"); components.put("richSubTable", "Rich Subtable"); components.put("richSubTableToggleControl", "Rich Subtable Toggle Control"); + components.put("richToggleControl", "Rich Toggle Control"); components.put("richTogglePanel", "Rich Toggle Panel"); } Added: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java =================================================================== --- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java (rev 0) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-08-09 15:46:51 UTC (rev 18514) @@ -0,0 +1,74 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.bean; + +import java.io.Serializable; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; +import org.richfaces.component.behavior.ToggleControl; + +import org.richfaces.tests.metamer.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean for rich:toggleControl. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean(name = "richToggleControlBean") +@ViewScoped +public class RichToggleControlBean implements Serializable { + + private static final long serialVersionUID = -1L; + private static Logger logger; + private Attributes attributes; + + /** + * Initializes the managed bean. + */ + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(getClass()); + logger.debug("initializing bean " + getClass().getName()); + + attributes = Attributes.getBehaviorAttributes(ToggleControl.class, getClass()); + + attributes.setAttribute("forPanel", "panel1"); + attributes.setAttribute("targetItem", "item1"); + + // TODO following attributes have to be tested in another way + attributes.remove("disableDefault"); + attributes.remove("event"); // has to be literal + } + + public Attributes getAttributes() { + return attributes; + } + + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } +} Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java ___________________________________________________________________ Name: svn:keywords + Revision Added: root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties =================================================================== --- root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties (rev 0) +++ root/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties 2010-08-09 15:46:51 UTC (rev 18514) @@ -0,0 +1,8 @@ +attr.forPanel.panel1=panel1 +attr.forPanel.panel2=panel2 +attr.forPanel.null= + +attr.targetItem.item1=item1 +attr.targetItem.item2=item2 +attr.targetItem.item3=item3 +attr.targetItem.null= \ No newline at end of file Added: root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml =================================================================== --- root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml (rev 0) +++ root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml 2010-08-09 15:46:51 UTC (rev 18514) @@ -0,0 +1,41 @@ + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <ui:composition template="/templates/list.xhtml"> + + <ui:define name="pageTitle">Rich Toggle Control</ui:define> + + <ui:define name="links"> + + <metamer:testPageLink id="simple" outcome="simple" value="Simple"> + Page containing a toggle panel, three rich:toggleControls and inputs for all attributes. + </metamer:testPageLink> + + </ui:define> + + </ui:composition> + +</html> Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/list.xhtml ___________________________________________________________________ Name: svn:keywords + Revision Added: root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml =================================================================== --- root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml (rev 0) +++ root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml 2010-08-09 15:46:51 UTC (rev 18514) @@ -0,0 +1,125 @@ + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich"> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + </ui:define> + + <ui:define name="component"> + + <h:panelGrid id="panel1Controls" columns="6"> + panel1: + <h:commandLink value="Toggle Panel Item 1"> + <rich:toggleControl id="tc11" forPanel="panel1" targetItem="item1" /> + </h:commandLink> + <h:outputText value=" | " /> + <h:commandLink value="Toggle Panel Item 2"> + <rich:toggleControl id="tc12" forPanel="panel1" targetItem="item2" /> + </h:commandLink> + <h:outputText value=" | " /> + <h:commandLink value="Toggle Panel Item 3"> + <rich:toggleControl id="tc13" forPanel="panel1" targetItem="item3" /> + </h:commandLink> + </h:panelGrid> + + <h:panelGrid id="panel2Controls" columns="6"> + panel2: + <h:commandLink value="Toggle Panel Item 1"> + <rich:toggleControl id="tc21" forPanel="panel2" targetItem="item1" /> + </h:commandLink> + <h:outputText value=" | " /> + <h:commandLink value="Toggle Panel Item 2"> + <rich:toggleControl id="tc22" forPanel="panel2" targetItem="item2" /> + </h:commandLink> + <h:outputText value=" | " /> + <h:commandLink value="Toggle Panel Item 3"> + <rich:toggleControl id="tc23" forPanel="panel2" targetItem="item3" /> + </h:commandLink> + </h:panelGrid> + + universal toggle control (settings below) + <h:commandLink value="Toggle Panel Item"> + <rich:toggleControl id="richToggleControl" + forPanel="#{richToggleControlBean.attributes['forPanel'].value}" + targetItem="#{richToggleControlBean.attributes['targetItem'].value}" + /> + </h:commandLink> + + + + <fieldset> + <legend>panel1</legend> + <rich:togglePanel id="panel1" activeItem="item1"> + <rich:togglePanelItem id="item11" name="item1"> + content of panel 1 + </rich:togglePanelItem> + <rich:togglePanelItem id="item12" name="item2"> + content of panel 2 + </rich:togglePanelItem> + <rich:togglePanelItem id="item13" name="item3"> + content of panel 3 + </rich:togglePanelItem> + </rich:togglePanel> + </fieldset> + + + + <fieldset> + <legend>panel2</legend> + <rich:togglePanel id="panel2" activeItem="item1"> + <rich:togglePanelItem id="item21" name="item1"> + content of panel 1 + </rich:togglePanelItem> + <rich:togglePanelItem id="item22" name="item2"> + content of panel 2 + </rich:togglePanelItem> + <rich:togglePanelItem id="item23" name="item3"> + content of panel 3 + </rich:togglePanelItem> + </rich:togglePanel> + </fieldset> + + </ui:define> + + <ui:define name="outOfTemplateAfter"> + + Attributes for the first toggle control: + + <metamer:attributes value="#{richToggleControlBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Property changes on: root/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml ___________________________________________________________________ Name: svn:keywords + Revision

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18513 - in trunk/ui: parent and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-08-09 11:28:50 -0400 (Mon, 09 Aug 2010) New Revision: 18513 Removed: trunk/ui/iteration/bom/ trunk/ui/iteration/dist/ trunk/ui/iteration/parent/ trunk/ui/iteration/tables/ Modified: trunk/ui/iteration/pom.xml trunk/ui/parent/pom.xml Log: Richfaces 4.0 restructurization of svn repository structure Modified: trunk/ui/iteration/pom.xml =================================================================== --- trunk/ui/iteration/pom.xml 2010-08-09 15:03:53 UTC (rev 18512) +++ trunk/ui/iteration/pom.xml 2010-08-09 15:28:50 UTC (rev 18513) @@ -35,12 +35,8 @@ <name>Richfaces UI Components: Iteration Aggregator</name> <modules> - <module>bom</module> - <module>parent</module> - <module>tables</module> - <module>datascroller</module> - <module>lists</module> - <module>dist</module> + <module>api</module> + <module>ui</module> </modules> <build> Modified: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2010-08-09 15:03:53 UTC (rev 18512) +++ trunk/ui/parent/pom.xml 2010-08-09 15:28:50 UTC (rev 18513) @@ -18,7 +18,8 @@ http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -51,6 +52,17 @@ </dependency> <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-bom</artifactId> <version>${org.richfaces.ui.core.version}</version> @@ -64,21 +76,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>componentcontrol-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>functions-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>jquery-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <version>${org.richfaces.cdk.version}</version> @@ -86,7 +83,6 @@ </dependencies> </dependencyManagement> - <build> <pluginManagement> <plugins> @@ -106,25 +102,46 @@ <version>2.0-alpha-4</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> <version>${org.richfaces.cdk.version}</version> - <executions> - <execution> - <id>cdk-generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <uri>http://richfaces.org/iteration</uri> + <shortName>it</shortName> + <displayName>Iteration components tags</displayName> + </taglib> + </library> + </configuration> + <executions> + <execution> + <id>cdk-generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0-beta-1</version> @@ -132,9 +149,55 @@ <fail>false</fail> </configuration> </plugin> + </plugins> </build> + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <javadocVersion>1.5</javadocVersion> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-source</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/parent</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/parent</developerConnection>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18512 - in trunk/ui/iteration: dist and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-08-09 11:03:53 -0400 (Mon, 09 Aug 2010) New Revision: 18512 Added: trunk/ui/iteration/api/ trunk/ui/iteration/ui/ Removed: trunk/ui/iteration/dist/richfaces-ui-iteration-api/ trunk/ui/iteration/dist/richfaces-ui-iteration-ui/ Log: Richfaces 4.0 restructurization of svn repository structure Copied: trunk/ui/iteration/api (from rev 18510, trunk/ui/iteration/dist/richfaces-ui-iteration-api) Copied: trunk/ui/iteration/ui (from rev 18510, trunk/ui/iteration/dist/richfaces-ui-iteration-ui)

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18511 - in trunk/ui/iteration: tables and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-08-09 10:48:02 -0400 (Mon, 09 Aug 2010) New Revision: 18511 Added: trunk/ui/iteration/pom-tables.xml Removed: trunk/ui/iteration/datascroller/ trunk/ui/iteration/tables/pom.xml Log: Richfaces 4.0 restructurization of svn repository structure Copied: trunk/ui/iteration/pom-tables.xml (from rev 18510, trunk/ui/iteration/tables/pom.xml) =================================================================== --- trunk/ui/iteration/pom-tables.xml (rev 0) +++ trunk/ui/iteration/pom-tables.xml 2010-08-09 14:48:02 UTC (rev 18511) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>tables-aggregator</artifactId> + <packaging>pom</packaging> + <name>Richfaces UI Components: Tables Aggregator</name> + + <modules> + <module>api</module> + <module>impl</module> + <module>ui</module> + </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> +</project> \ No newline at end of file Deleted: trunk/ui/iteration/tables/pom.xml =================================================================== --- trunk/ui/iteration/tables/pom.xml 2010-08-09 14:23:44 UTC (rev 18510) +++ trunk/ui/iteration/tables/pom.xml 2010-08-09 14:48:02 UTC (rev 18511) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>tables-aggregator</artifactId> - <packaging>pom</packaging> - <name>Richfaces UI Components: Tables Aggregator</name> - - <modules> - <module>api</module> - <module>impl</module> - <module>ui</module> - </modules> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/tables</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces</url> - </scm> -</project> \ No newline at end of file

15 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2010