[richfaces-svn-commits] JBoss Rich Faces SVN: r16109 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/apt and 16 other directories.

Author: alexsmirnov Date: 2009-12-10 20:44:15 -0500 (Thu, 10 Dec 2009) New Revision: 16109 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyMapModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/base-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/column-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/command-button-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/core-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/events-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/focus-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/form-form-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/i18n-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/image-button-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource2.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.EditableValueHolder.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIColumn.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UICommand.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIForm.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIGraphic.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIInput.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessage.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessages.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UINamingContainer.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutcomeTarget.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutput.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIPanel.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIParameter.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectBoolean.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItem.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItems.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectMany.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectOne.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIViewRoot.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ValueHolder.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/link-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/list-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/listbox-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/menu-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/message-message-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-format-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-label-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-text-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/table-props.xml root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/text-props.xml root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java Log: refactor model Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,86 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Collection; +import java.util.Set; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + +/** + * <p class="changed_added_4_0"> + * </p> + * + * @author asmirnov(a)exadel.com + * + */ +public class CdkClassLoader extends URLClassLoader { + + private static final URL[] EMPTY_URLS = {}; + + private Iterable<File> files; + + public CdkClassLoader(Iterable<File> files) throws MalformedURLException { + super(EMPTY_URLS); + addFiles(files); + } + + public CdkClassLoader(Iterable<File> files,ClassLoader parent) throws MalformedURLException { + super(EMPTY_URLS,parent); + addFiles(files); + } + + public CdkClassLoader(ClassLoader classLoader) { + super(EMPTY_URLS, classLoader); + } + + /** + * <p class="changed_added_4_0"></p> + * @return the files + */ + public Iterable<File> getFiles() { + return this.files; + } + + private void addFileNames(Iterable<String> files) throws MalformedURLException { + Set<File> filesSet = Sets.newHashSet(); + for (String name : files) { + File file = new File(name); + filesSet.add(file); + } + addFiles(filesSet); + } + + private void addFiles(Iterable<File> filesSet) throws MalformedURLException { + this.files = ImmutableSet.copyOf(filesSet); + for (File file : filesSet) { + addURL(file.toURI().toURL()); + } + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,15 +1,16 @@ package org.richfaces.cdk; -import org.richfaces.cdk.CdkWriter.OutputType; - import java.io.File; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"> * That interface defines context for all CDK operations * </p> * * @author asmirnov(a)exadel.com + * */ public interface CdkContext { @@ -20,11 +21,10 @@ * * @return the loader */ - public ClassLoader getLoader(); + public CdkClassLoader getLoader(); /** * <p class="changed_added_4_0">Get all sources for given type.</p> - * * @param type * @return */ @@ -33,7 +33,6 @@ /** * <p class="changed_added_4_0">Provides default output folder for given output type.</p> * TODO - define "output families" to group similar outputs ( classes, resources, tests ... ). - * * @param type of output * @return output folder for requested type. */ @@ -41,8 +40,7 @@ /** * <p class="changed_added_4_0">This method creates output file in the appropriate output folder. If target file exists and its modification time is late than model modification time from {@code lastModified} parameter, no new file will be created.</p> - * - * @param output target output folder. + * @param output target output folder. * @param relativePath path to file in the output folder. * @param lastModified model modification time. If that parameter is less then 0, no checks for existing file will be performed. * @return new created file or null if the target file exists and its modification time is late then model. @@ -51,16 +49,14 @@ /** * <p class="changed_added_4_0">Record recowerable CdkError. To avoid consequence builds of the project with many errors, all non-fatal errors ( Java compilation errors, incorrect xml fales, inconsistent component descriptions ) these error are stored in the context and marks whole build failed.</p> - * * @param error */ - public void sendError(CdkError error); + public void sendError(CdkProcessingException error); - public abstract Iterable<CdkError> getErrors(); + public abstract Iterable<CdkProcessingException> getErrors(); /** * <p class="changed_added_4_0"></p> - * * @param type * @return */ @@ -68,29 +64,52 @@ /** * <p class="changed_added_4_0"></p> - * * @param <W> * @param workerClass * @return * @throws CdkException */ - public <W extends CdkWorker> W getWorkerInstance(Class<W> workerClass) throws CdkException; + public <W extends CdkWorker> W getWorker(Class<W> workerClass) throws CdkException; + public abstract <W extends CdkWorker> W setWorker(Class<W> workerClass, W workerInstance); + /** * <p class="changed_added_4_0">Get value of configuration option.</p> * TODO make it type safe. - * * @param name option name. * @return option value or null. */ public String getOption(String name); + + /** + * <p class="changed_added_4_0">current JSF components library model</p> + * @return + */ + public ComponentLibrary getLibrary(); + public abstract ModelBuilder getBuilderFor(SourceType type) throws CdkException; + + public abstract CdkWriter getGeneratorFor(OutputType type) throws CdkException; + /** * <p class="changed_added_4_0">Id of source files e.g. Java classes, faces-configs, renderer templates</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public interface SourceType { + String getName(); } + + /** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ + public interface OutputType { + String getName(); + + OutputType getFolderType(); + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,14 +21,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.richfaces.cdk.CdkWriter.OutputType; +import com.google.common.collect.MutableClassToInstanceMap; +import org.richfaces.cdk.CdkContext.SourceType; +import org.richfaces.cdk.CdkContext.OutputType; +import org.richfaces.cdk.generate.java.ComponentClassGenerator; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.templatecompiler.RendererClassGenerator; +import org.richfaces.cdk.templatecompiler.RendererTemplateParser; +import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; +import org.richfaces.cdk.xmlconfig.FacesConfigParser; + import java.io.File; import java.io.IOException; + import java.util.Iterator; import java.util.List; import java.util.Map; @@ -36,19 +50,34 @@ /** * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that class with * tool-specific methods.</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class CdkContextBase implements CdkContext { private Map<String, String> options = Maps.newHashMap(); private Map<SourceType, Iterable<File>> sources = Maps.newHashMap(); private Map<OutputType, File> outputs = Maps.newHashMap(); private Map<SourceType, Iterable<File>> inputFolders = Maps.newHashMap(); - private Map<Class<? extends CdkWorker>, CdkWorker> workers = Maps.newHashMap(); - private List<CdkError> errors = Lists.newArrayList(); - private final ClassLoader loader; + private ClassToInstanceMap<CdkWorker> workers = MutableClassToInstanceMap.create(); + private List<CdkProcessingException> errors = Lists.newArrayList(); + private final CdkClassLoader loader; + private ComponentLibrary library; + /* Map contains writer classes for standard outputs. + */ + static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS = + ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder().put(StandardOutputs.COMPONENT_CLASSES, + ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES, + RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG, + FacesConfigGenerator.class).build(); + /** + * map contain library model builder classes for each source type. + */ + static final ImmutableMap<SourceType, Class<? extends ModelBuilder>> BUILDERS = + ImmutableMap.<SourceType, Class<? extends ModelBuilder>>builder().put(StandardSources.FACES_CONFIGS, + FacesConfigParser.class).put(StandardSources.RENDERER_TEMPLATES, + RendererTemplateParser.class).build(); - public CdkContextBase(ClassLoader loader) { + public CdkContextBase(CdkClassLoader loader) { this.loader = loader; } @@ -56,7 +85,7 @@ * (non-Javadoc) * @see org.richfaces.cdk.CdkContext#getLoader() */ - public ClassLoader getLoader() { + public CdkClassLoader getLoader() { return loader; } @@ -83,7 +112,7 @@ Iterator<OutputType> keysIterator = outputs.keySet().iterator(); while (null == outputFolder && keysIterator.hasNext()) { - CdkWriter.OutputType outputType = (CdkWriter.OutputType) keysIterator.next(); + OutputType outputType = (OutputType) keysIterator.next(); if (folderType.equals(outputType.getFolderType())) { outputFolder = outputs.get(outputType); @@ -99,12 +128,12 @@ } @Override - public void sendError(CdkError error) { + public void sendError(CdkProcessingException error) { errors.add(error); } @Override - public Iterable<CdkError> getErrors() { + public Iterable<CdkProcessingException> getErrors() { return errors; } @@ -118,8 +147,8 @@ } @Override - public <W extends CdkWorker> W getWorkerInstance(Class<W> workerClass) throws CdkException { - CdkWorker worker = workers.get(workerClass); + public <W extends CdkWorker> W getWorker(Class<W> workerClass) throws CdkException { + W worker = workers.getInstance(workerClass); if (null == worker) { @@ -127,7 +156,7 @@ try { worker = workerClass.newInstance(); worker.init(this); - workers.put(workerClass, worker); + workers.putInstance(workerClass, worker); } catch (InstantiationException e) { throw new CdkException("error to instantiate cdk component " + workerClass.getName(), e); } catch (IllegalAccessException e) { @@ -135,11 +164,12 @@ } } - return (W) worker; + return worker; } - public void addWorker(Class<? extends CdkWorker> workerClass, CdkWorker workerInstance) { - workers.put(workerClass, workerInstance); + @Override + public <W extends CdkWorker> W setWorker(Class<W> workerClass, W workerInstance) { + return workers.putInstance(workerClass, workerInstance); } @Override @@ -187,7 +217,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param options the options to set */ public void setOptions(Map<String, String> options) { @@ -198,4 +227,63 @@ public String getOption(String name) { return options.get(name); } + + /** + * This method returns instance of {@link CdkWriter} for given output type. + * @param type + * @return + * @throws CdkException + */ + @Override + public CdkWriter getGeneratorFor(OutputType type) throws CdkException { + CdkWriter generator = null; + Class<? extends CdkWriter> writerClass = CdkContextBase.WRITERS.get(type); + + if (null != writerClass) { + generator = getWorker(writerClass); + } else { + generator = new DummyGenerator(); + generator.init(this); + + // TODO - make service method for new source types. + // throw new CdkException("No generator for type " + + // type.getName()); + } + + return generator; + } + + /** + * This method returns initialized instance of the {@link ModelBuilder} for given source type. + * @param type + * @return + * @throws CdkException + */ + @Override + public ModelBuilder getBuilderFor(SourceType type) throws CdkException { + ModelBuilder builder; + Class<? extends ModelBuilder> builderClass = CdkContextBase.BUILDERS.get(type); + + if (null != builderClass) { + builder = getWorker(builderClass); + } else { + builder = new DummyBuilder(); + builder.init(this); + + // TODO - make service method for new source types. + // throw new CdkException("No model builder for source type " + + // type.getName()); + } + + return builder; + } + + @Override + public ComponentLibrary getLibrary() { + if (library == null) { + library = new ComponentLibrary(); + } + return library; + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,24 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ -public class CdkException extends Exception { +public class CdkException extends RuntimeException { /** * <p class="changed_added_4_0"></p> */ - public CdkException() { - } + public CdkException() {} /** * <p class="changed_added_4_0"></p> - * * @param message */ public CdkException(String message) { @@ -47,7 +47,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param cause */ public CdkException(Throwable cause) { @@ -56,7 +55,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param message * @param cause */ Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java (from rev 16063, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,73 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk; + +/** + * <p class="changed_added_4_0">That exception indicates recoverable CDK error, that it is, means + * errors in source code or configuration files that makes project build failed, so no result shulde be generated, + * but does not stop further processing of other classes or files. CDK should collect such errors but do not stop + * processing that let developer to know about all errors in the project.</p> + * + * @author asmirnov(a)exadel.com + * + */ +public class CdkProcessingException extends Exception { + + /** + * <p class="changed_added_4_0"></p> + */ + private static final long serialVersionUID = -3696046213271071968L; + + /** + * <p class="changed_added_4_0"></p> + */ + public CdkProcessingException() {} + + /** + * <p class="changed_added_4_0"></p> + * @param message + */ + public CdkProcessingException(String message) { + super(message); + } + + /** + * <p class="changed_added_4_0"></p> + * @param cause + */ + public CdkProcessingException(Throwable cause) { + super(cause); + } + + /** + * <p class="changed_added_4_0"></p> + * @param message + * @param cause + */ + public CdkProcessingException(String message, Throwable cause) { + super(message, cause); + } +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,14 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; /** * <p class="changed_added_4_0">Interface for all CDK worker objects ( parsers, validators, renderers etc. ). * Instances of these objects are stored in the {@link CdkContext}</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public interface CdkWorker { - public void init(CdkContext context) throws CdkException; + /** + * + */ + public void init(CdkContext context); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,21 +21,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public interface CdkWriter extends CdkWorker { + /** + * @deprecated Use {@link #render()} instead + */ public void render(ComponentLibrary library) throws CdkException; - interface OutputType { - String getName(); - - OutputType getFolderType(); - } + public void render() throws CdkException; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,14 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">This is dummy model builder class for not yet implemented source types</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class DummyBuilder implements ModelBuilder { private CdkContext context; @@ -38,14 +40,19 @@ * @see org.richfaces.cdk.ModelBuilder#build() */ @Override - public ComponentLibrary build() throws CdkException { - return new ComponentLibrary(); + public void build() throws CdkException { + // Do nothing } /* * (non-Javadoc) * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) */ + + /* + * (non-Javadoc) + * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) + */ @Override public void init(CdkContext context) { this.context = context; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,14 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">This is dummy generator for not yet implemented output types</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class DummyGenerator implements CdkWriter { private CdkContext context; @@ -38,7 +40,7 @@ * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; } @@ -46,9 +48,21 @@ * (non-Javadoc) * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary) */ + /** + * @deprecated Use {@link #render()} instead + */ @Override public void render(ComponentLibrary library) throws CdkException { + render(); + } + /* + * (non-Javadoc) + * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary) + */ + @Override + public void render() throws CdkException { + // Do nothing } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,18 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; -import com.google.common.collect.ImmutableMap; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.CdkContext.SourceType; -import org.richfaces.cdk.CdkWriter.OutputType; -import org.richfaces.cdk.apt.AptBuilder; -import org.richfaces.cdk.generate.java.ComponentClassGenerator; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.templatecompiler.RendererClassGenerator; -import org.richfaces.cdk.templatecompiler.RendererTemplateParser; -import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; -import org.richfaces.cdk.xmlconfig.FacesConfigParser; /** * <p class="changed_added_4_0"> @@ -41,28 +35,11 @@ * </p> * * @author asmirnov(a)exadel.com + * */ public final class LibraryBuilder implements CdkWorker { /** - * Map contains writer classes for standard outputs. - */ - private static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS = - ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder().put(StandardOutputs.COMPONENT_CLASSES, - ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES, - RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG, - FacesConfigGenerator.class).build(); - - /** - * map contain library model builder classes for each source type. - */ - private static final ImmutableMap<SourceType, Class<? extends ModelBuilder>> BUILDERS = - ImmutableMap.<SourceType, Class<? extends ModelBuilder>>builder().put(StandardSources.FACES_CONFIGS, - FacesConfigParser.class).put(StandardSources.JAVA_SOURCES, - AptBuilder.class).put(StandardSources.RENDERER_TEMPLATES, - RendererTemplateParser.class).build(); - - /** * <p class="changed_added_4_0"> * Current CDK context * </p> @@ -75,11 +52,10 @@ * * @param context */ - public LibraryBuilder() { - } + public LibraryBuilder() {} @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; // default workers. @@ -94,7 +70,7 @@ * @throws CdkException */ public static LibraryBuilder createInstance(CdkContext context) throws CdkException { - return context.getWorkerInstance(LibraryBuilder.class); + return context.getWorker(LibraryBuilder.class); } /** @@ -102,18 +78,16 @@ * Parse source files for annotations and populate CDK-related information * into model. * </p> + * @param library TODO + * @param sources + * Java Source files. * - * @param sources Java Source files. * @return generated library model. * @throws CdkException */ - public ComponentLibrary buildModel(SourceType type) throws CdkException { - ModelBuilder modelBuilder = getBuilderFor(type); - ComponentLibrary library = modelBuilder.build(); - - getVerifier().verify(library); - - return library; + public void buildModel(SourceType type) throws CdkException { + ModelBuilder modelBuilder = context.getBuilderFor(type); + modelBuilder.build(); } /** @@ -124,35 +98,25 @@ * @param templates * @throws CdkException */ - public ComponentLibrary buildModel() throws CdkException { - ComponentLibrary library = null; + public void build() throws CdkException { for (SourceType type : StandardSources.values()) { - ComponentLibrary model = buildModel(type); - - if (null != model) { - if (null != library) { - library.merge(model); - } else { - library = model; - } - } + buildModel(type); } - getVerifier().verify(library); + getVerifier().verify(context.getLibrary()); - return library; + generate(); } /** * Generate all types of files from library model. - * * @param library * @throws CdkException */ - public void generate(ComponentLibrary library) throws CdkException { + public void generate() throws CdkException { for (OutputType type : StandardOutputs.values()) { - generate(library, type); + generate(type); } } @@ -162,53 +126,16 @@ * </p> * * @param library model - * @param type of generated files. + * @param type of generated files. * @throws CdkException */ - public void generate(ComponentLibrary library, OutputType type) throws CdkException { - CdkWriter generator = getGeneratorFor(type); - - generator.render(library); + public void generate(OutputType type) throws CdkException { + CdkWriter generator = context.getGeneratorFor(type); + generator.render(); } /** - * This method returns instance of {@link CdkWriter} for given output type. - * - * @param type - * @return - * @throws CdkException - */ - protected CdkWriter getGeneratorFor(OutputType type) throws CdkException { - CdkWriter generator = null; - Class<? extends CdkWriter> writerClass = WRITERS.get(type); - - if (null != writerClass) { - generator = context.getWorkerInstance(writerClass); - } else { - generator = new DummyGenerator(); - generator.init(getContext()); - - // TODO - make service method for new source types. - // throw new CdkException("No generator for type " + - // type.getName()); - } - - return generator; - } - - /** * <p class="changed_added_4_0"> - * Builder method that creates new library instance. - * </p> - * - * @return - */ - public ComponentLibrary createLibrary() { - return new ComponentLibrary(); - } - - /** - * <p class="changed_added_4_0"> * Getter for the current CDK context * </p> * @@ -218,32 +145,8 @@ return context; } - /** - * This method returns initialized instance of the {@link ModelBuilder} for given source type. - * - * @param type - * @return - * @throws CdkException - */ - protected ModelBuilder getBuilderFor(SourceType type) throws CdkException { - ModelBuilder builder; - Class<? extends ModelBuilder> builderClass = BUILDERS.get(type); - if (null != builderClass) { - builder = context.getWorkerInstance(builderClass); - } else { - builder = new DummyBuilder(); - builder.init(getContext()); - - // TODO - make service method for new source types. - // throw new CdkException("No model builder for source type " + - // type.getName()); - } - - return builder; - } - protected ModelValidator getVerifier() throws CdkException { - return getContext().getWorkerInstance(ModelValidator.class); + return getContext().getWorker(ModelValidator.class); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,30 +21,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">Interface for {@link ComponentLibrary} model builder.</p> - * * @author asmirnov(a)exadel.com + * */ public interface ModelBuilder extends CdkWorker { /** * <p class="changed_added_4_0">Initialize builder.</p> - * * @param context - * @throws CdkException */ - public void init(CdkContext context) throws CdkException; + public void init(CdkContext context); /** * <p class="changed_added_4_0">Build library model.</p> - * - * @return * @throws CdkException */ - public ComponentLibrary build() throws CdkException; + public void build() throws CdkException; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -10,6 +10,7 @@ * </p> * * @author asmirnov(a)exadel.com + * */ public final class RichFacesConventions implements NamingConventions { private static final String ABSTRACT = "Abstract"; @@ -21,11 +22,10 @@ private String baseName; private CdkContext context; - public RichFacesConventions() { - } + public RichFacesConventions() {} @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; } @@ -81,8 +81,8 @@ @Override public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, - boolean baseClassIsAbstract) throws InvalidNameException { - + boolean baseClassIsAbstract) throws InvalidNameException { + String className; if (!Strings.isEmpty(explicitClass)) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,14 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; -import org.richfaces.cdk.CdkWriter.OutputType; +import org.richfaces.cdk.CdkContext.OutputType; /** * <p class="changed_added_4_0">This enumeration defines standard types of output folders.</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public enum StandardOutputFolders implements OutputType { JAVA_CLASSES, RESOURCES, TEST_JAVA_CLASSES, TEST_RESOURCES, DOCUMENTATION; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,28 +21,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; -import org.richfaces.cdk.CdkWriter.OutputType; +import org.richfaces.cdk.CdkContext.OutputType; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public enum StandardOutputs implements OutputType { - COMPONENT_CLASSES(StandardOutputFolders.JAVA_CLASSES), RENDERER_CLASSES(StandardOutputFolders.JAVA_CLASSES), + COMPONENT_CLASSES(StandardOutputFolders.JAVA_CLASSES), + RENDERER_CLASSES(StandardOutputFolders.JAVA_CLASSES), EVENT_LISTENER_CLASSES(StandardOutputFolders.JAVA_CLASSES), EVENT_SOURCE_CLASSES(StandardOutputFolders.JAVA_CLASSES), - TAG_HANDLER_CLASSES(StandardOutputFolders.JAVA_CLASSES), FACES_CONFIG(StandardOutputFolders.RESOURCES), - TAG_LIBRARY(StandardOutputFolders.RESOURCES), JBDS_RENDERERS(StandardOutputFolders.JAVA_CLASSES), - XML_SCHEMA(StandardOutputFolders.RESOURCES), COMPONENT_TEST(StandardOutputFolders.TEST_JAVA_CLASSES); + TAG_HANDLER_CLASSES(StandardOutputFolders.JAVA_CLASSES), + FACES_CONFIG(StandardOutputFolders.RESOURCES), + TAG_LIBRARY(StandardOutputFolders.RESOURCES), + JBDS_RENDERERS(StandardOutputFolders.JAVA_CLASSES), + XML_SCHEMA(StandardOutputFolders.RESOURCES), + COMPONENT_TEST(StandardOutputFolders.TEST_JAVA_CLASSES); private final OutputType folderType; /** * <p class="changed_added_4_0"></p> - * * @param folderType */ private StandardOutputs(OutputType folderType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk; import org.richfaces.cdk.model.Component; @@ -32,16 +34,14 @@ /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ public class ValidatorImpl implements ModelValidator { private CdkContext context; - private NamingConventions namingConventions; - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; - this.namingConventions = context.getWorkerInstance(NamingConventions.class); } /* @@ -55,14 +55,12 @@ // After all, merge all similar elements. compact(library.getComponents()); - compact(library.getRenderKits()); - compact(library.getRenderKits()); } protected void verifyRenderers(ComponentLibrary library) { - for (RenderKit renderKit : library.getRenderKits()) { - + for (RenderKit.Id renderKitId : library.getRenderKits().keySet()) { // Check render kit name and class. + RenderKit renderKit = library.getRenderKits().get(renderKitId); for (Renderer renderer : renderKit.getRenderers()) { // Check type. @@ -71,12 +69,11 @@ // Check superclass. // Check component type. } - compact(renderKit.getRenderers()); } } - protected void verifyComponents(ComponentLibrary library) { + protected void verifyComponents(ComponentLibrary library) throws CdkException { NamingConventions namingConventions = getNamingConventions(); for (Component component : library.getComponents()) { @@ -91,12 +88,12 @@ // Check family. // Check attributes. // Check renderers. - compact(component.getAttributes()); +// compact(component.getAttributes()); } } - private NamingConventions getNamingConventions() { - return namingConventions; + private NamingConventions getNamingConventions() throws CdkException { + return context.getWorker(NamingConventions.class); } protected void compact(Collection<?> collection) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,11 +21,39 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.apt; -import com.google.common.collect.Lists; +import java.io.File; +import java.io.IOException; + +import java.net.URL; +import java.net.URLClassLoader; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Locale; + +import javax.annotation.processing.Processor; + +import javax.tools.Diagnostic; +import javax.tools.DiagnosticListener; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.ToolProvider; +import javax.tools.Diagnostic.Kind; +import javax.tools.JavaCompiler.CompilationTask; + +import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.LibraryBuilder; import org.richfaces.cdk.Logger; import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.ModelBuilder; @@ -33,22 +61,7 @@ import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ComponentLibrary; -import javax.annotation.processing.Processor; -import javax.tools.Diagnostic; -import javax.tools.Diagnostic.Kind; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; -import java.io.File; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; +import com.google.common.collect.Lists; /** * <p class="changed_added_4_0"> @@ -56,12 +69,13 @@ * </p> * * @author asmirnov(a)exadel.com + * */ -public class AptBuilder implements ModelBuilder { +public class AptBuilder implements CdkWorker { private static final Logger LOG = LoggerFactory.getLogger(); private boolean initialized = false; private CdkContext context; - private VirtualFileManager fileManager; + private StandardJavaFileManager fileManager; private JavaCompiler javaCompiler; private Locale locale; private Iterable<String> options; @@ -69,7 +83,6 @@ /** * <p class="changed_added_4_0">Builder method that creates and initializes compiler instance. * That instance can be reused for consecuence processing.</p> - * * @param context * @return */ @@ -87,81 +100,46 @@ options.add("-implicit:class"); options.add("-verbose"); - ClassLoader classPathLoader = context.getLoader(); - StringBuilder classPathOption = new StringBuilder(); - boolean hasClassPathElement = false; + CdkClassLoader classPathLoader = context.getLoader(); - while (null != classPathLoader && classPathLoader instanceof URLClassLoader) { - URLClassLoader urlLoader = (URLClassLoader) classPathLoader; + setOptions(options); - for (URL cpElement : urlLoader.getURLs()) { - if (hasClassPathElement) { - classPathOption.append(File.pathSeparatorChar); - } else { - options.add("-classpath"); - hasClassPathElement = true; - } + // TODO - provide source files locale. + setLocale(Locale.getDefault()); - classPathOption.append(cpElement.getFile()); - } + // TODO -set locale and charset for platform-independent processing. Provide own diagnostics listener. - classPathLoader = classPathLoader.getParent(); + StandardJavaFileManager stdFileManager = javaCompiler.getStandardFileManager(null, null, null); + try { + stdFileManager.setLocation(StandardLocation.CLASS_PATH, classPathLoader.getFiles()); + File outputFolder = context.getOutputFolder(StandardOutputs.COMPONENT_CLASSES); + if (null != outputFolder) { + stdFileManager.setLocation(StandardLocation.SOURCE_OUTPUT,Collections.singleton(outputFolder)); } - - if (hasClassPathElement) { - options.add(classPathOption.toString()); - LOG.info("Compiler classpath:" + classPathOption); - } - Iterable<File> sourceFolders = context.getSourceFolders(StandardSources.JAVA_SOURCES); - File javaSource; if (null != sourceFolders && sourceFolders.iterator().hasNext()) { - options.add("-sourcepath"); - javaSource = sourceFolders.iterator().next(); - options.add(javaSource.getAbsolutePath()); - } else { - javaSource = null; + stdFileManager.setLocation(StandardLocation.SOURCE_PATH, sourceFolders); } - - if (null != context.getOutputFolder(StandardOutputs.COMPONENT_CLASSES)) { - options.add("-s"); - options.add(context.getOutputFolder(StandardOutputs.COMPONENT_CLASSES).getAbsolutePath()); + } catch (IOException e) { + throw new CdkException(e); } - - setOptions(options); - - // TODO - provide source files locale. - setLocale(Locale.getDefault()); - - // TODO -set locale and charset for platform-independent processing. Provide own diagnostics listener. - StandardJavaFileManager stdFileManager = javaCompiler.getStandardFileManager(null, null, null); - - // TODO - use standard file manager for all tasks. - VirtualFileManager fileManager = new VirtualFileManager(stdFileManager, context.getLoader()); - - fileManager.setJavaSourceDirectory(javaSource); - setFileManager(fileManager); + setFileManager(stdFileManager); initialized = true; } - @Override - public ComponentLibrary build() throws CdkException { + public void build() throws CdkException { if (!initialized) { throw new CdkException("Annotation processor is not initialized"); } - ComponentLibrary library = new ComponentLibrary(); - ComponentProcessor processor = new ComponentProcessor(context, library); + CdkProcessor processor = context.getWorker(CdkProcessor.class); process(context.getSources(StandardSources.JAVA_SOURCES), processor); - - return library; } /** * <p class="changed_added_4_0">That method process source files and call appropriate annotation processors</p> - * * @param sources * @param processors * @throws AptException @@ -178,27 +156,19 @@ } } }; - ArrayList<VirtualJavaFileObject> sourceObjects = new ArrayList<VirtualJavaFileObject>(); - for (File file : sources) { - VirtualJavaFileObject sourceObject = new VirtualJavaFileSystemObject(file); + Iterable<? extends JavaFileObject> sourceObjects = getFileManager().getJavaFileObjectsFromFiles(sources); - sourceObjects.add(sourceObject); - } - if (!sourceObjects.isEmpty()) { - CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, - sourceObjects); + CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, + sourceObjects); - task.setProcessors(Arrays.asList(processors)); - task.setLocale(locale); + task.setProcessors(Arrays.asList(processors)); + task.setLocale(locale); - if (!task.call()) { - throw new AptException("Compilation error: " + messages); - } - } else { - LOG.info("No source objects detected, skipping compilation"); - } + if (!task.call()) { + throw new AptException("Compilation error: " + messages); + } } /** @@ -215,7 +185,8 @@ * <p class="changed_added_4_0"> * </p> * - * @param options the options to set + * @param options + * the options to set */ protected void setOptions(Iterable<String> options) { this.options = options; @@ -223,25 +194,22 @@ /** * <p class="changed_added_4_0"></p> - * * @return the fileManager */ - protected VirtualFileManager getFileManager() { + protected StandardJavaFileManager getFileManager() { return fileManager; } /** * <p class="changed_added_4_0"></p> - * * @param fileManager the fileManager to set */ - protected void setFileManager(VirtualFileManager fileManager) { + protected void setFileManager(StandardJavaFileManager fileManager) { this.fileManager = fileManager; } /** * <p class="changed_added_4_0"></p> - * * @param javaCompiler the javaCompiler to set */ protected void setJavaCompiler(JavaCompiler javaCompiler) { @@ -260,7 +228,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the locale */ public Locale getLocale() { @@ -269,7 +236,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param locale the locale to set */ public void setLocale(Locale locale) { Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,56 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import javax.lang.model.element.TypeElement; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkProcessingException; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class BehaviorProcessor implements CdkAnnotationProcessor { + + /* (non-Javadoc) + * @see org.richfaces.cdk.apt.CdkAnnotationProcessor#process(javax.lang.model.element.TypeElement) + */ + @Override + public void process(TypeElement element) throws CdkProcessingException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.CdkWorker#init(org.richfaces.cdk.CdkContext) + */ + @Override + public void init(CdkContext context) { + // TODO Auto-generated method stub + + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,45 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import javax.lang.model.element.TypeElement; + +import org.richfaces.cdk.CdkProcessingException; +import org.richfaces.cdk.CdkWorker; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public interface CdkAnnotationProcessor extends CdkWorker { + + /** + * <p class="changed_added_4_0"></p> + * @param element + * @throws CdkProcessingException + */ + public void process(TypeElement element) throws CdkProcessingException; + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,27 +21,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.apt; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkProcessingException; +import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.NamingConventions; +import org.richfaces.cdk.StandardOutputs; +import org.richfaces.cdk.StandardSources; +import org.richfaces.cdk.CdkContext.OutputType; +import org.richfaces.cdk.annotations.Behavior; +import org.richfaces.cdk.annotations.Component; +import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.InvalidNameException; +import org.richfaces.cdk.util.Pair; import org.richfaces.cdk.util.PropertyUtils; +import org.richfaces.cdk.xmlconfig.FragmentParser; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; +import javax.faces.component.FacesComponent; + import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; +import javax.lang.model.element.*; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; + import java.lang.annotation.Annotation; + +import java.util.Collections; import java.util.List; import java.util.Set; @@ -52,255 +66,99 @@ * </p> * * @author asmirnov(a)exadel.com + * */ -public abstract class CdkProcessor extends AbstractProcessor { +public class CdkProcessor extends AbstractProcessor implements CdkWorker { + + private static final Set<String> ANY_ANNOTATION = Collections.singleton("*"); + private static final ImmutableList<Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>>> processors = ImmutableList + .of(Pair.of(Component.class, ComponentProcessor.class), + Pair.of(FacesComponent.class, FacesComponentProcessor.class), + Pair.of(Behavior.class, BehaviorProcessor.class)); + /** * <p class="changed_added_4_0"> * CDK context. * </p> */ - protected final CdkContext context; + private CdkContext context; /** * <p class="changed_added_4_0"> * </p> * - * @param context current CDK context + * @param context + * current CDK context + * @throws CdkException */ - protected CdkProcessor(CdkContext context) { - super(); + public void init(CdkContext context) throws CdkException { this.context = context; } - /** - * <p class="changed_added_4_0"> - * </p> - * - * @return the context - */ - protected CdkContext getContext() { - return context; - } - + @Override - public SourceVersion getSupportedSourceVersion() { + public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { + SourceUtils sourceUtils = new SourceUtils(this.processingEnv,roundEnv); + sourceUtils.init(getContext()); + getContext().setWorker(SourceUtils.class, sourceUtils); + if(!roundEnv.processingOver()){ + // Process annotations. + for (Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>> process : processors) { + processAnnotation(process.getFirst(), process.getSecond()); + } + // parse non-java sources + getContext().getBuilderFor(StandardSources.FACES_CONFIGS).build(); + getContext().getBuilderFor(StandardSources.RENDERER_TEMPLATES).build(); + } else if(!getContext().getErrors().iterator().hasNext()){ + // processing over, generate files. + for (OutputType type : StandardOutputs.values()) { + getContext().getGeneratorFor(type).render(); + } - // CDK supports Java 5 or 6 source code. - return SourceVersion.RELEASE_6; + } + getContext().setWorker(SourceUtils.class, null); + return false; } - /** - * <p class="changed_added_4_0"> - * Get all classes annotated with particular annotation. - * </p> - * - * @param round current round environment. - * @param annotation annotation class. - * @return {@link Set} of all classes annotated with {@code annotation} - * type. - */ - protected Set<? extends TypeElement> getClassesAnnotatedWith(RoundEnvironment round, - Class<? extends Annotation> annotation) { - Set<TypeElement> classes = Sets.newHashSet(); - Set<? extends Element> annotatedWith = round.getElementsAnnotatedWith(annotation); - - for (Element element : annotatedWith) { - if (ElementKind.CLASS.equals(element.getKind())) { - TypeElement classElement = (TypeElement) element; - - classes.add(classElement); + protected void processAnnotation(Class<? extends Annotation> annotation, Class<? extends CdkAnnotationProcessor> processor){ + Set<? extends TypeElement> annotatedWith = getContext().getWorker(SourceUtils.class).getClassesAnnotatedWith(annotation); + CdkAnnotationProcessor cdkAnnotationProcessor = getContext().getWorker(processor); + for (TypeElement typeElement : annotatedWith) { + try { + cdkAnnotationProcessor.process(typeElement); + } catch (CdkProcessingException e) { + sendError(typeElement, e); } } - - return classes; } + protected void sendError(TypeElement componentElement, CdkProcessingException e) { + // rise error and continue. + processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), + componentElement); + getContext().sendError(e); + } /** * <p class="changed_added_4_0"> - * Get all fields and bean properties that are annotated with given - * annotation. * </p> * - * @param annotation - * @param type - * @return + * @return the context */ - protected Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation, - TypeElement type) { - Set<BeanProperty> properties = Sets.newHashSet(); - List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type); - - // Get all methods and fields annotated by annotation. - for (Element childElement : members) { - if (null != childElement.getAnnotation(annotation)) { - - // Have an annotation, infer property name. - String name; - TypeMirror propertyType; - boolean exists = false; - - if (ElementKind.METHOD.equals(childElement.getKind())) { - ExecutableElement method = (ExecutableElement) childElement; - - propertyType = method.getReturnType(); - - List<? extends VariableElement> parameters = method.getParameters(); - - if (TypeKind.VOID.equals(propertyType.getKind()) && 1 == parameters.size()) { - - // That is setter method, get type from parameter. - propertyType = parameters.get(0).asType(); - } else if (!parameters.isEmpty()) { - - // TODO Invalid method signature for a bean property, - // throw exception ? - continue; - } - - try { - name = PropertyUtils.methodToName(childElement.getSimpleName().toString()); - } catch (InvalidNameException e) { - - // TODO Invalid method name for a bean property, throw - // exception ? - continue; - } - - exists = !method.getModifiers().contains(Modifier.ABSTRACT); - - // List<? extends TypeParameterElement> typeParameters = method.getTypeParameters(); - } else if (ElementKind.FIELD.equals(childElement.getKind())) { - name = childElement.getSimpleName().toString(); - propertyType = childElement.asType(); - - // TODO - find getter/setter, check them for abstract. - exists = true; - } else { - continue; - } - - BeanProperty property = new BeanProperty(name); - - property.type = propertyType; - property.element = childElement; - property.exists = exists; - - // TODO - merge properties with same name ? - properties.add(property); - } - } - - return properties; + protected CdkContext getContext() { + return context; } - - protected NamingConventions getNamingConventions() throws CdkException { - return getContext().getWorkerInstance(NamingConventions.class); + + @Override + public Set<String> getSupportedAnnotationTypes() { + return ANY_ANNOTATION; } - /** - * <p class="changed_added_4_0"> - * </p> - * - * @author asmirnov(a)exadel.com - */ - protected final class BeanProperty { - private Element element; - private boolean exists; - private final String name; - private TypeMirror type; + @Override + public SourceVersion getSupportedSourceVersion() { - /** - * <p class="changed_added_4_0"> - * </p> - * - * @param name - */ - public BeanProperty(String name) { - this.name = name; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - - result = prime * result + ((name == null) ? 0 : name.hashCode()); - - return result; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - BeanProperty other = (BeanProperty) obj; - - if (name == null) { - if (other.name != null) { - return false; - } - } else if (!name.equals(other.name)) { - return false; - } - - return true; - } - - /** - * <p class="changed_added_4_0"> - * </p> - * - * @return the name - */ - public String getName() { - return name; - } - - /** - * <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p> - * - * @return - */ - public String getDocComment() { - return processingEnv.getElementUtils().getDocComment(element); - } - - public TypeMirror getType() { - return type; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the exists - */ - public boolean isExists() { - return exists; - } - - public <T extends Annotation> T getAnnotation(Class<T> annotationType) { - return element.getAnnotation(annotationType); - } + // CDK supports Java 5 or 6 source code. + return SourceVersion.RELEASE_6; } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,33 +21,37 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.apt; import com.google.common.collect.Lists; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.annotations.*; +import org.richfaces.cdk.apt.SourceUtils.BeanProperty; +import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.DescriptionGroup; import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.Component.Type; import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; + import javax.faces.event.FacesEvent; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; + +import javax.lang.model.element.*; import javax.lang.model.type.MirroredTypesException; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.ElementFilter; + import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -59,119 +63,39 @@ * </p> * * @author asmirnov(a)exadel.com + * */ @SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Component.NAME}) -public class ComponentProcessor extends CdkProcessor { - private static final String FACES_COMPONENT = "javax.faces.component.FacesComponent"; - private FragmentParser fragmentParser; - private final ComponentLibrary library; +public class ComponentProcessor implements CdkAnnotationProcessor { + private CdkContext context; + public void process(TypeElement componentElement) { + ComponentLibrary library = getLibrary(); + // Process class-level annotations. + // Calculate type for base UI component class. + String explicitType = getComponentType(componentElement); + // Because component type is a primary key for components collection, we have to infer explicit + // value here. + String type = getNamingConventions().inferComponentType(explicitType, + componentElement.getQualifiedName().toString()); + org.richfaces.cdk.model.Component component = new org.richfaces.cdk.model.Component(); + component.setType(new Type(type)); + // Should that component be generated ? + setClassNames(componentElement, component); + setComponentProperties(componentElement, component); + library.getComponents().add(component); + } - /** - * <p class="changed_added_4_0"> - * </p> - * - * @param context - * @throws CdkException - */ - public ComponentProcessor(CdkContext context, ComponentLibrary library) throws CdkException { - super(context); - this.library = library; - fragmentParser = context.getWorkerInstance(FragmentParser.class); + protected String getComponentType(TypeElement componentElement) { + Component componentAnnotation = componentElement.getAnnotation(Component.class); + String explicitType = componentAnnotation.value(); + return explicitType; } - /* - * (non-Javadoc) - * - * @see javax.annotation.processing.AbstractProcessor#process(java.util.Set, - * javax.annotation.processing.RoundEnvironment) - */ - @Override - public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { - if (null != annotations && !annotations.isEmpty()) { - ComponentLibrary library = getLibrary(); - - // Process all component classes annotated with CDK @Component. - Set<? extends TypeElement> componentClasses = getClassesAnnotatedWith(roundEnv, Component.class); - - for (TypeElement componentElement : componentClasses) { - try { - - // Process class-level annotations. - // Calculate type for base UI component class. - Component componentAnnotation = componentElement.getAnnotation(Component.class); - - // Because component type is a primary key for components collection, we have to infer explicit - // value here. - String type = getNamingConventions().inferComponentType(componentAnnotation.value(), - componentElement.getQualifiedName().toString()); - org.richfaces.cdk.model.Component component = library.findOrCreateComponent(type); - - // Should that component be generated ? - setClassNames(componentElement, component); - setComponentProperties(componentElement, component); - } catch (Exception e) { - - // rise error and continue. - processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), - componentElement); - - continue; - } - } - - // process classes annotated as "FacesComponent". - TypeElement facesComponentAnnotation = this.processingEnv.getElementUtils().getTypeElement(FACES_COMPONENT); - - // TODO - extrach AnnotationMirror processing into separate methods. - Set<? extends TypeElement> annotatedWith = - ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(facesComponentAnnotation)); - - for (TypeElement element : annotatedWith) { - List<? extends AnnotationMirror> mirrors = element.getAnnotationMirrors(); - - for (AnnotationMirror mirror : mirrors) { - if (FACES_COMPONENT.equals(mirror.getAnnotationType().toString())) { - Map<? extends ExecutableElement, ? extends AnnotationValue> valuesWithDefaults = - processingEnv.getElementUtils().getElementValuesWithDefaults(mirror); - - for (Entry<? extends ExecutableElement, ? extends AnnotationValue> valueEntry - : valuesWithDefaults.entrySet()) { - Name name = valueEntry.getKey().getSimpleName(); - - if ("value".equals(name.toString())) { - try { - Object value = valueEntry.getValue().getValue(); - - if (null != value && value instanceof String) { - org.richfaces.cdk.model.Component component = - library.findOrCreateComponent(value.toString()); - ClassDescription componentClass = - new ClassDescription(element.getQualifiedName().toString()); - - component.setComponentClass(componentClass); - component.setGenerate(false); - setComponentProperties(element, component); - } - } catch (Exception e) { - - // rise error and continue. - processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, - e.getMessage(), element); - - continue; - } - } - } - } - } - } - - return true; - } - - return false; + private NamingConventions getNamingConventions() { + return context.getWorker(NamingConventions.class); } + private void setComponentProperties(TypeElement componentElement, org.richfaces.cdk.model.Component component) throws CdkException { @@ -189,11 +113,12 @@ } private void processFacets(TypeElement componentElement, org.richfaces.cdk.model.Component component) { - Set<BeanProperty> properties = getBeanPropertiesAnnotatedWith(Facet.class, componentElement); + SourceUtils sourceUtils = context.getWorker(SourceUtils.class); + Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement); // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - org.richfaces.cdk.model.Facet facet = component.findOrCreateFacet(beanProperty.getName()); + org.richfaces.cdk.model.Facet facet = component.addFacet(beanProperty.getName()); // Documentation facet.setDescription(beanProperty.getDocComment()); @@ -222,7 +147,7 @@ for (Facet facet : facets) { if (!Strings.isEmpty(facet.value())) { - component.findOrCreateFacet(facet.value()); + component.addFacet(facet.value()); } else { // TODO - record error. @@ -233,8 +158,9 @@ private void setComponentDescription(TypeElement componentElement, org.richfaces.cdk.model.Component component) { + SourceUtils sourceUtils = context.getWorker(SourceUtils.class); // JavaDoc comments - component.setDescription(this.processingEnv.getElementUtils().getDocComment(componentElement)); + component.setDescription(sourceUtils.getDocComment(componentElement)); Icon icon = componentElement.getAnnotation(Icon.class); @@ -251,7 +177,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param component * @param icon */ @@ -277,26 +202,15 @@ // @Family annotation component.setFamily(family.value()); } else { - // static final COMPONENT_FAMILY string constant. - List<VariableElement> fieldsIn = - ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(componentElement)); - - for (VariableElement field : fieldsIn) { - Set<Modifier> modifiers = field.getModifiers(); - - if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC) - && field.getSimpleName().equals("COMPONENT_FAMILY")) { - Object value = field.getConstantValue(); - - if (null != value) { - component.setFamily(value.toString()); - } - } + Object value = context.getWorker(SourceUtils.class).getConstant(componentElement, "COMPONENT_FAMILY"); + if (null != value) { + component.setFamily(value.toString()); } } } + private void setEvents(TypeElement componentElement, org.richfaces.cdk.model.Component component) { Fires fires = componentElement.getAnnotation(Fires.class); @@ -336,9 +250,9 @@ } } - protected void processAttributes(TypeElement componentElement, org.richfaces.cdk.model.Component component) + protected void processAttributes(TypeElement componentElement, final org.richfaces.cdk.model.Component component) throws CdkException { - + // Process XML files with standard attributes definitions. Attributes attributes = componentElement.getAnnotation(Attributes.class); @@ -348,25 +262,30 @@ for (String attributesConfig : includes) { // process additional properties. - component.getAttributes().addAll(fragmentParser.parseProperties(attributesConfig)); + component.getAttributes().putAll(parseProperties(attributesConfig)); } } - // Process standard information for parent classes - processTypeProperties(component, componentElement.getSuperclass()); + SourceUtils sourceUtils = context.getWorker(SourceUtils.class); + sourceUtils.visitSupertypes(componentElement.asType(), new SuperTypeVisitor() { + + @Override + public void visit(TypeMirror type) { + try { + component.getAttributes().putAll(parseProperties(CdkEntityResolver.URN_ATTRIBUTES + type.toString() + + ".xml")); + } catch (CdkException e) { - // and interfaces. - List<? extends TypeMirror> interfaces = componentElement.getInterfaces(); + // TODO - log errors ? + } + } + }); + + Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentElement); - for (TypeMirror interfaceMirror : interfaces) { - processTypeProperties(component, interfaceMirror); - } - - Set<BeanProperty> properties = getBeanPropertiesAnnotatedWith(Attribute.class, componentElement); - // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - Property attribute = component.findOrCreateAttribute(beanProperty.getName()); + Property attribute = component.addAttribute(beanProperty.getName()); // Flags Attribute attributeAnnotarion = beanProperty.getAnnotation(Attribute.class); @@ -449,6 +368,10 @@ } + private Map<String, Property> parseProperties(String attributesConfig) { + return context.getWorker(FragmentParser.class).parseProperties(CdkEntityResolver.URN_ATTRIBUTES +attributesConfig+".xml"); + } + private void setBehaviorEvent(Property attribute, EventName eventName) { if (null != eventName) { org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName(); @@ -459,32 +382,12 @@ } } - /** - * <p class="changed_added_4_0">Reccursive method to find and process standard class or interface attributes.</p> - * - * @param component - * @param interfaceMirror - */ - private void processTypeProperties(org.richfaces.cdk.model.Component component, TypeMirror interfaceMirror) { - String name = interfaceMirror.toString(); - - - List<? extends TypeMirror> supertypes = processingEnv.getTypeUtils().directSupertypes(interfaceMirror); - - for (TypeMirror supertype : supertypes) { - processTypeProperties(component, supertype); - } - - try { - component.getAttributes().addAll(fragmentParser.parseProperties(CdkEntityResolver.URN_ATTRIBUTES + name - + ".xml")); - } catch (CdkException e) { - - // TODO - log errors ? - } + public ComponentLibrary getLibrary() { + return context.getLibrary(); } - public ComponentLibrary getLibrary() { - return library; + @Override + public void init(CdkContext context) { + this.context = context; } } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,41 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import javax.faces.component.FacesComponent; +import javax.lang.model.element.TypeElement; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class FacesComponentProcessor extends ComponentProcessor { + + @Override + protected String getComponentType(TypeElement componentElement) { + FacesComponent facesComponent = componentElement.getAnnotation(FacesComponent.class); + return facesComponent.value(); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,327 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import java.lang.annotation.Annotation; +import java.util.List; +import java.util.Set; + +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.model.InvalidNameException; +import org.richfaces.cdk.util.PropertyUtils; + +import com.google.common.base.Function; +import com.google.common.collect.Sets; + +/** + * <p class="changed_added_4_0">This class provides utility methods to analayze java classes. This implementation uses APT API to get + * information about Java code.</p> + * @author asmirnov(a)exadel.com + * + */ +public class SourceUtils implements CdkWorker { + + + + /** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ + public interface SuperTypeVisitor { + public void visit(TypeMirror type); + } + + + private CdkContext context; + private final ProcessingEnvironment processingEnv; + private final RoundEnvironment roundEnvironment; + + public SourceUtils(ProcessingEnvironment processingEnv, RoundEnvironment roundEnv) { + this.processingEnv = processingEnv; + this.roundEnvironment = roundEnv; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.CdkWorker#init(org.richfaces.cdk.CdkContext) + */ + @Override + public void init(CdkContext context) { + this.context = context; + } + /** + * <p class="changed_added_4_0"> + * Get all classes annotated with particular annotation. + * </p> + * @param round + * current round environment. + * @param annotation + * annotation class. + * + * @return {@link Set} of all classes annotated with {@code annotation} + * type. + */ + public Set<? extends TypeElement> getClassesAnnotatedWith( + Class<? extends Annotation> annotation) { + Set<TypeElement> classes = Sets.newHashSet(); + Set<? extends Element> annotatedWith = roundEnvironment.getElementsAnnotatedWith(annotation); + + for (Element element : annotatedWith) { + if (ElementKind.CLASS.equals(element.getKind())) { + TypeElement classElement = (TypeElement) element; + + classes.add(classElement); + } + } + + return classes; + } + + /** + * <p class="changed_added_4_0"> + * Get all fields and bean properties that are annotated with given + * annotation. + * </p> + * + * @param annotation + * @param type + * @return + */ + protected Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation, + TypeElement type) { + Set<BeanProperty> properties = Sets.newHashSet(); + List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type); + + // Get all methods and fields annotated by annotation. + for (Element childElement : members) { + if (null != childElement.getAnnotation(annotation)) { + + // Have an annotation, infer property name. + String name; + TypeMirror propertyType; + boolean exists = false; + + if (ElementKind.METHOD.equals(childElement.getKind())) { + ExecutableElement method = (ExecutableElement) childElement; + + propertyType = method.getReturnType(); + + List<? extends VariableElement> parameters = method.getParameters(); + + if (TypeKind.VOID.equals(propertyType.getKind()) && 1 == parameters.size()) { + + // That is setter method, get type from parameter. + propertyType = parameters.get(0).asType(); + } else if (!parameters.isEmpty()) { + + // TODO Invalid method signature for a bean property, + // throw exception ? + continue; + } + + try { + name = PropertyUtils.methodToName(childElement.getSimpleName().toString()); + } catch (InvalidNameException e) { + + // TODO Invalid method name for a bean property, throw + // exception ? + continue; + } + + exists = !method.getModifiers().contains(Modifier.ABSTRACT); + + // List<? extends TypeParameterElement> typeParameters = method.getTypeParameters(); + } else if (ElementKind.FIELD.equals(childElement.getKind())) { + name = childElement.getSimpleName().toString(); + propertyType = childElement.asType(); + + // TODO - find getter/setter, check them for abstract. + exists = true; + } else { + continue; + } + + BeanProperty property = new BeanProperty(name); + + property.type = propertyType; + property.element = childElement; + property.exists = exists; + + // TODO - merge properties with same name ? + properties.add(property); + } + } + + return properties; + } + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @author asmirnov(a)exadel.com + * + */ + protected final class BeanProperty { + private Element element; + private boolean exists; + private final String name; + private TypeMirror type; + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @param name + */ + public BeanProperty(String name) { + this.name = name; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + + result = prime * result + ((name == null) ? 0 : name.hashCode()); + + return result; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if (obj == null) { + return false; + } + + if (getClass() != obj.getClass()) { + return false; + } + + BeanProperty other = (BeanProperty) obj; + + if (name == null) { + if (other.name != null) { + return false; + } + } else if (!name.equals(other.name)) { + return false; + } + + return true; + } + + /** + * <p class="changed_added_4_0"> + * </p> + * + * @return the name + */ + public String getName() { + return name; + } + + /** + * <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p> + * @return + */ + public String getDocComment() { + return processingEnv.getElementUtils().getDocComment(element); + } + + public TypeMirror getType() { + return type; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the exists + */ + public boolean isExists() { + return exists; + } + + public <T extends Annotation> T getAnnotation(Class<T> annotationType) { + return element.getAnnotation(annotationType); + } + } + + public String getDocComment(Element componentElement) { + return this.processingEnv.getElementUtils().getDocComment(componentElement); + } + + public Object getConstant(TypeElement componentElement, String name) { + List<VariableElement> fieldsIn = + ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(componentElement)); + Object value = null; + + for (VariableElement field : fieldsIn) { + Set<Modifier> modifiers = field.getModifiers(); + + if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC) + && field.getSimpleName().equals(name)) { + value = field.getConstantValue(); + } + } + return value; + } + + + public void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor){ + List<? extends TypeMirror> supertypes = this.processingEnv.getTypeUtils().directSupertypes(type); + for (TypeMirror typeMirror : supertypes) { + visitSupertypes(typeMirror, visitor); + } + visitor.visit(type); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,28 +21,36 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.freemarker; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.Property; + import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; + import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.EventName; -import org.richfaces.cdk.model.Property; -import java.util.NoSuchElementException; -import java.util.Set; - /** * <p class="changed_added_4_0"> * </p> * * @author asmirnov(a)exadel.com + * */ public class ComponentTemplateModel extends BeanModel implements TemplateModel { private final Component component; @@ -62,8 +70,10 @@ @Override public TemplateModel get(String key) throws TemplateModelException { - if ("generatedAttributes".equals(key)) { - return generatedAttributes(); + if ("attributes".equals(key)) { + return new PropertyMapModel(component.getAttributes(),wrapper); + } else if ("generatedAttributes".equals(key)) { + return new PropertyMapModel(generatedAttributes(),wrapper); } else if ("eventNames".equals(key)) { return eventNames(); } else if ("defaultEvent".equals(key)) { @@ -100,7 +110,7 @@ if (null == eventNames) { eventNames = Sets.newHashSet(); - for (Property property : component.getAttributes()) { + for (Property property : component.getAttributes().values()) { eventNames.addAll(property.getEventNames()); } } @@ -108,12 +118,12 @@ return eventNames; } - private TemplateModel generatedAttributes() throws TemplateModelException { - return wrapper.wrap(Collections2.filter(component.getAttributes(), new Predicate<Property>() { + private Map<String, Property> generatedAttributes() throws TemplateModelException { + return Maps.filterValues(component.getAttributes(), new Predicate<Property>() { @Override public boolean apply(Property input) { return input.isGenerate(); } - })); + }); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,28 +21,32 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.freemarker; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.LibraryVisitor; import org.richfaces.cdk.model.Trackable; import org.richfaces.cdk.model.Visitable; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; /** * <p class="changed_added_4_0">Base class for all output file buildes that use FreeMarker as template engine.</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public abstract class FreeMarkerRenderer<C extends Visitable, P> implements CdkWriter, LibraryVisitor<Boolean, P> { private Configuration configuration; @@ -50,7 +54,7 @@ private Template template; @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; this.configuration = new CdkConfiguration(context); @@ -61,11 +65,19 @@ } } + /** + * @deprecated Use {@link #render()} instead + */ @Override public void render(ComponentLibrary library) throws CdkException { library.accept(this, getVisitorParameter()); } + @Override + public void render() throws CdkException { + context.getLibrary().accept(this, getVisitorParameter()); + } + private P getVisitorParameter() { return null; } @@ -126,7 +138,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the context */ protected CdkContext getContext() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,19 +21,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.freemarker; import freemarker.ext.beans.BeansWrapper; + import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; + import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.Property; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class LibraryModelWrapper extends BeansWrapper implements ObjectWrapper { public LibraryModelWrapper() { @@ -53,8 +57,6 @@ if (obj instanceof Component) { templateModel = new ComponentTemplateModel((Component) obj, this); - } else if (obj instanceof Property) { - templateModel = new PropertyModel((Property) obj, this); } else { templateModel = super.wrap(obj); } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyMapModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyMapModel.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyMapModel.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,75 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.freemarker; + +import java.util.List; +import java.util.Map; + +import org.richfaces.cdk.model.Property; + +import freemarker.ext.beans.BeansWrapper; +import freemarker.ext.beans.MapModel; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class PropertyMapModel extends MapModel { + + private final Map<String, Property> map; + + /** + * <p class="changed_added_4_0"></p> + * @param map + * @param wrapper + */ + public PropertyMapModel(Map<String,Property> map, BeansWrapper wrapper) { + super(map, wrapper); + this.map = map; + } + + @Override + public TemplateModel get(String key) throws TemplateModelException { + Property property = map.get(key); + if(null != property){ + return new PropertyModel(key.toString(), property, wrapper); + } + return super.get(key); + } + + + + @Override + public Object exec(List arguments) throws TemplateModelException { + Object key = unwrap((TemplateModel)arguments.get(0)); + Property property = map.get(key); + if(null != property){ + return new PropertyModel(key.toString(), property, wrapper); + } + return super.exec(arguments); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyMapModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,34 +21,47 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.freemarker; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.util.Strings; + import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; + import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.util.Strings; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class PropertyModel extends BeanModel implements TemplateModel { private final Property property; + private final String name; /** * <p class="changed_added_4_0"></p> - * * @param object * @param wrapper */ - public PropertyModel(Property object, BeansWrapper wrapper) { + public PropertyModel(String name,Property object, BeansWrapper wrapper) { super(object, wrapper); + this.name = name; property = object; } + /** + * <p class="changed_added_4_0"></p> + * @return the name + */ + public String getName() { + return this.name; + } + @Override public TemplateModel get(String key) throws TemplateModelException { Object value; @@ -66,10 +79,10 @@ // Model utility methods. public String getGetterName() { - return property.getType().getGetterPrefix() + Strings.firstToUpperCase(property.getName().toString()); + return property.getType().getGetterPrefix() + Strings.firstToUpperCase(getName().toString()); } public String getSetterName() { - return "set" + Strings.firstToUpperCase(property.getName().toString()); + return "set" + Strings.firstToUpperCase(getName().toString()); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,12 +21,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.generate.java; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.StandardOutputs; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; @@ -36,8 +39,8 @@ /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class ComponentClassGenerator extends FreeMarkerRenderer<Component, ComponentLibrary> implements CdkWriter { @@ -46,7 +49,7 @@ * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { super.init(context); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,22 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") public class Attribute extends Property { - /** - * <p class="changed_added_4_0"></p> - * - * @param name - */ - public Attribute(Property.Name name) { - super(name); - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,32 +21,46 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") -public class Behavior implements ModelElement<Behavior, Behavior.Type> { - private final Type type; +public class Behavior implements ModelElement<Behavior> { + private Type type; + + public Behavior() { + } + public Behavior(Type type) { this.type = type; } - /* - * (non-Javadoc) - * @see org.richfaces.cdk.model.ModelElement#getType() + + /** + * <p class="changed_added_4_0"></p> + * @return the type */ - @Override - public Type getKey() { - return type; + public Type getType() { + return this.type; } + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(Type type) { + this.type = type; + } + @Override public void merge(Behavior other) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,32 +21,40 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") -public class BehaviorRenderer implements ModelElement<BehaviorRenderer, BehaviorRenderer.Type> { +public class BehaviorRenderer implements ModelElement<BehaviorRenderer> { private ClassDescription rendererClass; - private final Type type; + private Type type; public BehaviorRenderer(Type type) { this.type = type; } - @Override - public Type getKey() { - return type; + public BehaviorRenderer() { } /** * <p class="changed_added_4_0"></p> - * + * @param type the type to set + */ + public void setType(Type type) { + this.type = type; + } + + + /** + * <p class="changed_added_4_0"></p> * @return the type */ public Type getType() { @@ -55,7 +63,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the rendererClass */ public ClassDescription getRendererClass() { @@ -64,7 +71,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { @@ -83,15 +89,14 @@ /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public static final class Type extends Key { /** * <p class="changed_added_4_0"></p> - * * @param type */ public Type(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,30 +1,29 @@ package org.richfaces.cdk.model; -import com.google.common.collect.Sets; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.Facet.Name; +import java.util.Collection; +import java.util.Map; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; -import java.util.Collection; -import java.util.Set; +import org.richfaces.cdk.CdkException; + /** * That class represents JSF component in the CDK. * That is mapped to faces-config "component" element. - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") @XmlType(name = "faces-config-componentType") @XmlAccessorType(XmlAccessType.NONE) -public final class Component extends ModelElementBase implements ModelElement<Component, Component.Type> { +public final class Component extends ModelElementBase implements ModelElement<Component> { /** - * <p class="changed_added_4_0">Is that component c</p> + * <p class="changed_added_4_0">Is that component c</p> */ private boolean generate = false; @@ -33,37 +32,21 @@ * Facets recognised by the component * </p> */ - private final SearchableCollection<Facet, Facet.Name> facets = new ModelCollection<Facet, Facet.Name>() { - @Override - public Facet create(Name key) { - return new Facet(key); - } - }; + private final ModelMap<String,Facet> facets = ModelMap.create(); /** * <p class="changed_added_4_0"> * Application level events fired by the component * </p> */ - private final SearchableCollection<Event, Event.Type> events = new ModelCollection<Event, Event.Type>() { - @Override - public Event create(Event.Type key) { - return new Event(key); - } - }; + private final ModelCollection<Event> events = ModelCollection.create(); /** * <p class="changed_added_4_0"> * Component attributes * </p> */ - private final SearchableCollection<Property, Property.Name> attributes = new ModelCollection<Property, - Property.Name>() { - @Override - public Property create(Property.Name key) { - return new Property(key); - } - }; + private final ModelMap<String,Property> attributes = ModelMap.create(); /** * <p class="changed_added_4_0"> @@ -71,7 +54,7 @@ * relation. * </p> */ - private final Set<Renderer> renderers = Sets.newHashSet(); + private final ModelCollection<Renderer> renderers = ModelCollection.create(); /** * <p class="changed_added_4_0"> @@ -93,11 +76,15 @@ * Component type * </p> */ - private final Type type; + private Type type; public Component(Type key) { this.type = key; } + + public Component() { + + } @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { @@ -108,22 +95,20 @@ public void merge(Component otherComponent) { ComponentLibrary.merge(renderers, otherComponent.getRenderers()); -// TODO - merge facets, renderers, events ... - ComponentLibrary.merge(attributes, otherComponent.getAttributes()); - ComponentLibrary.merge(facets, otherComponent.getFacets()); - -// ComponentLibrary.merge(events, otherComponent.getEvents()); + //merge facets, renderers, events ... + attributes.putAll(otherComponent.getAttributes()); + facets.putAll(otherComponent.getFacets()); + ComponentLibrary.merge(events, otherComponent.getEvents()); + ComponentLibrary.merge(renderers, otherComponent.getRenderers()); ComponentLibrary.merge(this, otherComponent); } - /* - * (non-Javadoc) - * - * @see org.richfaces.cdk.model.ModelElement#getType() + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set */ - @Override - public Type getKey() { - return type; + public void setType(Type type) { + this.type = type; } @XmlElement(name = "component-type", required = true) @@ -148,7 +133,8 @@ * <p class="changed_added_4_0"> * </p> * - * @param family the family to set + * @param family + * the family to set */ public void setFamily(String family) { this.family = family; @@ -169,7 +155,8 @@ * <p class="changed_added_4_0">Represents class of that component. * </p> * - * @param componentClass the componentClass to set + * @param componentClass + * the componentClass to set */ @XmlElement(name = "component-class") public void setComponentClass(ClassDescription componentClass) { @@ -191,7 +178,8 @@ * <p class="changed_added_4_0"> * </p> * - * @param baseClass the baseClass to set + * @param baseClass + * the baseClass to set */ public void setBaseClass(ClassDescription baseClass) { this.baseClass = baseClass; @@ -199,7 +187,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the generate */ @Merge @@ -209,7 +196,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param generate the generate to set */ public void setGenerate(boolean exists) { @@ -223,36 +209,43 @@ * * @return the attributes */ - @XmlElements({@XmlElement(name = "property", type = Property.class), - @XmlElement(name = "attribute", type = Attribute.class)}) - public Collection<Property> getAttributes() { + @XmlElements({@XmlElement(name = "property", type = Property.class) , + @XmlElement(name = "attribute", type = Attribute.class) }) + public Map<String,Property> getAttributes() { return attributes; } - public Property findOrCreateAttribute(String attributeName) { + public Property addAttribute(String attributeName) { Property attribute; - attribute = attributes.findOrCreate(new Property.Name(attributeName)); + attribute = attributes.get(attributeName); + if(null == attribute){ + attribute = new Property(); + attributes.put(attributeName, attribute); + } return attribute; } /** * <p class="changed_added_4_0"></p> - * * @return the facets */ - public Collection<Facet> getFacets() { + public Map<String,Facet> getFacets() { return facets; } - public Facet findOrCreateFacet(String name) { - return facets.findOrCreate(new Facet.Name(name)); + public Facet addFacet(String name) { + Facet facet = facets.get(name); + if(null == facet){ + facet = new Facet(); + facets.put(name, facet); + } + return facet; } /** * <p class="changed_added_4_0"></p> - * * @return the events */ public Collection<Event> getEvents() { @@ -262,16 +255,18 @@ public Event addEvent(String className) { // TODO - use a single events collection from library. - return events.findOrCreate(new Event.Type(className)); + Event event = new Event(); + event.setType(new ClassDescription(className)); + events.add(event); + return event; } /** * <p class="changed_added_4_0"></p> * TODO - synchronize renderers collection with library ? - * * @return the renderers */ - public Set<Renderer> getRenderers() { + public Collection<Renderer> getRenderers() { return renderers; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,24 +21,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.model; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import org.richfaces.cdk.CdkException; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +package org.richfaces.cdk.model; + import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; + import java.io.Serializable; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import java.util.Collection; +import java.util.Map; import java.util.NoSuchElementException; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.model.RenderKit.Id; + +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; + /** * <p class="changed_added_4_0"> * That class contains model of all JSF components asscoiated with that project @@ -49,6 +58,7 @@ * </p> * * @author asmirnov(a)exadel.com + * */ @XmlRootElement(name = "faces-config", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlType(namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, name = "faces-configType") @@ -63,52 +73,19 @@ * </p> */ private static final long serialVersionUID = -6055670836731899832L; - private final SearchableCollection<Component, Component.Type> components = new ModelCollection<Component, - Component.Type>() { - @Override - public Component create(Component.Type key) { - return new Component(key); - } - }; + private final ModelCollection<Component> components = ModelCollection.create(); /** * <p class="changed_added_4_0"> * JSF renderer associated with that library * </p> */ - private final SearchableCollection<RenderKit, RenderKit.Id> renderKits = new ModelCollection<RenderKit, - RenderKit.Id>() { - @Override - public RenderKit create(RenderKit.Id key) { - RenderKit rendererKit = new RenderKit(key); - - return rendererKit; - } - }; - private final SearchableCollection<Converter, Key> converters = new ModelCollection<Converter, Key>() { - @Override - public Converter create(Key key) { - Converter converter = new Converter(key); - - return converter; - } - }; - private final SearchableCollection<Validator, Key> validators = new ModelCollection<Validator, Key>() { - @Override - public Validator create(Key key) { - Validator validator = new Validator(key); - - return validator; - } - }; - private final SearchableCollection<Listener, Key> listeners = new ModelCollection<Listener, Key>() { - @Override - public Listener create(Key key) { - Listener listener = new Listener(key); - - return listener; - } - }; + private final ModelMap<RenderKit.Id,RenderKit> renderKits = ModelMap.create(); + + private final ModelCollection<Converter> converters = ModelCollection.create(); + + private final ModelCollection<Validator> validators = ModelCollection.create(); + private final ModelCollection<Listener> listeners = ModelCollection.create(); private long lastModified = Long.MIN_VALUE; /** @@ -116,21 +93,10 @@ * Application level events fired by the component * </p> */ - private final SearchableCollection<Event, Event.Type> events = new ModelCollection<Event, Event.Type>() { - @Override - public Event create(Event.Type key) { - return new Event(key); - } - }; - private final SearchableCollection<Behavior, Behavior.Type> behaviors = new ModelCollection<Behavior, - Behavior.Type>() { - @Override - public Behavior create(Behavior.Type key) { - Behavior behavior = new Behavior(key); + private final ModelCollection<Event> events = ModelCollection.create(); - return behavior; - } - }; + private final ModelCollection<Behavior> behaviors = ModelCollection.create(); + private ConfigExtension extension; /** @@ -150,27 +116,10 @@ this.tagLibrary = new TagLibrary(); } - /** - * <p class="changed_added_4_0"> - * Merge component library model with other. - * </p> - * - * @param otherLibrary - */ - public void merge(ComponentLibrary otherLibrary) { - components.merge(otherLibrary.components); - renderKits.merge(otherLibrary.renderKits); - converters.merge(otherLibrary.converters); - validators.merge(otherLibrary.validators); - listeners.merge(otherLibrary.listeners); - events.merge(otherLibrary.events); - behaviors.merge(otherLibrary.behaviors); - } - public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { R result = accept(components, visitor, param, null); - result = accept(renderKits, visitor, param, result); + result = accept(renderKits.values(), visitor, param, result); result = accept(converters, visitor, param, result); result = accept(validators, visitor, param, result); result = accept(listeners, visitor, param, result); @@ -182,33 +131,21 @@ /** * <p class="changed_added_4_0"> - * Create a new component description. * </p> * - * @param type component type. - * @param className final component class name. - * @param superClassName name of the component superclass. May be empty or null for - * already existed components. - * @return - */ - public Component findOrCreateComponent(String type) { - Component component = components.findOrCreate(new Component.Type(type)); - - return component; - } - - /** - * <p class="changed_added_4_0"> - * </p> - * * @param renderKitId * @param rendererType * @return */ - public RenderKit findOrCreateRenderKit(String renderKitId) { + public RenderKit addRenderKit(String renderKitId) { RenderKit.Id renderKitType = new RenderKit.Id(renderKitId); - RenderKit renderKit = renderKits.findOrCreate(renderKitType); + + RenderKit renderKit = renderKits.get(renderKitType); + if(null == renderKit){ + renderKit = new RenderKit(); + renderKits.put(renderKitType, renderKit); + } return renderKit; } @@ -229,7 +166,7 @@ * * @return the renderKits */ - public Collection<RenderKit> getRenderKits() { + public Map<Id,RenderKit> getRenderKits() { return renderKits; } @@ -275,10 +212,9 @@ /** * <p class="changed_added_4_0"></p> - * * @return the events */ - public SearchableCollection<Event, Event.Type> getEvents() { + public Collection<Event> getEvents() { return events; } @@ -296,7 +232,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the extension */ public ConfigExtension getExtension() { @@ -305,7 +240,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param extension the extension to set */ public void setExtension(ConfigExtension extension) { @@ -317,15 +251,16 @@ return lastModified; } - static <K extends Key, T extends ModelElement<T, K>> void merge(Collection<T> target, Collection<T> source) { + static <T extends ModelElement<T>> void merge(Collection<T> target, Collection<T> source) { for (T element : source) { T targetElement = null; - + try { - find(target, element.getKey()); + // TODO - lookup for equivalent element in target collection. +// find(target, element.getKey()); } catch (NoSuchElementException e) { - // TODO: handle exception - } + // TODO: handle exception + } if (null == targetElement) { target.add(element); @@ -368,8 +303,8 @@ } } - static <R, P, T extends ModelElement<T, ?>> R accept(Iterable<T> components, LibraryVisitor<R, P> visitor, P param, - R result) throws CdkException { + static <R, P, T extends ModelElement<T>> R accept(Iterable<T> components, LibraryVisitor<R, P> visitor, P param, + R result) throws CdkException { if (null == result) { for (T t : components) { R accept = t.accept(visitor, param); @@ -384,26 +319,4 @@ return result; } - - /** - * <p class="changed_added_4_0"> - * Find element in the model collection. - * </p> - * - * @param <T> type of element to find. - * @param collection of elements. - * @param key for search. - * @return existing element in the collection. - * @throws NoSuchElementException if there was no such element in collection. - */ - static <K extends Key, T extends Searchable<K>> T find(Iterable<T> collection, final K key) - throws NoSuchElementException { - - return Iterables.find(collection, new Predicate<T>() { - @Override - public boolean apply(T input) { - return key.equals(input.getKey()); - } - }); - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,27 +21,31 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") -public class Converter implements ModelElement<Converter, Key> { - private final Key type; +public class Converter implements ModelElement<Converter> { + private Type type; /** * <p class="changed_added_4_0"></p> - * * @param type the type to set */ - public Converter(Key type) { + public Converter(Type type) { this.type = type; } + + public Converter() { + } @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { @@ -52,13 +56,18 @@ * (non-Javadoc) * @see org.richfaces.cdk.model.ModelElement#getType() */ - public Key getKey() { + public Type getType() { return type; } @Override public void merge(Converter other) { + } + + public static final class Type extends Key { + public Type(String name) { + super(name); + } + } - // TODO Auto-generated method stub - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; @@ -30,63 +32,55 @@ * component.</p> * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") -public class Event implements ModelElement<Event, Event.Type> { +public class Event implements ModelElement<Event> { private String description; private ClassDescription listenerInterface; private ClassDescription sourceInterface; private ClassDescription tagHandler; /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ - private final Type type; + private ClassDescription type; + /** * <p class="changed_added_4_0"></p> - * - * @param type the type to set + * @return the description */ - public Event(Type name) { - this.type = name; + public String getDescription() { + return description; } /** * <p class="changed_added_4_0"></p> - * - * @return the type + * @param description the description to set */ - public Key getType() { - return type; + public void setDescription(String description) { + this.description = description; } - @Override - public Type getKey() { - return type; - } - /** * <p class="changed_added_4_0"></p> - * - * @return the description + * @return the type */ - public String getDescription() { - return description; + public ClassDescription getType() { + return this.type; } /** * <p class="changed_added_4_0"></p> - * - * @param description the description to set + * @param type the type to set */ - public void setDescription(String description) { - this.description = description; + public void setType(ClassDescription type) { + this.type = type; } /** * <p class="changed_added_4_0"></p> - * * @return the listenerInterface */ public ClassDescription getListenerInterface() { @@ -95,7 +89,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param listenerInterface the listenerInterface to set */ public void setListenerInterface(ClassDescription listenerInterface) { @@ -104,7 +97,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the sourceInterface */ public ClassDescription getSourceInterface() { @@ -113,7 +105,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param sourceInterface the sourceInterface to set */ public void setSourceInterface(ClassDescription sourceInterface) { @@ -122,7 +113,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the tagHandler */ public ClassDescription getTagHandler() { @@ -131,7 +121,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param tagHandler the tagHandler to set */ public void setTagHandler(ClassDescription tagHandler) { @@ -147,21 +136,4 @@ public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { return visitor.visit(this, param); } - - /** - * <p class="changed_added_4_0"></p> - * - * @author asmirnov(a)exadel.com - */ - public static final class Type extends Key { - - /** - * <p class="changed_added_4_0"></p> - * - * @param type - */ - public Type(String type) { - super(type); - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,46 +21,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") -public class Facet extends ModelElementBase implements ModelElement<Facet, Facet.Name> { +public class Facet extends ModelElementBase implements ModelElement<Facet> { + private boolean generate; - private final Name name; - /** * <p class="changed_added_4_0"></p> - * * @param name */ - public Facet(Name name) { - this.name = name; + public Facet() { } /** * <p class="changed_added_4_0"></p> - * - * @return the name - */ - public Name getName() { - return name; - } - - @Override - public Name getKey() { - return name; - } - - /** - * <p class="changed_added_4_0"></p> - * * @return the generate */ public boolean isGenerate() { @@ -69,7 +53,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param generate the generate to set */ public void setGenerate(boolean generate) { @@ -85,10 +68,4 @@ public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { return visitor.visit(this, param); } - - public static final class Name extends Key { - public Name(String name) { - super(name); - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,27 +21,32 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") -public class Listener implements ModelElement<Listener, Key> { +public class Listener implements ModelElement<Listener> { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ - private final Key type; + private Type type; - public Listener(Key type) { + public Listener(Type type) { this.type = type; } + public Listener() { + } + @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { return visitor.visit(this, param); @@ -51,13 +56,27 @@ * (non-Javadoc) * @see org.richfaces.cdk.model.ModelElement#getType() */ - public Key getKey() { + public Type getType() { return type; } + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(Type type) { + this.type = type; + } + @Override public void merge(Listener other) { // TODO Auto-generated method stub } + public static final class Type extends Key { + public Type(String name) { + super(name); + } + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,66 +21,55 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; + +import org.richfaces.cdk.CdkException; + import com.google.common.base.Predicate; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import org.richfaces.cdk.CdkException; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; -import java.util.Collection; -import java.util.Iterator; - /** * <p class="changed_added_4_0"> * Base class for all model collections. * </p> * * @author asmirnov(a)exadel.com + * */ -public abstract class ModelCollection<E extends ModelElement<? super E, K>, K extends Key> - implements SearchableCollection<E, K>, Visitable, Mergeable<SearchableCollection<E, K>> { - private final BiMap<K, E> elementsMap = HashBiMap.create(); - private final BiMap<E, K> reverseMap = elementsMap.inverse(); +public class ModelCollection<E extends ModelElement<? super E>> + implements Collection<E>, Visitable { + + private final List<E> elements = Lists.newArrayList(); + + public static <T extends ModelElement<? super T>> ModelCollection<T> create(){ + return new ModelCollection<T>(); + } // TODO -provide factory methods. // private final Method factoryMethod; - @Override - public E find(final K key) { - if (null != key) { - return elementsMap.get(key); - } else { + + public E find(final Predicate<E> predicate) { + try { + return Iterables.find(elements, predicate); + } catch (NoSuchElementException e) { return null; } } @Override - public E findOrCreate(K key) { - E element = find(key); - - if (null == element) { - element = create(key); - elementsMap.put(key, element); - } - - return element; - } - - @Override - public Iterable<K> keys() { - return elementsMap.keySet(); - } - - @Override public boolean add(E e) { - E old = elementsMap.put(e.getKey(), e); - - if (null != old) { - - // TODO - merge values ? - } - - return null != old; + // TODO - merge instead of add ??? + return elements.add(e); } @Override @@ -96,39 +85,36 @@ @Override public void clear() { - elementsMap.clear(); + elements.clear(); } @SuppressWarnings("unchecked") @Override public boolean contains(Object o) { - if (o instanceof ModelElement<?, ?>) { - K key = ((ModelElement<?, K>) o).getKey(); - - return elementsMap.containsKey(key); + if (o instanceof ModelElement<?>) { + return elements.contains(o); } - return false; } @Override public boolean containsAll(Collection<?> c) { - return elementsMap.values().containsAll(c); + return elements.containsAll(c); } @Override public boolean isEmpty() { - return elementsMap.isEmpty(); + return elements.isEmpty(); } @Override public Iterator<E> iterator() { - return elementsMap.values().iterator(); + return elements.iterator(); } @Override public boolean remove(Object o) { - return null != reverseMap.remove(o); + return elements.remove(o); } @Override @@ -144,24 +130,22 @@ @Override public boolean retainAll(Collection<?> c) { - -// return elements.retainAll(c); - return false; + return elements.retainAll(c); } @Override public int size() { - return elementsMap.size(); + return elements.size(); } @Override public Object[] toArray() { - return elementsMap.values().toArray(); + return elements.toArray(); } @Override public <T> T[] toArray(T[] a) { - return elementsMap.values().toArray(a); + return elements.toArray(a); } public <R, P> R accept(org.richfaces.cdk.model.LibraryVisitor<R, P> visitor, P param) throws CdkException { @@ -175,31 +159,5 @@ return result; } - @Override - public void merge(SearchableCollection<E, K> other) { - for (E element : other) { - K key = element.getKey(); - E old = find(key); - if (null == old) { - elementsMap.put(key, element); - } else { - old.merge(element); - } - } - } - - @SuppressWarnings("unused") - private final class SearchPredicate implements Predicate<E> { - private final K key; - - private SearchPredicate(K key) { - this.key = key; - } - - @Override - public boolean apply(E input) { - return key.equals(input.getKey()); - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -2,6 +2,5 @@ import java.io.Serializable; -public interface ModelElement<T extends ModelElement<T, K>, K extends Key> - extends Serializable, Mergeable<T>, Searchable<K>, Visitable { -} +public interface ModelElement<T extends ModelElement<T>> + extends Serializable, Mergeable<T>, Visitable {} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,61 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +import java.util.LinkedHashMap; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class ModelMap<K,E extends ModelElement<? super E>> extends LinkedHashMap<K, E> { + + + public static <I,T extends ModelElement<? super T>> ModelMap<I,T> create(){ + return new ModelMap<I,T>(); + } + + + /** + * <p class="changed_added_4_0"></p> + * @param key + * @param value + * @return + * @see java.util.Map#put(java.lang.Object, java.lang.Object) + */ + public E put(K key, E value) { + E oldValue = get(key); + if(null != oldValue){ + oldValue.merge(value); + } else { + super.put(key, value); + } + return oldValue; + } + + + + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -19,10 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.richfaces.cdk.CdkException; import java.util.List; @@ -30,14 +33,14 @@ /** * That class represents JSF component property. - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") -public class Property extends ModelElementBase implements ModelElement<Property, Property.Name> { +public class Property extends ModelElementBase implements ModelElement<Property> { /** - * <p class="changed_added_4_0">Is that bean property generate in the class or should be generated ?</p> + * <p class="changed_added_4_0">Is that bean property generate in the class or should be generated ?</p> */ private boolean generate = false; private boolean hidden = false; @@ -50,43 +53,18 @@ private Set<String> aliases = Sets.newHashSet(); private String defaultValue; - /** - * <p class="changed_added_4_0">Bean property name of component attribute</p> - */ - private final Name name; private String suggestedValue; private ClassDescription type; /** * <p class="changed_added_4_0"></p> - * * @param name */ - public Property(Name name) { - if (null == name) { - throw new NullPointerException(); - } - - this.name = name; + public Property() { } - @Override - public Name getKey() { - return name; - } - /** * <p class="changed_added_4_0"></p> - * - * @return the name - */ - public Name getName() { - return name; - } - - /** - * <p class="changed_added_4_0"></p> - * * @return the type */ @Merge @@ -96,7 +74,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param type the type to set */ public void setType(ClassDescription type) { @@ -105,7 +82,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the defaultValue */ @Merge @@ -115,7 +91,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param defaultValue the defaultValue to set */ public void setDefaultValue(String dafaultValue) { @@ -124,7 +99,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the suggestedValue */ @Merge @@ -134,7 +108,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param suggestedValue the suggestedValue to set */ public void setSuggestedValue(String suggestedValue) { @@ -143,7 +116,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the generate */ @Merge @@ -153,7 +125,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param generate the generate to set */ public void setGenerate(boolean exists) { @@ -162,7 +133,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the eventNames */ @Merge @@ -172,7 +142,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param eventNames the eventNames to set */ public void setEventNames(Set<EventName> eventNames) { @@ -181,7 +150,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the hidden */ public boolean isHidden() { @@ -190,7 +158,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param hidden the hidden to set */ public void setHidden(boolean hidden) { @@ -199,7 +166,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the literal */ public boolean isLiteral() { @@ -208,7 +174,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param literal the literal to set */ public void setLiteral(boolean literal) { @@ -217,7 +182,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the required */ public boolean isRequired() { @@ -226,7 +190,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param required the required to set */ public void setRequired(boolean required) { @@ -235,7 +198,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param readOnly the readOnly to set */ public void setReadOnly(boolean readOnly) { @@ -244,7 +206,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the readOnly */ public boolean isReadOnly() { @@ -253,7 +214,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the passThrough */ public boolean isPassThrough() { @@ -262,7 +222,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param passThrough the passThrough to set */ public void setPassThrough(boolean passThrough) { @@ -271,7 +230,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the signature */ @Merge(true) @@ -281,7 +239,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param signature the signature to set */ public void setSignature(List<ClassDescription> signature) { @@ -290,7 +247,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the aliases */ public Set<String> getAliases() { @@ -299,7 +255,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param aliases the aliases to set */ public void setAliases(Set<String> aliases) { @@ -315,10 +270,4 @@ public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { return visitor.visit(this, param); } - - public static final class Name extends Key { - public Name(String name) { - super(name); - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,65 +21,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; -import org.richfaces.cdk.CdkException; +import java.util.Collection; import javax.faces.render.RenderKitFactory; -import java.util.Collection; +import org.richfaces.cdk.CdkException; + /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") -public class RenderKit extends ModelElementBase implements ModelElement<RenderKit, RenderKit.Id> { - private final SearchableCollection<Renderer, Renderer.Type> renderers = new ModelCollection<Renderer, - Renderer.Type>() { - @Override - public Renderer create(Renderer.Type key) { - Renderer renderer = new Renderer(key); +public class RenderKit extends ModelElementBase implements ModelElement<RenderKit> { + private final ModelCollection<Renderer> renderers = ModelCollection.create(); + private final ModelCollection<BehaviorRenderer> behaviorRenderers = ModelCollection.create(); - return renderer; - } - }; - private final SearchableCollection<BehaviorRenderer, BehaviorRenderer.Type> behaviorRenderers = - new ModelCollection<BehaviorRenderer, BehaviorRenderer.Type>() { - @Override - public BehaviorRenderer create(BehaviorRenderer.Type key) { - return new BehaviorRenderer(key); - } - }; - - private final Id id; private ClassDescription renderKitClass; - public RenderKit(Id id) { - this.id = id; + public RenderKit() { } - /* - * (non-Javadoc) - * @see org.richfaces.cdk.model.ModelElement#getType() - */ - @Override - public Id getKey() { - return getId(); - } - /** * <p class="changed_added_4_0"></p> - * - * @return the id - */ - public Id getId() { - return id; - } - - /** - * <p class="changed_added_4_0"></p> - * * @return the renderKitClass */ @Merge @@ -89,7 +57,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param renderKitClass the renderKitClass to set */ public void setRenderKitClass(ClassDescription renderKitClass) { @@ -98,7 +65,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the renderers */ public Collection<Renderer> getRenderers() { @@ -107,10 +73,9 @@ /** * <p class="changed_added_4_0"></p> - * * @return the behaviorRenderers */ - public SearchableCollection<BehaviorRenderer, BehaviorRenderer.Type> getBehaviorRenderers() { + public Collection<BehaviorRenderer> getBehaviorRenderers() { return behaviorRenderers; } @@ -127,45 +92,21 @@ @Override public void merge(RenderKit other) { - renderers.merge(other.renderers); + ComponentLibrary.merge(renderers,other.renderers); ComponentLibrary.merge(this, other); } - public Renderer getOrCreateRenderer(String rendererType) { - Renderer.Type type = new Renderer.Type(rendererType); - return renderers.find(type); - } - - public Renderer findOrCreateRenderer(String rendererType) { - Renderer.Type type = new Renderer.Type(rendererType); - - return renderers.findOrCreate(type); - } - - public BehaviorRenderer getOrCreateBehaviorRenderer(String rendererType) { - BehaviorRenderer.Type type = new BehaviorRenderer.Type(rendererType); - - return behaviorRenderers.find(type); - } - - public BehaviorRenderer findOrCreateBehaviorRenderer(String rendererType) { - BehaviorRenderer.Type type = new BehaviorRenderer.Type(rendererType); - - return behaviorRenderers.findOrCreate(type); - } - /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") public static final class Id extends Key { /** * <p class="changed_added_4_0"></p> - * * @param id */ public Id(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,25 +21,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; +import java.util.Map; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.templatecompiler.model.Template; /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") -public class Renderer extends ModelElementBase implements ModelElement<Renderer, Renderer.Type> { +public class Renderer extends ModelElementBase implements ModelElement<Renderer> { private String family; private ClassDescription rendererClass; private Template template; private Type type; - + private boolean rendersChildren; - + private Tag tag; /** @@ -47,17 +51,10 @@ * Component attributes * </p> */ - private final SearchableCollection<Attribute, Property.Name> attributes = new ModelCollection<Attribute, - Property.Name>() { - @Override - public Attribute create(Property.Name key) { - return new Attribute(key); - } - }; + private final ModelMap<String,Property> attributes = ModelMap.create(); + + public Renderer() {} - public Renderer() { - } - public Renderer(Type type) { this.type = type; } @@ -72,7 +69,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param type the type to set */ public void setType(Type type) { @@ -85,7 +81,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the template */ @Merge @@ -95,7 +90,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param template the template to set */ public void setTemplate(Template template) { @@ -104,7 +98,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the family */ @Merge @@ -114,7 +107,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param family the family to set */ public void setFamily(String family) { @@ -123,7 +115,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the rendererClass */ public ClassDescription getRendererClass() { @@ -132,7 +123,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { @@ -141,7 +131,6 @@ /** * <p class="changed_added_4_0"></p> - * * @return the rendersChildren */ public boolean isRendersChildren() { @@ -150,7 +139,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param rendersChildren the rendersChildren to set */ public void setRendersChildren(boolean rendersChildren) { @@ -159,16 +147,14 @@ /** * <p class="changed_added_4_0"></p> - * * @return the attributes */ - public SearchableCollection<Attribute, Property.Name> getAttributes() { + public Map<String,Property> getAttributes() { return this.attributes; } /** * <p class="changed_added_4_0"></p> - * * @return the tag */ public Tag getTag() { @@ -177,7 +163,6 @@ /** * <p class="changed_added_4_0"></p> - * * @param tag the tag to set */ public void setTag(Tag tag) { @@ -196,8 +181,8 @@ /** * <p class="changed_added_4_0">Key for lookup renderer in the model.</p> - * * @author asmirnov(a)exadel.com + * */ @SuppressWarnings("serial") public static class Type extends Key { @@ -205,7 +190,6 @@ /** * <p class="changed_added_4_0"></p> * TODO - use family as part of key ? - * * @param type */ public Type(String type) { Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Searchable.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,13 +0,0 @@ -package org.richfaces.cdk.model; - -public interface Searchable<K extends Key> { - - /** - * <p class="changed_added_4_0">Marker interface for all JSF objects: - * {@code Validator}, {@code Converter}, {@code Behavior}, {@code - * FacesListener}</p> - * - * @return the type of JSF object. - */ - public K getKey(); -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,52 +21,54 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; /** * <p class="changed_added_4_0">That bean represents VDL tag</p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class Tag { /** - * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> - * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} + * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> + * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} */ - private Searchable component; + private ModelElement<?> component; /** - * <p class="changed_added_4_0">Jsp tag class</p> + * <p class="changed_added_4_0">Jsp tag class</p> */ private String jspClass; /** - * <p class="changed_added_4_0">Tag library for which that tag is belong. - * This is bidirectional many to one relation.</p> + * <p class="changed_added_4_0">Tag library for which that tag is belong. + * This is bidirectional many to one relation.</p> */ private TagLibrary library; /** - * <p class="changed_added_4_0">Tag name</p> + * <p class="changed_added_4_0">Tag name</p> */ private String name; /** - * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> + * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> */ private String tagHandlerClass; /** - * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> + * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> */ private String tagHandlerSuperClass; - public Searchable getComponent() { + public ModelElement<?> getComponent() { return component; } - public void setComponent(Searchable component) { + public void setComponent(ModelElement<?> component) { this.component = component; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,25 +21,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") -public class Validator implements ModelElement<Validator, Key> { - private final Key type; +public class Validator implements ModelElement<Validator> { + private Type type; + public Validator() { + } + /** * <p class="changed_added_4_0"></p> - * * @param type the type to set */ - public Validator(Key type) { + public Validator(Type type) { this.type = type; } @@ -52,13 +56,28 @@ * (non-Javadoc) * @see org.richfaces.cdk.model.ModelElement#getType() */ - public Key getKey() { + public Type getType() { return type; } + + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(Type type) { + this.type = type; + } + @Override public void merge(Validator other) { // TODO Auto-generated method stub } + public static final class Type extends Key { + public Type(String name) { + super(name); + } + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -23,7 +23,10 @@ package org.richfaces.cdk.templatecompiler; -import freemarker.template.TemplateException; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; + import org.richfaces.builder.model.JavaClass; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; @@ -34,9 +37,7 @@ import org.richfaces.cdk.model.Renderer; import org.richfaces.cdk.templatecompiler.model.Template; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; +import freemarker.template.TemplateException; /** * <p class="changed_added_4_0"> @@ -53,7 +54,7 @@ * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; } @@ -64,9 +65,25 @@ * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary * ) */ + /** + * @deprecated Use {@link #render()} instead + */ @Override public void render(ComponentLibrary library) throws CdkException { - for (RenderKit renderKit : library.getRenderKits()) { + render(); + } + + /* + * (non-Javadoc) + * + * @see + * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary + * ) + */ + @Override + public void render() throws CdkException { + ComponentLibrary library = context.getLibrary(); + for (RenderKit renderKit : library.getRenderKits().values()) { for (Renderer renderer : renderKit.getRenderers()) { Template template = renderer.getTemplate(); if (null != template) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -52,24 +52,20 @@ * @see org.richfaces.cdk.ModelBuilder#build() */ @Override - public ComponentLibrary build() throws CdkException { - ComponentLibrary library = new ComponentLibrary(); + public void build() throws CdkException { + ComponentLibrary library = context.getLibrary(); for (File file : getContext().getSources(StandardSources.RENDERER_TEMPLATES)) { -// try { - Template template = parseTemplate(file); - CompositeInterface compositeInterface = template.getInterface(); - // TODO - infer values ? - RenderKit renderKit = library.findOrCreateRenderKit(compositeInterface.getRenderKitId()); - Renderer renderer = renderKit.findOrCreateRenderer(compositeInterface.getRendererType()); - String componentType = compositeInterface.getComponentType(); + Template template = parseTemplate(file); + CompositeInterface compositeInterface = template.getInterface(); + // TODO - infer values ? + RenderKit renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); + Renderer renderer = new Renderer(new Renderer.Type(compositeInterface.getRendererType())); + renderKit.getRenderers().add(renderer); + String componentType = compositeInterface.getComponentType(); - if (null != componentType) { - Component component = library.findOrCreateComponent(componentType); +// component.getRenderers().add(renderer); - component.getRenderers().add(renderer); - } - String family = compositeInterface.getComponentFamily(); if (null != family) { @@ -78,16 +74,8 @@ renderer.setRendererClass(new ClassDescription(compositeInterface.getJavaClass())); renderer.setTemplate(template); -// } catch (FileNotFoundException e) { -// throw new CdkException(e); -// } catch (XMLStreamException e) { -// throw new CdkException(e); -// } finally { -// -// } } - return library; } protected Template parseTemplate(File file) throws CdkException { @@ -99,9 +87,9 @@ * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; - jaxbBinding = context.getWorkerInstance(JAXBBinding.class); + jaxbBinding = context.getWorker(JAXBBinding.class); } public CdkContext getContext() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -134,7 +134,7 @@ @Override public Source marshal(ModelElement n, ValidationEventHandler errorHandler) { - // TODO Auto-generated method stub + // Parsed template are newer written out back. return null; } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,110 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.util; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public class Pair<A,B> { + + private final A first; + + private final B second; + + public static <X,Y> Pair<X,Y> of( X first, Y second){ + return new Pair<X, Y>(first,second); + } + + /** + * <p class="changed_added_4_0"></p> + * @param first + * @param second + */ + public Pair(A first, B second) { + this.first = first; + this.second = second; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the first + */ + public A getFirst() { + return this.first; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the second + */ + public B getSecond() { + return this.second; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((this.first == null) ? 0 : this.first.hashCode()); + result = prime * result + ((this.second == null) ? 0 : this.second.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Pair other = (Pair) obj; + if (this.first == null) { + if (other.first != null) { + return false; + } + } else if (!this.first.equals(other.first)) { + return false; + } + if (this.second == null) { + if (other.second != null) { + return false; + } + } else if (!this.second.equals(other.second)) { + return false; + } + return true; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.CdkContext; @@ -37,12 +39,12 @@ * </p> * * @author asmirnov(a)exadel.com + * */ public class FacesConfigGenerator implements CdkWriter { + private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; public static final String FACES_SCHEMA_LOCATION = ComponentLibrary.FACES_CONFIG_NAMESPACE + " " - + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; - - private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; + + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; private CdkContext context; private JAXBBinding jaxbBinding; private FacesConfigAdapter libraryAdapter; @@ -53,9 +55,9 @@ * @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; - jaxbBinding = context.getWorkerInstance(JAXBBinding.class); + jaxbBinding = context.getWorker(JAXBBinding.class); libraryAdapter = new FacesConfigAdapter(); } @@ -66,12 +68,28 @@ * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary * ) */ + /** + * @deprecated Use {@link #render()} instead + */ @Override public void render(ComponentLibrary library) throws CdkException { + render(); + } + /* + * (non-Javadoc) + * + * @see + * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary + * ) + */ + @Override + public void render() throws CdkException { + + ComponentLibrary library = context.getLibrary(); // TODO - check modification time. File facesConfigXml = context.createOutputFile(StandardOutputs.FACES_CONFIG, FACES_CONFIG_XML, - library.lastModified()); + library.lastModified()); if (null != facesConfigXml) { try { @@ -81,7 +99,7 @@ jaxbBinding.marshal(facesConfigXml, FACES_SCHEMA_LOCATION, libraryAdapter.marshal(library)); } catch (Exception e) { if (e instanceof CdkException) { - throw (CdkException) e; + throw(CdkException) e; } else { throw new CdkException(e); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.CdkContext; @@ -28,22 +30,24 @@ import org.richfaces.cdk.ModelBuilder; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; import org.richfaces.cdk.xmlconfig.model.FacesConfigBean; import java.io.File; /** * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com * - * @author asmirnov(a)exadel.com */ public class FacesConfigParser implements ModelBuilder { private CdkContext context; private JAXBBinding jaxbBinding; + + private FacesConfigAdapter ADAPTER = new FacesConfigAdapter(); /** * <p class="changed_added_4_0"></p> - * * @return the context */ public CdkContext getContext() { @@ -55,24 +59,24 @@ * @see org.richfaces.cdk.ModelBuilder#build() */ @Override - public ComponentLibrary build() throws CdkException { - ComponentLibrary library = new ComponentLibrary(); + public void build() throws CdkException { + ComponentLibrary library = context.getLibrary(); for (File file : context.getSources(StandardSources.FACES_CONFIGS)) { FacesConfigBean unmarshal = unmarshalFacesConfig(file); - - library.getComponents().addAll(unmarshal.getComponents()); - library.getRenderKits().addAll(unmarshal.getRenderKits()); - + if(null != unmarshal){ + ComponentLibrary facesConfig = ADAPTER.unmarshal(unmarshal); + library.getComponents().addAll(facesConfig.getComponents()); + library.getRenderKits().putAll(facesConfig.getRenderKits()); // TODO - merge changes into library. // library.getRenderers().addAll(unmarshal.getRenderers()); // library.getValidators().addAll(unmarshal.getValidators); // library.getConverters().addAll(unmarshal.getConverters()); // library.getBehaviors().addAll(unmarshal.getBehaviors()); // library.setExtensions(unmarshal.getExtensions()); + } } - return library; } protected FacesConfigBean unmarshalFacesConfig(File file) throws CdkException { @@ -84,8 +88,8 @@ * @see org.richfaces.cdk.ModelBuilder#init(org.richfaces.cdk.CdkContext) */ @Override - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; - jaxbBinding = context.getWorkerInstance(JAXBBinding.class); + jaxbBinding = context.getWorker(JAXBBinding.class); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,18 +21,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.xmlconfig; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.xmlconfig.model.Properties; +import org.richfaces.cdk.xmlconfig.model.ComponentAdapter; +import org.richfaces.cdk.xmlconfig.model.Fragment; -import java.util.Collection; -import java.util.Collections; - /** * <p class="changed_added_4_0"> * That class parses xml document with fragment of faces-config ( eg, standard @@ -40,24 +45,23 @@ * </p> * * @author asmirnov(a)exadel.com + * */ public class FragmentParser implements CdkWorker { - private JAXBBinding binding; private CdkContext context; + private ComponentAdapter adapter; - public FragmentParser() { - } + public FragmentParser() {} /** * <p class="changed_added_4_0"> * </p> * * @param context - * @throws CdkException */ - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { + this.adapter = new ComponentAdapter(); this.context = context; - binding = context.getWorkerInstance(JAXBBinding.class); } /** @@ -68,11 +72,23 @@ * @param url * @return */ - public Collection<Property> parseProperties(String url) throws CdkException { + public Map<String, Property> parseProperties(String url) throws CdkException { String schemaLocation = ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; - Class<Properties> bindClass = Properties.class; - Properties unmarshal = binding.unmarshal(url, schemaLocation, bindClass); + Class<Fragment> bindClass = Fragment.class; + Fragment unmarshal = getBinding().unmarshal(url, schemaLocation, bindClass); + if(null != unmarshal ){ + Component component = adapter.unmarshal(unmarshal); + return component.getAttributes(); + } else { + return Collections.<String, Property>emptyMap(); + } + } - return null == unmarshal ? Collections.<Property>emptySet() : unmarshal.getProperty(); + /** + * <p class="changed_added_4_0"></p> + * @return the binding + */ + protected JAXBBinding getBinding() { + return context.getWorker(JAXBBinding.class); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -21,34 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + + package org.richfaces.cdk.xmlconfig; -import com.google.common.collect.ImmutableSet; -import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; -import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.CdkWorker; -import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.model.Key; -import org.richfaces.cdk.model.ModelElement; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.UnmarshallerHandler; -import javax.xml.bind.util.ValidationEventCollector; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; import java.beans.Introspector; import java.beans.PropertyDescriptor; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -56,17 +35,49 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; + import java.lang.reflect.Constructor; import java.lang.reflect.Method; + import java.net.URI; import java.net.URISyntaxException; + import java.util.Collection; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.UnmarshallerHandler; +import javax.xml.bind.util.ValidationEventCollector; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; + +import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.model.Key; +import org.richfaces.cdk.model.ModelElement; + +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; + +import com.google.common.collect.ImmutableSet; + /** * <p class="changed_added_4_0"> * </p> * * @author asmirnov(a)exadel.com + * */ public class JAXBBinding implements CdkWorker { private static final FacesConfigNamespacePreffixMapper PREFFIX_MAPPER = new FacesConfigNamespacePreffixMapper(); @@ -75,8 +86,7 @@ private CdkContext context; private CdkEntityResolver resolver; - public JAXBBinding() { - } + public JAXBBinding() { } /** * <p class="changed_added_4_0"> @@ -84,7 +94,7 @@ * * @param context */ - public void init(CdkContext context) throws CdkException { + public void init(CdkContext context) { this.context = context; this.resolver = new CdkEntityResolver(context); } @@ -252,10 +262,14 @@ * object to adapter. * </p> * - * @param <A> type of adapter object - * @param <T> type of model object. - * @param adapterClass adapter class. - * @param modelObject model object class. + * @param <A> + * type of adapter object + * @param <T> + * type of model object. + * @param adapterClass + * adapter class. + * @param modelObject + * model object class. * @return initialized instance of adapter object. */ public static <A, T> A createAdapter(Class<A> adapterClass, T modelObject) throws CdkException { @@ -274,13 +288,13 @@ } } - public static <A, T extends ModelElement<? super T, K>, K extends Key> T createModelElement(Class<T> modelClass, - A adapter, K key) throws CdkException { + public static <A, T> T createModelElement(Class<T> modelClass, + A adapter) throws CdkException { try { - Constructor<T> constructor = modelClass.getConstructor(key.getClass()); - T modelBean = constructor.newInstance(key); + T modelBean = modelClass.newInstance(); + copyProperties(adapter, modelBean); copyExtensions(adapter, modelBean, false); @@ -345,11 +359,11 @@ */ private static <D> ConfigExtension createExtension(D destination) throws NoSuchMethodException, InstantiationException, IllegalAccessException { - + Method method = destination.getClass().getMethod("getExtension"); Class<? extends ConfigExtension> destinationExtensionType = (Class<? extends ConfigExtension>) method.getReturnType(); - + return destinationExtensionType.newInstance(); } @@ -378,7 +392,7 @@ Method readMethod = sourceProperty.getReadMethod(); if (!IGNORE_PROPERTIES.contains(name) && name.equals(sourceProperty.getName()) - && null != readMethod) { + && null != readMethod) { Class<?> targetType = targetProperty.getPropertyType(); Class<?> sourceType = sourceProperty.getPropertyType(); Object propertyValue = readMethod.invoke(source); Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,99 @@ +/* + * $Id: PropertyAdapter.java 16067 2009-12-04 20:11:46Z Alex.Kolonitsky $ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.model.ModelElement; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.xmlconfig.JAXBBinding; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +/** + * <p class="changed_added_4_0"></p> + * + * @author asmirnov(a)exadel.com + */ +public abstract class AdapterBase<K,V> extends XmlAdapter<K, V> { + + @Override + public K marshal(V model) throws CdkException { + K bean = JAXBBinding.createAdapter(getBeanClass(model), model); + postMarshal(model,bean); + return bean; + } + + protected void postMarshal(V model, K bean) { + // template method to perform additional conversations + } + + protected abstract Class<? extends K> getBeanClass(V model); + + @Override + public V unmarshal(K bean) throws CdkException { + V model = JAXBBinding.createModelElement(getModelClass(bean), bean); + postUnmarshal(bean,model); + return model; + } + + protected void postUnmarshal(K bean, V model) { + // template method to perform additional conversations + } + + protected abstract Class<? extends V> getModelClass(K bean); + + protected <K, B extends MapEntry<K>, M extends ModelElement<? super M>> List<B> marshalMap(Map<K,M> map, + AdapterBase<B, M> adapter) throws CdkException { + List<B> result = Lists.newArrayList(); + if(null != map && map.size()>0){ + for (Map.Entry<K, M> entry : map.entrySet()) { + B bean = adapter.marshal(entry.getValue()); + bean.setKey(entry.getKey()); + result.add(bean); + } + } + return result; + } + + protected <K,B extends MapEntry<K>, M extends ModelElement<? super M>> Map<K,M> unmarshalMap(List<B> list, + AdapterBase<B, M> adapter) throws CdkException { + Map<K,M> map = Maps.newHashMap(); + if(null != list && list.size()>0){ + for (B bean : list) { + M model = adapter.unmarshal(bean); + map.put(bean.getKey(), model); + } + } + return map; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -25,23 +25,22 @@ import org.richfaces.cdk.model.Attribute; import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> - * * @author asmirnov(a)exadel.com + * */ -public class AttributeAdapter extends XmlAdapter<AttributeBean, Attribute> { +public class AttributeAdapter extends AdapterBase<PropertyBase , Property> { + @Override - public AttributeBean marshal(Attribute v) throws Exception { - return JAXBBinding.createAdapter(AttributeBean.class, v); + protected Class<? extends PropertyBase> getBeanClass(Property prop) { + return prop instanceof Attribute?AttributeBean.class:PropertyBean.class; } @Override - public Attribute unmarshal(AttributeBean v) throws Exception { - return JAXBBinding.createModelElement(Attribute.class, v, new Property.Name(v.getName())); + protected Class<? extends Property> getModelClass(PropertyBase bean) { + return bean instanceof AttributeBean?Attribute.class:Property.class; } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -23,25 +23,17 @@ package org.richfaces.cdk.xmlconfig.model; +import javax.xml.bind.annotation.XmlElement; + import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.xmlconfig.model.PropertyBean.PropertyExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class AttributeBean extends DescriptionGroupBean implements Extensible<PropertyBean.PropertyExtension> { - private String defaultValue; - private PropertyExtension extension; - private String name; - private String suggestedValue; - private ClassDescription type; +public class AttributeBean extends PropertyBase { /** * <p class="changed_added_4_0"></p> @@ -50,89 +42,37 @@ */ @XmlElement(name = "attribute-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public String getName() { - return name; + return super.getKey(); } - /** - * <p class="changed_added_4_0"></p> - * - * @param name the name to set - */ + public void setName(String name) { - this.name = name; + super.setKey(name); } - /** * <p class="changed_added_4_0"></p> * * @return the type */ @XmlElement(name = "attribute-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - @XmlJavaTypeAdapter(ClassAdapter.class) public ClassDescription getType() { - return type; + return super.getType(); } - /** - * <p class="changed_added_4_0"></p> - * - * @param type the type to set - */ + + @Override public void setType(ClassDescription type) { - this.type = type; + super.setType(type); } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the defaultValue - */ - @XmlElement(name = "default-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDefaultValue() { - return defaultValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param defaultValue the defaultValue to set - */ - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the suggestedValue - */ - @XmlElement(name = "suggested-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getSuggestedValue() { - return suggestedValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param suggestedValue the suggestedValue to set - */ - public void setSuggestedValue(String suggestedValue) { - this.suggestedValue = suggestedValue; - } - + @Override @XmlElement(name = "attribute-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public PropertyExtension getExtension() { - return extension; + return super.getExtension(); } - /** - * <p class="changed_added_4_0"></p> - * - * @param extension the extension to set - */ @Override public void setExtension(PropertyExtension extension) { - this.extension = extension; + super.setExtension(extension); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,14 +33,15 @@ * * @author asmirnov(a)exadel.com */ -public class BehaviorRendererAdapter extends XmlAdapter<BehaviorRendererBean, BehaviorRenderer> { +public class BehaviorRendererAdapter extends AdapterBase<BehaviorRendererBean, BehaviorRenderer> { + @Override - public BehaviorRendererBean marshal(BehaviorRenderer v) throws Exception { - return JAXBBinding.createAdapter(BehaviorRendererBean.class, v); + protected Class<? extends BehaviorRendererBean> getBeanClass(BehaviorRenderer model) { + return BehaviorRendererBean.class; } @Override - public BehaviorRenderer unmarshal(BehaviorRendererBean v) throws Exception { - return JAXBBinding.createModelElement(BehaviorRenderer.class, v, new BehaviorRenderer.Type(v.getType())); + protected Class<? extends BehaviorRenderer> getModelClass(BehaviorRendererBean bean) { + return BehaviorRenderer.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -23,30 +23,48 @@ package org.richfaces.cdk.xmlconfig.model; + import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.xmlconfig.JAXBBinding; +import org.richfaces.cdk.model.Component.Type; -import javax.xml.bind.annotation.adapters.XmlAdapter; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class ComponentAdapter extends XmlAdapter<ComponentBean, Component> { +public class ComponentAdapter extends AdapterBase<ComponentBean, Component> { + + private final AttributeAdapter ATTRIBUTE_ADAPTER = new AttributeAdapter(); + + private final FacetAdapter FACET_ADAPTER = new FacetAdapter(); + @Override - public ComponentBean marshal(Component v) throws Exception { - ComponentBean bean = JAXBBinding.createAdapter(ComponentBean.class, v); - - // TODO - copy renderer types. - return bean; + protected Class<? extends ComponentBean> getBeanClass(Component c) { + return ComponentBean.class; } @Override - public Component unmarshal(ComponentBean v) throws Exception { - Component component = JAXBBinding.createModelElement(Component.class, v, new Component.Type(v.getType())); - - // TODO - copy renderer types. - return component; + protected Class<? extends Component> getModelClass(ComponentBean b) { + return Component.class; } + + @Override + protected void postMarshal(Component model, ComponentBean bean) { + // Copy properties/attributes + bean.setAttributes(marshalMap(model.getAttributes(),ATTRIBUTE_ADAPTER)); + bean.setFacets(marshalMap(model.getFacets(),FACET_ADAPTER)); + } + + @Override + protected void postUnmarshal(ComponentBean bean,Component model) { + // Copy type. + String type = bean.getType(); + if(null != type){ + model.setType(new Type(type.trim())); + } + // Copy properties/attributes + model.getAttributes().putAll(unmarshalMap(bean.getAttributes(), ATTRIBUTE_ADAPTER)); + model.getFacets().putAll(unmarshalMap(bean.getFacets(), FACET_ADAPTER)); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -43,9 +43,10 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "faces-config-componentType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) +(a)XmlJavaTypeAdapter(ComponentAdapter.class) public class ComponentBean extends ExtensibleBean<ComponentBean.ComponentExtension> { - private List<Property> attributes = Lists.newArrayList(); - private List<Facet> facets = Lists.newArrayList(); + private List<PropertyBase> attributes = Lists.newArrayList(); + private List<FacetBean> facets = Lists.newArrayList(); private ClassDescription componentClass; private String type; @@ -104,7 +105,7 @@ )}) // @XmlElement(name="attributes",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public List<Property> getAttributes() { + public List<PropertyBase> getAttributes() { return attributes; } @@ -113,7 +114,7 @@ * * @param attributes the attributes to set */ - public void setAttributes(List<Property> property) { + public void setAttributes(List<PropertyBase> property) { this.attributes = property; } @@ -123,8 +124,7 @@ * @return the facets */ @XmlElement(name = "facet", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - @XmlJavaTypeAdapter(FacetAdapter.class) - public List<Facet> getFacets() { + public List<FacetBean> getFacets() { return facets; } @@ -133,7 +133,7 @@ * * @param facets the facets to set */ - public void setFacets(List<Facet> facets) { + public void setFacets(List<FacetBean> facets) { this.facets = facets; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,14 +33,16 @@ * * @author asmirnov(a)exadel.com */ -public class EventAdapter extends XmlAdapter<EventBean, Event> { +public class EventAdapter extends AdapterBase<EventBean, Event> { + @Override - public EventBean marshal(Event v) throws Exception { - return JAXBBinding.createAdapter(EventBean.class, v); + protected Class<? extends EventBean> getBeanClass(Event model) { + return EventBean.class; } @Override - public Event unmarshal(EventBean v) throws Exception { - return JAXBBinding.createModelElement(Event.class, v, new Event.Type(v.getType())); + protected Class<? extends Event> getModelClass(EventBean bean) { + return Event.class; } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,21 +33,27 @@ * * @author asmirnov(a)exadel.com */ -public class FacesConfigAdapter extends XmlAdapter<FacesConfigBean, ComponentLibrary> { +public class FacesConfigAdapter extends AdapterBase<FacesConfigBean, ComponentLibrary> { + + private static final RenderKitAdapter ADAPTER = new RenderKitAdapter(); + @Override - public FacesConfigBean marshal(ComponentLibrary v) throws Exception { - FacesConfigBean facesConfigBean = JAXBBinding.createAdapter(FacesConfigBean.class, v); + protected Class<? extends FacesConfigBean> getBeanClass(ComponentLibrary model) { + return FacesConfigBean.class; + } - return facesConfigBean; + @Override + protected Class<? extends ComponentLibrary> getModelClass(FacesConfigBean bean) { + return ComponentLibrary.class; } @Override - public ComponentLibrary unmarshal(FacesConfigBean v) throws Exception { - ComponentLibrary library = new ComponentLibrary(); - - JAXBBinding.copyProperties(v, library); - JAXBBinding.copyExtensions(v, library, false); - - return library; + protected void postMarshal(ComponentLibrary model, FacesConfigBean bean) { + bean.setRenderKits(marshalMap(model.getRenderKits(), ADAPTER)); } + + @Override + protected void postUnmarshal(FacesConfigBean bean, ComponentLibrary model) { + model.getRenderKits().putAll(unmarshalMap(bean.getRenderKits(), ADAPTER)); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -48,8 +48,7 @@ @XmlJavaTypeAdapter(ComponentAdapter.class) private List<Component> components = Lists.newArrayList(); @XmlElement(name = "render-kit", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - @XmlJavaTypeAdapter(RenderKitAdapter.class) - private List<RenderKit> renderKits = Lists.newArrayList(); + private List<RenderKitBean> renderKits = Lists.newArrayList(); private String version = "2.0"; private FacesConfigExtension extension; @@ -95,7 +94,7 @@ * * @return the renderKits */ - public List<RenderKit> getRenderKits() { + public List<RenderKitBean> getRenderKits() { return renderKits; } @@ -104,7 +103,7 @@ * * @param renderKits the renderKits to set */ - public void setRenderKits(List<RenderKit> renderKits) { + public void setRenderKits(List<RenderKitBean> renderKits) { this.renderKits = renderKits; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,14 +33,15 @@ * * @author asmirnov(a)exadel.com */ -public class FacetAdapter extends XmlAdapter<FacetBean, Facet> { +public class FacetAdapter extends AdapterBase<FacetBean, Facet> { + @Override - public FacetBean marshal(Facet v) throws Exception { - return JAXBBinding.createAdapter(FacetBean.class, v); + protected Class<? extends FacetBean> getBeanClass(Facet model) { + return FacetBean.class; } @Override - public Facet unmarshal(FacetBean v) throws Exception { - return JAXBBinding.createModelElement(Facet.class, v, new Facet.Name(v.getName())); + protected Class<? extends Facet> getModelClass(FacetBean bean) { + return Facet.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,7 +33,7 @@ * * @author asmirnov(a)exadel.com */ -public class FacetBean extends ExtensibleBean<FacetBean.FacetExtension> { +public class FacetBean extends ExtensibleBean<FacetBean.FacetExtension> implements MapEntry<String>{ private String name; /** @@ -42,7 +42,7 @@ * @return the name */ @XmlElement(name = "facet-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getName() { + public String getKey() { return name; } @@ -51,7 +51,7 @@ * * @param name the name to set */ - public void setName(String name) { + public void setKey(String name) { this.name = name; } Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java (from rev 16097, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,47 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import com.google.common.collect.Maps; + +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.Property; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import java.util.List; +import java.util.Map; + +/** + * <p class="changed_added_4_0"></p> + * + * @author asmirnov(a)exadel.com + */ +@XmlRootElement(name = "properties", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) +public class Fragment extends ComponentBean { + +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,37 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public interface MapEntry<T> { + + public T getKey(); + + public void setKey(T key); + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,68 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.xmlconfig.model; - -import com.google.common.collect.Lists; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Property; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import java.util.List; - -/** - * <p class="changed_added_4_0"></p> - * - * @author asmirnov(a)exadel.com - */ -@XmlRootElement(name = "properties", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) -public class Properties { - private List<Property> property = Lists.newArrayList(); - - /** - * <p class="changed_added_4_0"></p> - * - * @return the property - */ - @XmlElements({@XmlElement( - name = "property", - namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - type = PropertyBean.class - ), @XmlElement(name = "attribute", type = PropertyBean.class)}) - -// @XmlElement(name="property",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) - public List<Property> getProperty() { - return property; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param property the property to set - */ - public void setProperty(List<Property> property) { - this.property = property; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,46 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.xmlconfig.model; - -import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.xmlconfig.JAXBBinding; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - -/** - * <p class="changed_added_4_0"></p> - * - * @author asmirnov(a)exadel.com - */ -public class PropertyAdapter extends XmlAdapter<PropertyBean, Property> { - @Override - public PropertyBean marshal(Property v) throws Exception { - return JAXBBinding.createAdapter(PropertyBean.class, v); - } - - @Override - public Property unmarshal(PropertyBean v) throws Exception { - return JAXBBinding.createModelElement(Property.class, v, new Property.Name(v.getName())); - } -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,324 @@ +/* + * $Id: PropertyBean.java 16067 2009-12-04 20:11:46Z Alex.Kolonitsky $ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.EventName; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; +import java.util.Set; + +/** + * <p class="changed_added_4_0"></p> + * + * @author asmirnov(a)exadel.com + */ +public class PropertyBase extends ExtensibleBean<PropertyBase.PropertyExtension> implements MapEntry<String> { + private String defaultValue; + private String name; + private String suggestedValue; + private ClassDescription type; + + /** + * <p class="changed_added_4_0"></p> + * + * @return the name + */ + public String getKey() { + return name; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param name the name to set + */ + public void setKey(String name) { + this.name = name; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the type + */ + @XmlJavaTypeAdapter(ClassAdapter.class) + public ClassDescription getType() { + return type; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param type the type to set + */ + public void setType(ClassDescription type) { + this.type = type; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the defaultValue + */ + @XmlElement(name = "default-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getDefaultValue() { + return defaultValue; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param defaultValue the defaultValue to set + */ + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the suggestedValue + */ + @XmlElement(name = "suggested-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getSuggestedValue() { + return suggestedValue; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param suggestedValue the suggestedValue to set + */ + public void setSuggestedValue(String suggestedValue) { + this.suggestedValue = suggestedValue; + } + + @Override + public PropertyExtension getExtension() { + return super.getExtension(); + } + + @Override + public void setExtension(PropertyExtension extension) { + super.setExtension(extension); + } + + /** + * <p class="changed_added_4_0"></p> + * + * @author asmirnov(a)exadel.com + */ + public static class PropertyExtension extends ConfigExtension { + private boolean passThrough = false; + private Set<EventName> eventNames = Sets.newHashSet(); + private List<ClassDescription> signature = Lists.newArrayList(); + private Set<String> aliases = Sets.newHashSet(); + private boolean generate; + private boolean hidden; + private boolean literal; + private boolean readOnly; + private boolean required; + + /** + * <p class="changed_added_4_0"></p> + * + * @return the generate + */ + @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isGenerate() { + return generate; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param generate the generate to set + */ + public void setGenerate(boolean generate) { + this.generate = generate; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the hidden + */ + @XmlElement(name = "hidden", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isHidden() { + return hidden; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param hidden the hidden to set + */ + public void setHidden(boolean hidden) { + this.hidden = hidden; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the literal + */ + @XmlElement(name = "literal", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isLiteral() { + return literal; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param literal the literal to set + */ + public void setLiteral(boolean literal) { + this.literal = literal; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the required + */ + @XmlElement(name = "required", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isRequired() { + return required; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param required the required to set + */ + public void setRequired(boolean required) { + this.required = required; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the readOnly + */ + @XmlElement(name = "read-only", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isReadOnly() { + return readOnly; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param readOnly the readOnly to set + */ + public void setReadOnly(boolean readOnly) { + this.readOnly = readOnly; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the passThrough + */ + @XmlElement(name = "pass-through", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public boolean isPassThrough() { + return passThrough; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param passThrough the passThrough to set + */ + public void setPassThrough(boolean passThrough) { + this.passThrough = passThrough; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the eventNames + */ + @XmlElement(name = "event-name", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public Set<EventName> getEventNames() { + return eventNames; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param eventNames the eventNames to set + */ + public void setEventNames(Set<EventName> eventNames) { + this.eventNames = eventNames; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the signature + */ + @XmlElementWrapper(name = "signature", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + @XmlElement(name = "param", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + @XmlJavaTypeAdapter(ClassAdapter.class) + public List<ClassDescription> getSignature() { + return signature; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param signature the signature to set + */ + public void setSignature(List<ClassDescription> signature) { + this.signature = signature; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @return the aliases + */ + @XmlElement(name = "alias", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) + public Set<String> getAliases() { + return aliases; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param aliases the aliases to set + */ + public void setAliases(Set<String> aliases) { + this.aliases = aliases; + } + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -23,29 +23,17 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import javax.xml.bind.annotation.XmlElement; + import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.EventName; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; -import java.util.Set; - /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class PropertyBean extends ExtensibleBean<PropertyBean.PropertyExtension> { - private String defaultValue; - private String name; - private String suggestedValue; - private ClassDescription type; +public class PropertyBean extends PropertyBase { /** * <p class="changed_added_4_0"></p> @@ -53,77 +41,31 @@ * @return the name */ @XmlElement(name = "property-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getName() { - return name; + public String getKey() { + return super.getKey(); } - /** - * <p class="changed_added_4_0"></p> - * - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + @Override + public void setKey(String name) { + super.setKey(name); + } /** * <p class="changed_added_4_0"></p> * * @return the type */ @XmlElement(name = "property-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - @XmlJavaTypeAdapter(ClassAdapter.class) public ClassDescription getType() { - return type; + return super.getType(); } - /** - * <p class="changed_added_4_0"></p> - * - * @param type the type to set - */ + + @Override public void setType(ClassDescription type) { - this.type = type; + super.setType(type); } - /** - * <p class="changed_added_4_0"></p> - * - * @return the defaultValue - */ - @XmlElement(name = "default-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getDefaultValue() { - return defaultValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param defaultValue the defaultValue to set - */ - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the suggestedValue - */ - @XmlElement(name = "suggested-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - public String getSuggestedValue() { - return suggestedValue; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param suggestedValue the suggestedValue to set - */ - public void setSuggestedValue(String suggestedValue) { - this.suggestedValue = suggestedValue; - } - @Override @XmlElement(name = "property-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public PropertyExtension getExtension() { @@ -134,194 +76,4 @@ public void setExtension(PropertyExtension extension) { super.setExtension(extension); } - - /** - * <p class="changed_added_4_0"></p> - * - * @author asmirnov(a)exadel.com - */ - public static class PropertyExtension extends ConfigExtension { - private boolean passThrough = false; - private Set<EventName> eventNames = Sets.newHashSet(); - private List<ClassDescription> signature = Lists.newArrayList(); - private Set<String> aliases = Sets.newHashSet(); - private boolean generate; - private boolean hidden; - private boolean literal; - private boolean readOnly; - private boolean required; - - /** - * <p class="changed_added_4_0"></p> - * - * @return the generate - */ - @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isGenerate() { - return generate; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param generate the generate to set - */ - public void setGenerate(boolean generate) { - this.generate = generate; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the hidden - */ - @XmlElement(name = "hidden", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isHidden() { - return hidden; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param hidden the hidden to set - */ - public void setHidden(boolean hidden) { - this.hidden = hidden; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the literal - */ - @XmlElement(name = "literal", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isLiteral() { - return literal; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param literal the literal to set - */ - public void setLiteral(boolean literal) { - this.literal = literal; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the required - */ - @XmlElement(name = "required", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isRequired() { - return required; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param required the required to set - */ - public void setRequired(boolean required) { - this.required = required; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the readOnly - */ - @XmlElement(name = "read-only", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isReadOnly() { - return readOnly; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param readOnly the readOnly to set - */ - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the passThrough - */ - @XmlElement(name = "pass-through", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public boolean isPassThrough() { - return passThrough; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param passThrough the passThrough to set - */ - public void setPassThrough(boolean passThrough) { - this.passThrough = passThrough; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the eventNames - */ - @XmlElement(name = "event-name", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public Set<EventName> getEventNames() { - return eventNames; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param eventNames the eventNames to set - */ - public void setEventNames(Set<EventName> eventNames) { - this.eventNames = eventNames; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the signature - */ - @XmlElementWrapper(name = "signature", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - @XmlElement(name = "param", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - @XmlJavaTypeAdapter(ClassAdapter.class) - public List<ClassDescription> getSignature() { - return signature; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param signature the signature to set - */ - public void setSignature(List<ClassDescription> signature) { - this.signature = signature; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @return the aliases - */ - @XmlElement(name = "alias", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) - public Set<String> getAliases() { - return aliases; - } - - /** - * <p class="changed_added_4_0"></p> - * - * @param aliases the aliases to set - */ - public void setAliases(Set<String> aliases) { - this.aliases = aliases; - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,14 +33,15 @@ * * @author asmirnov(a)exadel.com */ -public class RenderKitAdapter extends XmlAdapter<RenderKitBean, RenderKit> { +public class RenderKitAdapter extends AdapterBase<RenderKitBean, RenderKit> { + @Override - public RenderKitBean marshal(RenderKit v) throws Exception { - return JAXBBinding.createAdapter(RenderKitBean.class, v); + protected Class<? extends RenderKitBean> getBeanClass(RenderKit model) { + return RenderKitBean.class; } @Override - public RenderKit unmarshal(RenderKitBean v) throws Exception { - return JAXBBinding.createModelElement(RenderKit.class, v, new RenderKit.Id(v.getId())); + protected Class<? extends RenderKit> getModelClass(RenderKitBean bean) { + return RenderKit.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -28,7 +28,9 @@ import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.RenderKit; import org.richfaces.cdk.model.Renderer; +import org.richfaces.cdk.model.RenderKit.Id; import javax.faces.render.RenderKitFactory; import javax.xml.bind.annotation.XmlElement; @@ -40,7 +42,7 @@ * * @author asmirnov(a)exadel.com */ -public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> { +public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> implements MapEntry<RenderKit.Id> { @XmlElement(name = "render-kit-id", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) private String id = RenderKitFactory.HTML_BASIC_RENDER_KIT; @XmlElement(name = "renderer", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -52,6 +54,7 @@ @XmlElement(name = "render-kit-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(ClassAdapter.class) private ClassDescription renderkitClass; + private Id key; /** * <p class="changed_added_4_0"></p> @@ -87,8 +90,20 @@ */ public void setId(String id) { this.id = id; + this.key = new Id(id); } + @Override + public Id getKey() { + return key; + } + + @Override + public void setKey(Id key) { + this.key = key; + this.id = key.toString(); + } + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,14 +33,15 @@ * * @author asmirnov(a)exadel.com */ -public class RendererAdapter extends XmlAdapter<RendererBean, Renderer> { +public class RendererAdapter extends AdapterBase<RendererBean, Renderer> { + @Override - public RendererBean marshal(Renderer v) throws Exception { - return JAXBBinding.createAdapter(RendererBean.class, v); + protected Class<? extends RendererBean> getBeanClass(Renderer model) { + return RendererBean.class; } @Override - public Renderer unmarshal(RendererBean v) throws Exception { - return JAXBBinding.createModelElement(Renderer.class, v, new Renderer.Type(v.getType())); + protected Class<? extends Renderer> getModelClass(RendererBean bean) { + return Renderer.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -10,8 +10,7 @@ location = ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION, xmlns = {(a)javax.xml.bind.annotation.XmlNs(prefix = "cdk", namespaceURI = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)}) -@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(type = Property.class, value = PropertyAdapter.class), - @XmlJavaTypeAdapter(type = Attribute.class, value = AttributeAdapter.class), +@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(type = ClassDescription.class, value = ClassAdapter.class), @XmlJavaTypeAdapter(type = ComponentLibrary.class, value = FacesConfigAdapter.class) }) Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/base-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/base-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/base-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description>The component identifier for the associated component</description> - <display-name /> - <icon /> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description>The value binding expression used to wire up this - component to a component property of a JavaBean class</description> - <display-name /> - <icon /> - <property-name>binding</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description>An override for the rendered attribute associated with - our component</description> - <display-name /> - <icon /> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/column-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/column-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/column-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Space-separated list of CSS style class(es) that will be - applied to any header generated for this column. - </description> - <display-name>Header CSS Classes</display-name> - <icon /> - <property-name>headerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) that will be - applied to any footer generated for this column. - </description> - <display-name>Footer CSS Classes</display-name> - <icon /> - <property-name>footerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Flag indicating that this column is a row header column and - therefore cells in this column should be rendered with "th" - instead of "td" and must have the 'scope="row"' attribute. - </description> - <display-name>Column is Row Header</display-name> - <icon /> - <property-name>rowHeader</property-name> - <property-class>boolean</property-class> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/command-button-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/command-button-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/command-button-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,205 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - - - <property> - <description> - Javascript code executed when a pointer button is - clicked over this element. - </description> - <display-name>Button Click Script</display-name> - <icon /> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - <cdk:event-name /> - <cdk:event-name>action</cdk:event-name> - <default-behavior>true</default-behavior> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - double clicked over this element. - </description> - <display-name>Double Click Script</display-name> - <icon /> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this element loses focus - and its value has been modified since gaining focus. - </description> - <display-name>Input Change Script</display-name> - <icon /> - <property-name>onchange</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - pressed down over this element. - </description> - <display-name>Mouse Down Script</display-name> - <icon /> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - released over this element. - </description> - <display-name>Mouse Up Script</display-name> - <icon /> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved onto this element. - </description> - <display-name>Mouse Over Script</display-name> - <icon /> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved within this element. - </description> - <display-name>Mouse Move Script</display-name> - <icon /> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved away from this element. - </description> - <display-name>Mouse Out Script</display-name> - <icon /> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed and released over this element. - </description> - <display-name>Key Press Script</display-name> - <icon /> - <property-name>onkeypress</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed down over this element. - </description> - <display-name>Key Down Script</display-name> - <icon /> - <property-name>onkeydown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - released over this element. - </description> - <display-name>Key Up Script</display-name> - <icon /> - <property-name>onkeyup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Type of button to create. Valid values are "submit", "button", - and "reset". If not specified, or not a valid value, the default - value is "submit". - </description> - <display-name>Button Type</display-name> - <icon /> - <property-name>type</property-name> - <property-class>java.lang.String</property-class> - <default-value>"submit"</default-value> - <property-extension> - </property-extension> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/core-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/core-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/core-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style(s) to be applied when this component is rendered. - </description> - <display-name>CSS Styles</display-name> - <icon /> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) to be applied when - this element is rendered. This value must be passed through - as the "class" attribute on generated markup. - </description> - <display-name>CSS Style Classes</display-name> - <icon /> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Advisory title information about markup elements generated - for this component. - </description> - <display-name>Advisory Title</display-name> - <icon /> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/direct-link-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - The identifier of the page fragment which should - be brought into focus when the target page is - rendered. The value of this attribute is appended - to the end of target URL following a hash (#) mark. - This notation is part of the standard URL syntax. - </description> - <display-name>Fragment Identifier</display-name> - <icon /> - <property-name>fragment</property-name> - <property-class>java.lang.String</property-class> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/events-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/events-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/events-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Javascript code executed when a pointer button is - clicked over this element. - </description> - <display-name>Button Click Script</display-name> - <icon /> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>click</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - double clicked over this element. - </description> - <display-name>Double Click Script</display-name> - <icon /> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>dblclick</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - pressed down over this element. - </description> - <display-name>Mouse Down Script</display-name> - <icon /> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>mousedown</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - released over this element. - </description> - <display-name>Mouse Up Script</display-name> - <icon /> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>mouseup</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved onto this element. - </description> - <display-name>Mouse Over Script</display-name> - <icon /> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>mouseover</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved within this element. - </description> - <display-name>Mouse Move Script</display-name> - <icon /> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>mousemove</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved away from this element. - </description> - <display-name>Mouse Out Script</display-name> - <icon /> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>mouseout</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed and released over this element. - </description> - <display-name>Key Press Script</display-name> - <icon /> - <property-name>onkeypress</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>keypress</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed down over this element. - </description> - <display-name>Key Down Script</display-name> - <icon /> - <property-name>onkeydown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>keydown</cdk:event-name> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - released over this element. - </description> - <display-name>Key Up Script</display-name> - <icon /> - <property-name>onkeyup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name>keyup</cdk:event-name> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/focus-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/focus-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/focus-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Access key that, when pressed, transfers focus - to this element. - </description> - <display-name>Access Key</display-name> - <icon /> - <property-name>accesskey</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this element loses focus. - </description> - <display-name>Focus Off Script</display-name> - <icon /> - <property-name>onblur</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this element receives focus. - </description> - <display-name>Focus On Script</display-name> - <icon /> - <property-name>onfocus</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Position of this element in the tabbing order - for the current document. This value must be - an integer between 0 and 32767. - </description> - <display-name>Tab Index</display-name> - <icon /> - <property-name>tabindex</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/form-form-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/form-form-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/form-form-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - List of content types that a server processing this form - will handle correctly - </description> - <display-name>Content Type</display-name> - <icon /> - <property-name>accept</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - List of character encodings for input data - that are accepted by the server processing - this form. - </description> - <display-name>Character Set</display-name> - <icon /> - <property-name>acceptcharset</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Content type used to submit the form to the server. If not - specified, the default value is - "application/x-www-form-urlencoded". - </description> - <display-name>Encoding Type</display-name> - <icon /> - <property-name>enctype</property-name> - <property-class>java.lang.String</property-class> - <default-value>"application/x-www-form-urlencoded"</default-value> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this form is reset. - </description> - <display-name>Form Reset Script</display-name> - <icon /> - <property-name>onreset</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this form is submitted. - </description> - <display-name>Form Submit Script</display-name> - <icon /> - <property-name>onsubmit</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Name of a frame where the response - retrieved after this form submit is to - be displayed. - </description> - <display-name>Target Frame</display-name> - <icon /> - <property-name>target</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/graphic-image-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Alternate textual description of the - element rendered by this component. - </description> - <display-name>Alternate Text</display-name> - <icon /> - <property-name>alt</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Override for the height of this image. - </description> - <display-name>Image Height</display-name> - <icon /> - <property-name>height</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Flag indicating that this image is to be used as a server side - image map. Such an image must be enclosed within a hyperlink - ("a"). A value of false causes no attribute to be rendered, - while a value of true causes the attribute to be rendered as - ismap="ismap". - </description> - <display-name>Image Map Flag</display-name> - <icon /> - <property-name>ismap</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - URI to a long description of the image - represented by this element. - </description> - <display-name>Long Description</display-name> - <icon /> - <property-name>longdesc</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The name of a client side image map (an HTML "map" - element) for which this element provides the image. - </description> - <display-name>Use Image Map</display-name> - <icon /> - <property-name>usemap</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Override for the width of this image. - </description> - <display-name>Image Width</display-name> - <icon /> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/i18n-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/i18n-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/i18n-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Direction indication for text that does not inherit directionality. - Valid values are "LTR" (left-to-right) and "RTL" (right-to-left). - </description> - <display-name>Direction</display-name> - <icon /> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Code describing the language used in the generated markup - for this component. - </description> - <display-name>Language Code</display-name> - <icon /> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/image-button-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/image-button-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/image-button-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Alternate textual description of the - element rendered by this component. - </description> - <display-name>Alternate Text</display-name> - <icon /> - <property-name>alt</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description>&lt;p&gt; - Absolute or relative URL of the - image to be displayed for this - button. If specified, this - "input" element will be of type - "image". Otherwise, it will be - of the type specified by the - "type" property with a label - specified by the "value" - property. &lt;span - class="changed_added_2_0"&gt;Note - that if the value of this - attribute starts with "/", the - rendered value for this - attribute will be prefixed with - the context-root for this - application.&lt;/span&gt; - &lt;/p&gt;</description> - <display-name>Image URL</display-name> - <icon /> - <property-name>image</property-name> - <property-class>java.lang.String</property-class> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Flag indicating that this element must never receive focus or - be included in a subsequent submit. A value of false causes - no attribute to be rendered, while a value of true causes the - attribute to be rendered as disabled="disabled". - </description> - <display-name>Disabled Flag</display-name> - <icon /> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when this element loses focus - and its value has been modified since gaining focus. - </description> - <display-name>Input Change Script</display-name> - <icon /> - <property-name>onchange</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - <cdk:event-name /> - <cdk:event-name>valueChange</cdk:event-name> - <default-behavior>true</default-behavior> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when text within this - element is selected by the user. - </description> - <display-name>Text Select Script</display-name> - <icon /> - <property-name>onselect</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Flag indicating that this component will prohibit changes by - the user. The element may receive focus unless it has also - been disabled. A value of false causes - no attribute to be rendered, while a value of true causes the - attribute to be rendered as readonly="readonly". - </description> - <display-name>Read Only Flag</display-name> - <icon /> - <property-name>readonly</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - A localized user presentable name for this component. - </description> - <display-name>Label</display-name> - <icon /> - <property-name>label</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <renderer-attribute-ignore>true</renderer-attribute-ignore> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-secret-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Flag indicating that any existing value - in this field should be rendered when the - form is created. Because this is a potential - security risk, password values are not - displayed by default. - </description> - <display-name>Redisplay Flag</display-name> - <icon /> - <property-name>redisplay</property-name> - <property-class>boolean</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/input-textarea-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - The number of columns to be displayed. - </description> - <display-name>Columns</display-name> - <icon /> - <property-name>cols</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The number of rows to be displayed. - </description> - <display-name>Rows</display-name> - <icon /> - <property-name>rows</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - MethodExpression representing the application action to invoke - when this component is activated by the user. The expression - must evaluate to a public method that takes no parameters, and - returns an Object (the toString() of which is called to derive - the logical outcome) which is passed to the NavigationHandler - for this application. - </description> - <display-name>Application Action</display-name> - <icon /> - <property-name>action</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - <property-extension> - <cdk:signature /> - </property-extension> - </property> - - <property> - <description> - &lt;p&gt; - - MethodExpression representing an action listener method that - will be notified when this component is activated by the user. - The expression must evaluate to a public method that takes an - ActionEvent parameter, with a return type of void, &lt;span - class="changed_added_2_0"&gt;or to a public method that takes no - arguments with a return type of void. In the latter case, the - method has no way of easily knowing where the event came from, - but this can be useful in cases where a notification is needed - that "some action happened".&lt;/span&gt; - - &lt;/p&gt; </description> - <display-name>Action Listener</display-name> - <icon /> - <property-name>actionListener</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - <property-extension> - <cdk:signature> - <cdk:param>javax.faces.event.ActionEvent</cdk:param> - </cdk:signature> - </property-extension> - </property> - - <property> - <description> - Flag indicating that, if this component is activated by the user, - notifications should be delivered to interested listeners and actions - immediately (that is, during Apply Request Values phase) rather than - waiting until Invoke Application phase. - </description> - <display-name>Immediate Action</display-name> - <icon /> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource2.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource2.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ActionSource2.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.ActionSource.xml" /> - <property> - <description> - MethodExpression representing the application action to invoke - when this component is activated by the user. The expression - must evaluate to a public method that takes no parameters, and - returns an Object (the toString() of which is called to derive - the logical outcome) which is passed to the NavigationHandler - for this application. - </description> - <display-name>Application Action</display-name> - <icon /> - <property-name>actionExpression</property-name> - <property-class>javax.el.MethodExpression</property-class> - <property-extension> - <cdk:signature /> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.EditableValueHolder.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.EditableValueHolder.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.EditableValueHolder.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,188 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Flag indicating whether the "localValue" property - of this component has been set. This property is - reset automatically when the "value" propertyis set. - </description> - <display-name>Local Value Set</display-name> - <icon /> - <property-name>localValueSet</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating that the user is required to provide a submitted - value for this input component. - </description> - <display-name>Required Flag</display-name> - <icon /> - <property-name>required</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - A ValueExpression enabled attribute that, if present, will be - used as the text of the validation message for the "required" - facility, if the "required" facility is used. - </description> - <display-name>Required Message</display-name> - <icon /> - <property-name>requiredMessage</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - A ValueExpression enabled attribute that, if present, will be - used as the text of the converter message, replacing any message - that comes from the converter. - </description> - <display-name>Converter Message</display-name> - <icon /> - <property-name>converterMessage</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - A ValueExpression enabled attribute that, if present, will be - used as the text of the validator message, replacing any - message that comes from the validator. - </description> - <display-name>Validator Message</display-name> - <icon /> - <property-name>validatorMessage</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The value submitted for this input component by the user, prior to - any required conversion or validation. - </description> - <display-name>Submitted Value</display-name> - <icon /> - <property-name>submittedValue</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> - - <property> - <description> - MethodExpression representing a validator method that will be called - during Process Validations to perform correctness checks on the - value of this component. The expression must evaluate to a public - method that takes FacesContext, UIComponent, and Object parameters, - with a return type of void. - </description> - <display-name>Validator</display-name> - <icon /> - <property-name>validator</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - <property-extension> - <cdk:signature> - <cdk:param>javax.faces.context.FacesContext</cdk:param> - <cdk:param>javax.faces.component.UIComponent</cdk:param> - <cdk:param>java.lang.Object</cdk:param> - </cdk:signature> - </property-extension> - </property> - - <property> - <description> - &lt;p&gt; - - MethodExpression representing a value change listener method - that will be notified when a new value has been set for this - input component. The expression must evaluate to a public - method that takes a &lt;code&gt;ValueChangeEvent&lt;/code&gt; parameter, - with a return type of void, &lt;span class="changed_added_2_0"&gt;or - to a public method that takes no arguments with a return type - of void. In the latter case, the method has no way of easily - knowing what the new value is, but this can be useful in cases - where a notification is needed that "this value - changed".&lt;/span&gt; - - &lt;/p&gt; </description> - <display-name>Value Change Listener</display-name> - <icon /> - <property-name>valueChangeListener</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - <property-extension> - <cdk:signature> - <cdk:param>javax.faces.event.ValueChangeEvent</cdk:param> - </cdk:signature> - </property-extension> - </property> - - <property> - <description> - Flag indicating that this component's value must be - converted and validated immediately (that is, during - Apply Request Values phase), rather than waiting - until Process Validations phase. - </description> - <display-name>Immediate Action</display-name> - <icon /> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether or not any required conversion or validation - on this component value has been performed successfully. - </description> - <display-name>Valid Flag</display-name> - <icon /> - <property-name>valid</property-name> - <property-class>valid</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIColumn.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIColumn.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIColumn.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UICommand.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UICommand.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UICommand.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.ActionSource2.xml" /> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIComponent.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - A mutable Map of the attributes associated with - this component, keyed by attribute name. - </description> - <display-name>Attributes Map</display-name> - <icon /> - <property-name>attributes</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - </property-extension> - </property> - - <property> - <description> - The number of child components associated with - this component. - </description> - <display-name>Child Component Count</display-name> - <icon /> - <property-name>childCount</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - A mutable List of the child components associated with - this component. - </description> - <display-name>Child Component List</display-name> - <icon /> - <property-name>children</property-name> - <property-class>java.util.List</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - A mutable Map of the facets associated with - this component, keyed by facet name. - </description> - <display-name>Facets Map</display-name> - <icon /> - <property-name>facets</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The component family to which this component belongs. This property - is used to select an appropriate Renderer. - </description> - <display-name>Component Family</display-name> - <icon /> - <property-name>family</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The component identifier for this component. This value must be - unique within the closest parent component that is a naming - container. - </description> - <display-name>Component Identifier</display-name> - <icon /> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - <cdk:literal>true</cdk:literal> - </property> - - <property> - <description> - The parent component for this component. On the root component - in the component tree (which must be of type UIViewRoot), this - property is null. - </description> - <display-name>Parent Component</display-name> - <icon /> - <property-name>parent</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether or not this component should be rendered - (during Render Response Phase), or processed on any subsequent - form submit. The default value for this property is true. - </description> - <display-name>Rendered Flag</display-name> - <icon /> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Identifier used (in conjunction with the "family" property) to - select an appropriate Renderer to encode and decode this component. - </description> - <display-name>Renderer Type</display-name> - <icon /> - <property-name>rendererType</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether or not this component takes responsibility - for rendering its own children. This decision is normally delegated - to the associated Renderer, if there is one. - </description> - <display-name>Renders Children</display-name> - <icon /> - <property-name>rendersChildren</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:read-only>true</cdk:read-only> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - <property> - <description>The value binding expression used to wire up this - component to a component property of a JavaBean class</description> - <display-name /> - <icon /> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIData.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Zero-relative row number of the first row to be displayed. If this - property is set to zero, rendering will begin with the first row of - the underlying data. - </description> - <display-name>First Row Index</display-name> - <icon /> - <property-name>first</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether there is model data available for the row - selected by the current value of the "rowIndex" property. - </description> - <display-name>Row Available Flag</display-name> - <icon /> - <property-name>rowAvailable</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The number of rows of model data that are available for processing - by this component. If the number of rows is unknown, this property - will be set to -1. - </description> - <display-name>Row Count</display-name> - <icon /> - <property-name>rowCount</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - An object representing the model data for the row selected by the - current value of the "rowIndex" property. - </description> - <display-name>Row Data</display-name> - <icon /> - <property-name>rowData</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Zero-relative index of the currently selected row from the underlying - model data. No error will occur if this property is set to point at - a row for which no model data exists. To ensure data availability, - check the state of the "rowAvailable" property after modifying this - property. - </description> - <display-name>Row Index</display-name> - <icon /> - <property-name>rowIndex</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The number of rows to display, starting with the one identified by the - "first" property. If this value is set to zero, all available rows in - the underlying data model will be displayed. - </description> - <display-name>Rows To Display</display-name> - <icon /> - <property-name>rows</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Name of a request-scope attribute under which the model data for the - row selected by the current value of the "rowIndex" property (i.e. - also the current value of the "rowData" property) will be exposed. - </description> - <display-name>Row Data Attribute</display-name> - <icon /> - <property-name>var</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIForm.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIForm.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIForm.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Flag indicating whether or not this form was the one submitted by - the user. If this flag is not set, child input components are not - processed. - </description> - <display-name>Submitted Flag</display-name> - <icon /> - <property-name>submitted</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - <property> - <description> - Flag indicating whether or not this form should prepend its id - to its descendent's id during the clientId generation process. - If this flag is not set, the default value is true. - </description> - <display-name>Prepend Id During getClientId()</display-name> - <icon /> - <property-name>prependId</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIGraphic.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIGraphic.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIGraphic.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Context-relative URL to retrieve the resource associated with - this component. This is an alias for the "value" property. - </description> - <display-name>Source URL</display-name> - <icon /> - <property-name>url</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIInput.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIInput.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIInput.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIOutput.xml" /> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.EditableValueHolder.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessage.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessage.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessage.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Client identifier of the component for which to display messages. - </description> - <display-name>Associated Client Id</display-name> - <icon /> - <property-name>for</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:required>true</cdk:required> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether the detail portion of displayed messages - should be included. Default value is "true". - </description> - <display-name>Show Detail</display-name> - <icon /> - <property-name>showDetail</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether the summary portion of displayed messages - should be included. Default value is "false". - </description> - <display-name>Show Summary</display-name> - <icon /> - <property-name>showSummary</property-name> - <property-class>boolean</property-class> - <default-value>false</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessages.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessages.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIMessages.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Flag indicating that only global messages (that is, messages not - associated with any client identifier) are to be displayed. - Default value is "false". - </description> - <display-name>Global Only</display-name> - <icon /> - <property-name>globalOnly</property-name> - <property-class>boolean</property-class> - <default-value>false</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Client identifier of the component for which to display messages. This - attribute is mutually exclusive with globalOnly and take precedence - if used. - </description> - <display-name>Associated Client Id</display-name> - <icon /> - <property-name>for</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:required>false</cdk:required> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether the detail portion of displayed messages - should be included. Default value is "false". - </description> - <display-name>Show Detail</display-name> - <icon /> - <property-name>showDetail</property-name> - <property-class>boolean</property-class> - <default-value>false</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether the summary portion of displayed messages - should be included. Default value is "true". - </description> - <display-name>Show Summary</display-name> - <icon /> - <property-name>showSummary</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UINamingContainer.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UINamingContainer.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UINamingContainer.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutcomeTarget.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutcomeTarget.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutcomeTarget.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIOutput.xml" /> - <property> - <description> - The logical outcome used to resolve a navigation case. - </description> - <display-name>Outcome</display-name> - <icon /> - <property-name>outcome</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - <property> - <description> - Whether to include page parameters in the target URI. - </description> - <display-name>Include Page Parameters</display-name> - <icon /> - <property-name>includeViewParams</property-name> - <property-class>java.lang.Boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - <property> - <description> - Return the URI fragment, as specified in RFC 2396. - </description> - <display-name>HTML Fragment</display-name> - <icon /> - <property-name>fragment</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutput.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutput.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIOutput.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.ValueHolder.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIPanel.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIPanel.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIPanel.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIParameter.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIParameter.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIParameter.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Name of the parameter associated with this component. - </description> - <display-name>Property Name</display-name> - <icon /> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:literal>true</cdk:literal> - </property-extension> - </property> - - <property> - <description> - Value of the parameter associated with this component. - </description> - <display-name>Property Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectBoolean.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectBoolean.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectBoolean.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIInput.xml" /> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - - <property> - <description> - Flag indicating whether the user has selected this component. - This is an alias for the "value" property. - </description> - <display-name>Selected Flag</display-name> - <icon /> - <property-name>selected</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItem.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItem.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItem.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Description of the selection item represented by this component. - This property may be used by tools. - </description> - <display-name>Item Description</display-name> - <icon /> - <property-name>itemDescription</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Flag indicating that the selection item represented by this component - must be rendered as disabled. - </description> - <display-name>Item Disabled</display-name> - <icon /> - <property-name>itemDisabled</property-name> - <property-class>boolean</property-class> - </property> - - <property> - <description> - Label of the selection item represented by this component. This - property is displayed to the user when the containing input - component is rendered. - </description> - <display-name>Item Label</display-name> - <icon /> - <property-name>itemLabel</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - The value returned to the server when a user chooses the selection - item represented by this component. - </description> - <display-name>Item Value</display-name> - <icon /> - <property-name>itemValue</property-name> - <property-class>java.lang.Object</property-class> - </property> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItems.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItems.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectItems.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectMany.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectMany.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectMany.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIInput.xml" /> - - <property> - <description> - Array containing the selected values for this component. - This is an alias for the "value" property. - </description> - <display-name>Selected Values</display-name> - <icon /> - <property-name>selectedValues</property-name> - <property-class>java.lang.Object[]</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectOne.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectOne.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UISelectOne.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIInput.xml" /> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIViewRoot.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIViewRoot.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.UIViewRoot.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <xi:include - xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd... - href="urn:attributes:javax.faces.component.UIComponent.xml" /> - - <property> - <description> - Locale to be used in localizing the rendered output of this view. - </description> - <display-name>Locale</display-name> - <icon /> - <property-name>locale</property-name> - <property-class>java.util.Locale</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> - - <property> - <description> - Identifier of the RenderKit being used to display this view. - </description> - <display-name>Render Kit Id</display-name> - <icon /> - <property-name>renderKitId</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> - - <property> - <description> - Identifier of the view represented by this component tree. - </description> - <display-name>View Id</display-name> - <icon /> - <property-name>viewId</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ValueHolder.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ValueHolder.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/javax.faces.component.ValueHolder.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Converter instance registered with this component. - </description> - <display-name>Converter</display-name> - <icon /> - <property-name>converter</property-name> - <property-class>javax.faces.convert.Converter</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> - - <property> - <description> - For output components, this is the same as the "value" property. - For input components, this is the most recently user-entered - value, which will be pushed to the application data model during - Update Model Values phase, if a value binding is present for the - "value" property. - </description> - <display-name>Local Value</display-name> - <icon /> - <property-name>localValue</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:hidden>true</cdk:hidden> - </property-extension> - </property> - - <property> - <description> - The current value of this component. - </description> - <display-name>Value</display-name> - <icon /> - <property-name>value</property-name> - <property-class>java.lang.Object</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/link-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/link-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/link-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,308 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - The character encoding of the resource designated - by this hyperlink. - </description> - <display-name>Character Set</display-name> - <icon /> - <property-name>charset</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The position and shape of the hot spot on the screen - (for use in client-side image maps). - </description> - <display-name>Coordinates</display-name> - <icon /> - <property-name>coords</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The language code of the resource designated - by this hyperlink. - </description> - <display-name>Language</display-name> - <icon /> - <property-name>hreflang</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The relationship from the current document - to the anchor specified by this hyperlink. - The value of this attribute is a space-separated - list of link types. - </description> - <display-name>Relationship</display-name> - <icon /> - <property-name>rel</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - A reverse link from the anchor specified - by this hyperlink to the current document. - The value of this attribute is a space-separated - list of link types. - </description> - <display-name>Reverse Link</display-name> - <icon /> - <property-name>rev</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The shape of the hot spot on the screen - (for use in client-side image maps). Valid - values are: default (entire region); rect - (rectangular region); circle (circular region); - and poly (polygonal region). - </description> - <display-name>Shape</display-name> - <icon /> - <property-name>shape</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Name of a frame where the resource - retrieved via this hyperlink is to - be displayed. - </description> - <display-name>Target Frame</display-name> - <icon /> - <property-name>target</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The content type of the resource designated - by this hyperlink. - </description> - <display-name>Content Type</display-name> - <icon /> - <property-name>type</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Flag indicating that this element must never - receive focus or be included in a subsequent - submit. - </description> - <display-name>Disabled Flag</display-name> - <icon /> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - clicked over this element. - </description> - <display-name>Button Click Script</display-name> - <icon /> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - <cdk:event-name /> - <cdk:event-name>action</cdk:event-name> - <default-behavior>true</default-behavior> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - double clicked over this element. - </description> - <display-name>Double Click Script</display-name> - <icon /> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - pressed down over this element. - </description> - <display-name>Mouse Down Script</display-name> - <icon /> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - released over this element. - </description> - <display-name>Mouse Up Script</display-name> - <icon /> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved onto this element. - </description> - <display-name>Mouse Over Script</display-name> - <icon /> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved within this element. - </description> - <display-name>Mouse Move Script</display-name> - <icon /> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a pointer button is - moved away from this element. - </description> - <display-name>Mouse Out Script</display-name> - <icon /> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed and released over this element. - </description> - <display-name>Key Press Script</display-name> - <icon /> - <property-name>onkeypress</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - pressed down over this element. - </description> - <display-name>Key Down Script</display-name> - <icon /> - <property-name>onkeydown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - - <property> - <description> - Javascript code executed when a key is - released over this element. - </description> - <display-name>Key Up Script</display-name> - <icon /> - <property-name>onkeyup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - <cdk:event-name /> - </property-extension> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/list-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/list-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/list-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Orientation of the list to be created. Valid values - are "pageDirection" (list is laid out vertically), or - "lineDirection" (list is laid out horizontally). - </description> - <display-name>Layout</display-name> - <icon /> - <property-name>layout</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/listbox-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/listbox-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/listbox-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style class to apply to the rendered label - on disabled options. - </description> - <display-name>Disabled Label Class</display-name> - <icon /> - <property-name>disabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on enabled options. - </description> - <display-name>Enabled Label Class</display-name> - <icon /> - <property-name>enabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Number of available options to be shown at all times. - If not specified, all available options are shown. - </description> - <display-name>Size</display-name> - <icon /> - <property-name>size</property-name> - <property-class>int</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/menu-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/menu-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/menu-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style class to apply to the rendered label - on disabled options. - </description> - <display-name>Disabled Label Class</display-name> - <icon /> - <property-name>disabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on enabled options. - </description> - <display-name>Enabled Label Class</display-name> - <icon /> - <property-name>enabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/message-message-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/message-message-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/message-message-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,119 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style class to apply to any message - with a severity class of "ERROR". - </description> - <display-name>Error Class</display-name> - <icon /> - <property-name>errorClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "ERROR". - </description> - <display-name>Error Styles</display-name> - <icon /> - <property-name>errorStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "FATAL". - </description> - <display-name>Fatal Class</display-name> - <icon /> - <property-name>fatalClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "FATAL". - </description> - <display-name>Fatal Styles</display-name> - <icon /> - <property-name>fatalStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "INFO". - </description> - <display-name>Info Class</display-name> - <icon /> - <property-name>infoClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "INFO". - </description> - <display-name>Info Styles</display-name> - <icon /> - <property-name>infoStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Flag indicating whether the detail portion of the - message should be displayed as a tooltip. - </description> - <display-name>Tooltip</display-name> - <icon /> - <property-name>tooltip</property-name> - <property-class>boolean</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "WARN". - </description> - <display-name>Warning Class</display-name> - <icon /> - <property-name>warnClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "WARN". - </description> - <display-name>Warning Styles</display-name> - <icon /> - <property-name>warnStyle</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/messages-messages-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style class to apply to any message - with a severity class of "ERROR". - </description> - <display-name>Error Class</display-name> - <icon /> - <property-name>errorClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "ERROR". - </description> - <display-name>Error Styles</display-name> - <icon /> - <property-name>errorStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "FATAL". - </description> - <display-name>Fatal Class</display-name> - <icon /> - <property-name>fatalClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "FATAL". - </description> - <display-name>Fatal Styles</display-name> - <icon /> - <property-name>fatalStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "INFO". - </description> - <display-name>Info Class</display-name> - <icon /> - <property-name>infoClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "INFO". - </description> - <display-name>Info Styles</display-name> - <icon /> - <property-name>infoStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - The type of layout markup to use when rendering - error messages. Valid values are "table" (an HTML - table) and "list" (an HTML list). If not specified, - the default value is "list". - </description> - <display-name>Layout</display-name> - <icon /> - <property-name>layout</property-name> - <property-class>java.lang.String</property-class> - <default-value>"list"</default-value> - <property-extension> - </property-extension> - </property> - - <property> - <description> - Flag indicating whether the detail portion of the - message should be displayed as a tooltip. - </description> - <display-name>Tooltip</display-name> - <icon /> - <property-name>tooltip</property-name> - <property-class>boolean</property-class> - </property> - - <property> - <description> - CSS style class to apply to any message - with a severity class of "WARN". - </description> - <display-name>Warning Class</display-name> - <icon /> - <property-name>warnClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to apply to any message - with a severity class of "WARN". - </description> - <display-name>Warning Styles</display-name> - <icon /> - <property-name>warnStyle</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-format-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-format-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-format-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Flag indicating that characters that are sensitive - in HTML and XML markup must be escaped. This flag - is set to "true" by default. - </description> - <display-name>Escape Characters</display-name> - <icon /> - <property-name>escape</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-label-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-label-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-label-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Client identifier of the component for which this element - is a label. - </description> - <display-name>Label For Identifier</display-name> - <icon /> - <property-name>for</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Flag indicating that characters that are sensitive - in HTML and XML markup must be escaped. If omitted, this - flag is assumed to be "true". - </description> - <display-name>Escape Characters</display-name> - <icon /> - <property-name>escape</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - <cdk:literal>false</cdk:literal> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-resource-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <attribute> - <description> - &lt;div class="changed_added_2_0"&gt;&lt;p&gt;The - &lt;em&gt;resourceName&lt;/em&gt; for this - resource.&lt;/p&gt;&lt;/div&gt; </description> - <display-name>Resource Name</display-name> - <icon /> - <attribute-name>name</attribute-name> - <attribute-class>java.lang.String</attribute-class> - <attribute-extension> - <cdk:required>false</cdk:required> - <cdk:hidden>false</cdk:hidden> - </attribute-extension> - - </attribute> - <attribute> - <description> - &lt;div class="changed_added_2_0"&gt;&lt;p&gt;The - &lt;em&gt;libraryName&lt;/em&gt; for this - resource.&lt;/p&gt;&lt;/div&gt; </description> - <display-name>Library Name</display-name> - <icon /> - <attribute-name>library</attribute-name> - <attribute-class>java.lang.String</attribute-class> - <attribute-extension> - <cdk:required>false</cdk:required> - <cdk:hidden>false</cdk:hidden> - </attribute-extension> - - </attribute> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-text-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-text-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/output-text-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Flag indicating that characters that are sensitive - in HTML and XML markup must be escaped. This flag - is set to "true" by default. - </description> - <display-name>Escape Characters</display-name> - <icon /> - <property-name>escape</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - <property-extension> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-grid-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - The number of columns to render before - starting a new row. - </description> - <display-name>Columns</display-name> - <icon /> - <property-name>columns</property-name> - <property-class>int</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/panel-group-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - CSS style(s) to be applied when this component is rendered. - </description> - <display-name>CSS Styles</display-name> - <icon /> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) to be applied when - this element is rendered. This value must be passed through - as the "class" property on generated markup. - </description> - <display-name>CSS Style Classes</display-name> - <icon /> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>false</cdk:pass-through> - </property-extension> - </property> - <property> - <description> - The type of layout markup to use when rendering this group. - If the value is "block" the renderer must produce an HTML - "div" element. Otherwise HTML "span" element must - be produced. - </description> - <display-name>Layout</display-name> - <icon /> - <property-name>layout</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-checkbox-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Width (in pixels) of the border to be drawn - around the table containing the options list. - </description> - <display-name>Table Border</display-name> - <icon /> - <property-name>border</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on disabled options. - </description> - <display-name>Disabled Label Class</display-name> - <icon /> - <property-name>disabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on enabled options. - </description> - <display-name>Enabled Label Class</display-name> - <icon /> - <property-name>enabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on selected options. - </description> - <display-name>Selected Label Class</display-name> - <icon /> - <property-name>selectedClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on unselected options. - </description> - <display-name>Unselected Label Class</display-name> - <icon /> - <property-name>unselectedClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Orientation of the options list to be created. - Valid values are "pageDirection" (list is laid - out vertically), or "lineDirection" (list is - laid out horizontally). If not specified, the - default value is "lineDirection". - </description> - <display-name>Layout</display-name> - <icon /> - <property-name>layout</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectmany-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description>&lt;p class="changed_modified_2_0"&gt; Optional - attribute that is a literal string that is the fully qualified - class name of a concrete class that implements - &lt;code&gt;java.util.Collection&lt;/code&gt;, or an EL expression - that - evaluates to either 1. such a String, or 2. the - &lt;code&gt;Class&lt;/code&gt; object itself. &lt;/p&gt; </description> - <display-name>Collection Type</display-name> - <icon /> - <property-name>collectionType</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description>&lt;p class="changed_modified_2_0"&gt; - Flag indicating that, if this component is activated by the user, - The "no selection option", if any, must be hidden.&lt;/p&gt; </description> - <display-name>Hide "No Selection" Option</display-name> - <icon /> - <property-name>hideNoSelectionOption</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - <jsp-ignore>true</jsp-ignore> - </property-extension> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description>&lt;p class="changed_modified_2_0"&gt; - Flag indicating that, if this component is activated by the user, - The "no selection option", if any, must be hidden.&lt;/p&gt; </description> - <display-name>Hide "No Selection" Option</display-name> - <icon /> - <property-name>hideNoSelectionOption</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:literal>false</cdk:literal> - <jsp-ignore>true</jsp-ignore> - </property-extension> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/selectone-radio-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Width (in pixels) of the border to be drawn - around the table containing the options list. - </description> - <display-name>Table Border</display-name> - <icon /> - <property-name>border</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on disabled options. - </description> - <display-name>Disabled Label Class</display-name> - <icon /> - <property-name>disabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style class to apply to the rendered label - on enabled options. - </description> - <display-name>Enabled Label Class</display-name> - <icon /> - <property-name>enabledClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Orientation of the options list to be created. - Valid values are "pageDirection" (list is laid - out vertically), or "lineDirection" (list is - laid out horizontally). If not specified, the - default value is "lineDirection". - </description> - <display-name>Layout</display-name> - <icon /> - <property-name>layout</property-name> - <property-class>java.lang.String</property-class> - </property> -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/table-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/table-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/table-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Name or code of the background color for this table. - </description> - <display-name>Background Color</display-name> - <icon /> - <property-name>bgcolor</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Width (in pixels) of the border to be drawn - around this table. - </description> - <display-name>Table Border</display-name> - <icon /> - <property-name>border</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Definition of how much space the user agent should - leave between the border of each cell and its contents. - </description> - <display-name>Cell Padding</display-name> - <icon /> - <property-name>cellpadding</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Definition of how much space the user agent should - leave between the left side of the table and the - leftmost column, the top of the table and the top of - the top side of the topmost row, and so on for the - right and bottom of the table. It also specifies - the amount of space to leave between cells. - </description> - <display-name>Cell Spacing</display-name> - <icon /> - <property-name>cellspacing</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Comma-delimited list of CSS style classes that will be applied - to the columns of this table. A space separated list of - classes may also be specified for any individual column. If - the number of elements in this list is less than the number of - actual column children of the UIData, no "class" - attribute is output for each column greater than the number of - elements in the list. If the number of elements in the list - is greater than the number of actual column children of the - UIData, the elements at the posisiton in the list - after the last column are ignored. - </description> - <display-name>Column CSS Classes</display-name> - <icon /> - <property-name>columnClasses</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) that will be - applied to any footer generated for this table. - </description> - <display-name>Footer CSS Classes</display-name> - <icon /> - <property-name>footerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Code specifying which sides of the frame surrounding - this table will be visible. Valid values are: - none (no sides, default value); above (top side only); - below (bottom side only); hsides (top and bottom sides - only); vsides (right and left sides only); lhs (left - hand side only); rhs (right hand side only); box - (all four sides); and border (all four sides). - </description> - <display-name>Table Frame</display-name> - <icon /> - <property-name>frame</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) that will be - applied to any caption generated for this table. - </description> - <display-name>Caption CSS Classes</display-name> - <icon /> - <property-name>captionClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - CSS style(s) to be applied when this caption is rendered. - </description> - <display-name>Caption CSS Styles</display-name> - <icon /> - <property-name>captionStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Space-separated list of CSS style class(es) that will be - applied to any header generated for this table. - </description> - <display-name>Header CSS Classes</display-name> - <icon /> - <property-name>headerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Comma-delimited list of CSS style classes that will be applied - to the rows of this table. A space separated list of classes - may also be specified for any individual row. Thes styles are - applied, in turn, to each row in the table. For example, if - the list has two elements, the first style class in the list - is applied to the first row, the second to the second row, the - first to the third row, the second to the fourth row, etc. In - other words, we keep iterating through the list until we reach - the end, and then we start at the beginning again. - </description> - <display-name>Row CSS Classes</display-name> - <icon /> - <property-name>rowClasses</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - Code specifying which rules will appear between cells - within this table. Valid values are: none (no rules, - default value); groups (between row groups); rows - (between rows only); cols (between columns only); and - all (between all rows and columns). - </description> - <display-name>Table Rules</display-name> - <icon /> - <property-name>rules</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Summary of this table's purpose and structure, for - user agents rendering to non-visual media such as - speech and Braille. - </description> - <display-name>Table Summary</display-name> - <icon /> - <property-name>summary</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - Width of the entire table, for visual user agents. - </description> - <display-name>Table Width</display-name> - <icon /> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - <property> - <description> - Comma separated list of row indices for which a new - "tbody" element should be started (and any - previously opened one should be ended). - </description> - <display-name>Body Rows</display-name> - <icon /> - <property-name>bodyrows</property-name> - <property-class>java.lang.String</property-class> - </property> - -</cdk:properties> Deleted: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/text-props.xml =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/text-props.xml 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/cdk/attributes/text-props.xml 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - JBoss, Home of Professional Open Source Copyright ${year}, 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. - --> -<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee"> - <property> - <description> - Alternate textual description of the - element rendered by this component. - </description> - <display-name>Alternate Text</display-name> - <icon /> - <property-name>alt</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - If the value of this attribute is "off", render "off" as the value - of the attribute. This indicates that the browser should - disable its autocomplete feature for this component. This is - useful for components that perform autocompletion and do not - want the browser interfering. If this attribute is not set or the value - is "on", render nothing. - </description> - <display-name>Enable or disable browser autocompletion.</display-name> - <icon /> - <property-name>autocomplete</property-name> - <property-class>java.lang.String</property-class> - </property> - - <property> - <description> - The maximum number of characters that may - be entered in this field. - </description> - <display-name>Maximum Length</display-name> - <icon /> - <property-name>maxlength</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> - - <property> - <description> - The number of characters used to determine - the width of this field. - </description> - <display-name>Field Width</display-name> - <icon /> - <property-name>size</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:pass-through>true</cdk:pass-through> - </property-extension> - </property> -</cdk:properties> Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -0,0 +1,47 @@ +package org.richfaces.cdk; + +import static org.junit.Assert.*; + +import java.io.File; + +import org.junit.Test; + +import com.google.common.collect.Lists; + + +public class CdkClassLoaderTest extends CdkTestBase { + + @Test + public void resourcePath() throws Exception { + File libraryFile = getLibraryFile("test.source.properties"); + assertNotNull(libraryFile); + assertTrue(libraryFile.isDirectory()); + } + + @Test + public void resourcePath2() throws Exception { + File libraryFile = getLibraryFile("test.source.properties"); + File libraryFile2 = getLibraryFile("org/richfaces/cdk/apt/test.html"); + assertNotNull(libraryFile); + assertEquals(libraryFile,libraryFile2); + } + + @Test + public void resourcePath3() throws Exception { + File libraryFile = getLibraryFile("javax/faces/component/UIComponent.class"); + assertNotNull(libraryFile); + assertFalse(libraryFile.isDirectory()); + assertTrue(libraryFile.getName().contains("jsf-api")); + } + + @Test + public void testClassLoader() throws Exception { + Iterable<File> paths = Lists.newArrayList(getLibraryFile("test.source.properties"),getLibraryFile("javax/faces/component/UIComponent.class")); + CdkClassLoader loader = new CdkClassLoader(paths,null); + Class<?> class1 = loader.loadClass("javax.faces.application.Application"); + assertNotNull(loader.getResource("javax/faces/FacesException.class")); + assertNotNull(loader.getResource("org/richfaces/cdk/apt/test.html")); + assertNull(loader.getResource("javax/el/ELContext.class")); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -38,13 +38,17 @@ import org.junit.After; import org.junit.Before; +import org.richfaces.cdk.annotations.Component; +import com.google.common.collect.ImmutableList; + /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com * */ public class CdkTestBase { + protected Iterable<File> testSourceDirectory; @Before @@ -83,4 +87,34 @@ return classFile; } + + protected File getLibraryFile(String resource) throws Exception { + URL url = this.getClass().getClassLoader().getResource(resource); + if(null != url){ + if("file".equals(url.getProtocol())){ + String path = url.getPath(); + // trim resource path + path = path.substring(0, path.length()-resource.length()); + File dir = new File(path); + return dir; + } else if ("jar".equals(url.getProtocol())) { + String jarPath = url.getPath(); + jarPath = jarPath.substring(0, jarPath.indexOf('!')); + File file = new File(new URI(jarPath)); + return file; + } else { + throw new Exception("Unknown protocol "+url.getProtocol()); + } + } else { + throw new Exception("Resource does not exists "+resource); + } + } + + protected File getLibraryFile(Class<?> clazz) throws Exception { + return getLibraryFile(clazz.getName().replaceAll("\\.", "/")+".class"); + } + + protected CdkClassLoader createClassLoader() throws Exception { + return new CdkClassLoader(ImmutableList.of(getLibraryFile("test.source.properties"),getLibraryFile(Component.class)), null); + } } Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,8 +33,10 @@ import java.io.File; +import java.net.MalformedURLException; import java.net.URISyntaxException; +import java.util.Collections; import java.util.Set; import javax.annotation.processing.ProcessingEnvironment; @@ -58,11 +60,10 @@ import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkWriter.OutputType; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.Component; -import org.richfaces.cdk.apt.CdkProcessor.BeanProperty; -import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.apt.SourceUtils.BeanProperty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -99,7 +100,7 @@ expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(TestAnnotation.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); Processor processor = createMock(Processor.class); @@ -112,7 +113,7 @@ expect(processor.process(capture(capturedTypes), capture(new Capture<RoundEnvironment>()))).andReturn(true).times(2); - expect(processor.getSupportedAnnotationTypes()).andReturn(ImmutableSet.of(TestAnnotation.class.getName())); + expect(processor.getSupportedAnnotationTypes()).andReturn(ImmutableSet.of("*")); expect(processor.getSupportedSourceVersion()).andReturn(SourceVersion.RELEASE_6); replay(processor); @@ -138,7 +139,7 @@ expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(TestAnnotation2.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); Processor processor = createMock(Processor.class); @@ -182,20 +183,21 @@ expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(TestAnnotation2.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); - TestProcessor processor = new TestProcessor(cdkContext) { + TestProcessor processor = new TestProcessor() { @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { if (!roundEnv.processingOver()) { - this.numOfComponents = getClassesAnnotatedWith(roundEnv, Component.class).size(); + this.numOfComponents = roundEnv.getElementsAnnotatedWith(Component.class).size(); } return true; } }; + processor.init(cdkContext); // ComponentLibrary library = new // ComponentLibrary("org.richfaces.cdk.test"); // processor.library = library; @@ -223,15 +225,17 @@ expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(TestAnnotation2.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); - TestProcessor processor = new TestProcessor(cdkContext) { + TestProcessor processor = new TestProcessor() { @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { if (!roundEnv.processingOver()) { - TypeElement typeElement = getClassesAnnotatedWith(roundEnv, Component.class).iterator().next(); - Set<BeanProperty> beanProperties = getBeanPropertiesAnnotatedWith(Attribute.class, typeElement); + SourceUtils utils = new SourceUtils(processingEnv,roundEnv); + utils.init(getContext()); + TypeElement typeElement = utils.getClassesAnnotatedWith(Component.class).iterator().next(); + Set<BeanProperty> beanProperties = utils.getBeanPropertiesAnnotatedWith(Attribute.class, typeElement); assertEquals(3, beanProperties.size()); @@ -256,6 +260,7 @@ return true; } }; + processor.init(cdkContext); // ComponentLibrary library = new // ComponentLibrary("org.richfaces.cdk.test"); @@ -270,11 +275,9 @@ } private static abstract class TestProcessor extends CdkProcessor { - protected ComponentLibrary library; protected int numOfComponents; - public TestProcessor(CdkContext context) { - super(context); + public TestProcessor() { } @Override Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -26,34 +26,23 @@ package org.richfaces.cdk.apt; import static org.easymock.EasyMock.*; - import static org.junit.Assert.*; -import static javax.lang.model.util.ElementFilter.*; +import java.util.Collection; +import java.util.Map; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import javax.el.ELContext; +import javax.faces.component.UIComponent; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; - -import java.util.Collection; -import java.util.Set; -import java.util.logging.LogManager; - -import org.junit.After; -import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; - +import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.RichFacesConventions; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkWriter.OutputType; +import org.richfaces.cdk.annotations.Family; import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Property; @@ -61,7 +50,6 @@ import org.richfaces.cdk.xmlconfig.JAXBBinding; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; /** @@ -83,24 +71,26 @@ * @throws Exception */ @Test + @Ignore public void testProcess() throws Exception { // Prepare Mock compilation context. CdkContext cdkContext = createMockContext(); - ComponentLibrary library = new ComponentLibrary(); - ComponentProcessor processor = new ComponentProcessor(cdkContext, library); + CdkProcessor processor = new CdkProcessor(); AptBuilder compiler = new AptBuilder(); compiler.init(cdkContext); + processor.init(cdkContext); compiler.process(ImmutableList.of(getJavaFile(COMPONENT_CLASS_JAVA)), processor); verify(cdkContext); + ComponentLibrary library = cdkContext.getLibrary(); Collection<Component> components = library.getComponents(); assertEquals(1, components.size()); Component component = Iterables.get(components, 0); - Collection<Property> attributes = component.getAttributes(); + Map<String, Property> attributes = component.getAttributes(); assertEquals(17, attributes.size()); } @@ -113,24 +103,26 @@ * @throws Exception */ @Test + @Ignore public void testProcessFacesComponent() throws Exception { // Prepare Mock compilation context. CdkContext cdkContext = createMockContext(); - ComponentLibrary library = new ComponentLibrary(); - ComponentProcessor processor = new ComponentProcessor(cdkContext, library); + CdkProcessor processor = new CdkProcessor(); AptBuilder compiler = new AptBuilder(); compiler.init(cdkContext); + processor.init(cdkContext); compiler.process(ImmutableList.of(getJavaFile(FACES_COMPONENT_CLASS_JAVA)), processor); verify(cdkContext); + ComponentLibrary library = cdkContext.getLibrary(); Collection<Component> components = library.getComponents(); assertEquals(1, components.size()); Component component = Iterables.get(components, 0); - Collection<Property> attributes = component.getAttributes(); + Map<String, Property> attributes = component.getAttributes(); assertEquals(15, attributes.size()); } @@ -139,20 +131,22 @@ CdkContext cdkContext = createMock(CdkContext.class); expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); - expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(TestAnnotation.class.getClassLoader()); + expect(cdkContext.getOutputFolder((org.richfaces.cdk.CdkContext.OutputType) anyObject())).andStubReturn(null); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); + expect(cdkContext.getLibrary()).andStubReturn(new ComponentLibrary()); RichFacesConventions richFacesConventions = new RichFacesConventions(); - expect(cdkContext.getWorkerInstance(NamingConventions.class)).andStubReturn(richFacesConventions); + expect(cdkContext.getWorker(NamingConventions.class)).andStubReturn(richFacesConventions); FragmentParser fragmentParser = new FragmentParser(); - expect(cdkContext.getWorkerInstance(FragmentParser.class)).andStubReturn(fragmentParser); + expect(cdkContext.getWorker(FragmentParser.class)).andStubReturn(fragmentParser); JAXBBinding jaxbBinding = new JAXBBinding(); - expect(cdkContext.getWorkerInstance(JAXBBinding.class)).andStubReturn(jaxbBinding); + expect(cdkContext.getWorker(JAXBBinding.class)).andStubReturn(jaxbBinding); + expect(cdkContext.setWorker(SourceUtils.class,(SourceUtils)anyObject())).andStubReturn(null); replay(cdkContext); richFacesConventions.init(cdkContext); jaxbBinding.init(cdkContext); @@ -160,4 +154,14 @@ return cdkContext; } + + protected CdkClassLoader createClassLoader() throws Exception { + return new CdkClassLoader(ImmutableList.of(getLibraryFile("test.source.properties"), + getLibraryFile(Component.class), + getLibraryFile(ELContext.class), + getLibraryFile(Family.class), + getLibraryFile(UIComponent.class)), + this.getClass().getClassLoader()); + } + } Deleted: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileManagerTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,149 +0,0 @@ -package org.richfaces.cdk.apt; - -import static org.junit.Assert.*; - -import static org.easymock.EasyMock.*; - -import static org.hamcrest.CoreMatchers.*; - -import java.io.File; -import java.io.IOException; - -import java.net.URI; -import java.net.URL; - -import java.util.ArrayList; - -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; -import javax.tools.JavaFileObject.Kind; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; - -public class VirtualFileManagerTest { - private static final String TEST_CLASS = "TestClass"; - private static final String TEST_PACKAGE = "org.richfaces.cdk.apt"; - private static final String TEST_CLASS_NAME = TEST_PACKAGE + "." + TEST_CLASS; - private File javaSourceDirectory; - private JavaFileManager mockFileManager; - - @Before - public void setUp() throws Exception { - mockFileManager = createMock(JavaFileManager.class); - - URL url = this.getClass().getResource(TEST_CLASS + ".java"); - final File classFile = new File(url.toURI()); - - javaSourceDirectory = classFile.getParentFile().getParentFile(); - } - - @After - public void tearDown() { - mockFileManager = null; - } - - @Test - public void testGetJavaFileForInputSource() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - - JavaFileObject fileObject = fileManager.getJavaFileForInput(StandardLocation.SOURCE_PATH, "apt." + TEST_CLASS, - Kind.SOURCE); - - assertNotNull(fileObject); - assertThat(fileObject, instanceOf(VirtualJavaFileObject.class)); - - JavaFileObject fileObject1 = fileManager.getJavaFileForInput(StandardLocation.SOURCE_PATH, "apt." + TEST_CLASS, - Kind.SOURCE); - - assertSame(fileObject, fileObject1); - } - - @Test - public void testHasLocationLocation() { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - assertTrue(fileManager.hasLocation(StandardLocation.SOURCE_PATH)); - } - - @Test - public void testListLocationStringSetOfKindBoolean() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - - ArrayList<JavaFileObject> list = Lists.newArrayList(fileManager.list(StandardLocation.SOURCE_PATH, "apt", - ImmutableSet.of(Kind.HTML), false)); - - assertEquals(1, list.size()); - } - - @Test - public void testListRecursive() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - - ArrayList<JavaFileObject> list = Lists.newArrayList(fileManager.list(StandardLocation.SOURCE_PATH, "", - ImmutableSet.of(Kind.HTML), true)); - - assertEquals(1, list.size()); - } - - @Test - public void testListRecursiveJava() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - - ArrayList<JavaFileObject> list = Lists.newArrayList(fileManager.list(StandardLocation.SOURCE_PATH, "", - ImmutableSet.of(Kind.HTML, Kind.SOURCE), true)); - - assertEquals(6, list.size()); - } - - @Test - public void testGetFileForInputLocationStringString() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - expect(mockFileManager.getFileForInput(StandardLocation.CLASS_PATH, - TestAnnotation.class.getPackage().getName(), - TestAnnotation.class.getSimpleName() - + ".class")).andReturn(new VirtualJavaFileObject(new URI("file:/TestAnnotation.class"), Kind.CLASS)); - replay(mockFileManager); - - FileObject fileObject = fileManager.getFileForInput(StandardLocation.CLASS_PATH, - TestAnnotation.class.getPackage().getName(), - TestAnnotation.class.getSimpleName() + ".class"); - - assertNotNull(fileObject); - assertThat(fileObject, instanceOf(VirtualJavaFileObject.class)); - } - - @Test - public void testGetFileForInputLocationFromSource() throws Exception { - VirtualFileManager fileManager = new VirtualFileManager(mockFileManager, this.getClass().getClassLoader()); - - fileManager.setJavaSourceDirectory(javaSourceDirectory); - replay(mockFileManager); - - FileObject fileObject = fileManager.getFileForInput(StandardLocation.SOURCE_PATH, "apt", TEST_CLASS + ".java"); - - assertNotNull(fileObject); - assertThat(fileObject, instanceOf(VirtualJavaFileObject.class)); - } -} Deleted: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,133 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.apt; - -import java.io.File; -import java.io.InputStream; -import java.io.Reader; - -import java.net.URISyntaxException; -import java.net.URL; - -import java.nio.charset.Charset; - -import javax.tools.JavaFileObject.Kind; - -import junit.framework.TestCase; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public class VirtualFileTest extends TestCase { - private static final String CONTENT = "<html><body>test</body></html>\n"; - - /** - * Test method for {@link org.richfaces.cdk.apt.VirtualJavaFileObject#getLastModified()}. - * @throws Exception - */ - public void testGetLastModified() throws Exception { - URL resource = getTestResource(); - File testFile = new File(resource.toURI()); - long lastModified = testFile.lastModified(); - - assertEquals(lastModified, new VirtualJavaClassPathObject(resource, Kind.HTML).getLastModified()); - assertEquals(lastModified, new VirtualJavaFileSystemObject(testFile, Kind.HTML).getLastModified()); - } - - /** - * <p class="changed_added_4_0"></p> - * @return - */ - protected URL getTestResource() { - return this.getClass().getResource("test.html"); - } - - /** - * Test method for {@link org.richfaces.cdk.apt.VirtualJavaFileObject#openInputStream()}. - * @throws Exception - */ - public void testOpenInputStream() throws Exception { - VirtualJavaFileObject fileObject = createFileObject(); - InputStream inputStream = fileObject.openInputStream(); - byte buff[] = new byte[CONTENT.getBytes().length + 10]; - int read = inputStream.read(buff, 0, CONTENT.getBytes().length); - - inputStream.close(); - - String result = new String(buff, 0, read); - - assertEquals(CONTENT, result); - } - - /** - * Test method for {@link org.richfaces.cdk.apt.VirtualJavaFileObject#getCharContent(boolean)}. - * @throws Exception - */ - public void testGetCharContentBoolean() throws Exception { - VirtualJavaFileObject fileObject = createFileObject(); - CharSequence charContent = fileObject.getCharContent(true); - - assertEquals(CONTENT, charContent.toString()); - } - - /** - * Test method for {@link org.richfaces.cdk.apt.VirtualJavaFileObject#openReader(boolean)}. - * @throws Exception - */ - public void testOpenReaderBoolean() throws Exception { - VirtualJavaFileObject fileObject = createFileObject(); - Reader reader = fileObject.openReader(true); - char buff[] = new char[CONTENT.length() + 10]; - int read = reader.read(buff); - - reader.close(); - - String result = new String(buff, 0, read); - - assertEquals(CONTENT, result); - } - - /** - * <p class="changed_added_4_0"></p> - * @return - * @throws URISyntaxException - */ - protected VirtualJavaFileObject createFileObject() throws URISyntaxException { - return new VirtualJavaClassPathObject(getTestResource(), Kind.HTML); - } - - /** - * Test method for {@link org.richfaces.cdk.apt.VirtualJavaFileObject#setCharset(java.nio.charset.Charset)}. - * @throws Exception - */ - public void testSetCharset() throws Exception { - VirtualJavaFileObject javaFileObject = createFileObject(); - - javaFileObject.setCharset(Charset.forName("UTF-8")); - } -} Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,33 +1,18 @@ package org.richfaces.cdk.freemarker; import static org.easymock.EasyMock.*; - import static org.junit.Assert.*; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; - -import java.util.logging.LogManager; - -import org.junit.After; -import org.junit.Before; import org.junit.Test; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkWriter.OutputType; -import org.richfaces.cdk.apt.TestAnnotation; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.Searchable; import org.richfaces.cdk.model.Visitable; public class FreeMarkerRendererTest extends CdkTestBase { @@ -70,12 +55,12 @@ assertEquals("foo.Bar", output.toString()); } - private CdkContext createMockContext() { + private CdkContext createMockContext() throws Exception { CdkContext cdkContext = createMock(CdkContext.class); expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(FreeMarkerRendererTest.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); return cdkContext; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -27,23 +27,17 @@ import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - import java.io.StringWriter; import java.io.Writer; - import java.util.Set; import javax.faces.component.UIOutput; import org.junit.Test; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkWriter.OutputType; -import org.richfaces.cdk.freemarker.FreeMarkerRendererTest; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; @@ -75,20 +69,20 @@ generator.init(mockContext); ComponentLibrary library = new ComponentLibrary(); - Component component = library.findOrCreateComponent("foo.bar"); - + Component component = new Component(new Component.Type("foo.bar")); + library.getComponents().add(component); component.setGenerate(true); component.setBaseClass(new ClassDescription(UIOutput.class)); component.setComponentClass(new ClassDescription("foo.bar.UIBar")); - Property attribute = component.findOrCreateAttribute("testValue"); + Property attribute = component.addAttribute("testValue"); attribute.setType(new ClassDescription(Object.class)); attribute.setGenerate(true); - attribute = component.findOrCreateAttribute("testFlag"); + attribute = component.addAttribute("testFlag"); attribute.setType(new ClassDescription(boolean.class)); attribute.setGenerate(true); - attribute = component.findOrCreateAttribute("id"); + attribute = component.addAttribute("id"); attribute.setType(new ClassDescription(String.class)); Set<EventName> eventNames = attribute.getEventNames(); @@ -108,12 +102,12 @@ // TODO - check generated file. } - private CdkContext createMockContext() { + private CdkContext createMockContext() throws Exception { CdkContext cdkContext = createMock(CdkContext.class); expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); - expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); - expect(cdkContext.getLoader()).andStubReturn(FreeMarkerRendererTest.class.getClassLoader()); + expect(cdkContext.getOutputFolder((org.richfaces.cdk.CdkContext.OutputType) anyObject())).andStubReturn(null); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); return cdkContext; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -44,30 +44,14 @@ public class ComponentLibraryTest { /** - * Test method for {@link org.richfaces.cdk.model.ComponentLibrary#merge(org.richfaces.cdk.model.ComponentLibrary)}. - */ - @Test - public void testMergeComponentLibrary() { - ComponentLibrary lib = new ComponentLibrary(); - ComponentLibrary otherLib = new ComponentLibrary(); - Component component = lib.findOrCreateComponent("foo.Bar"); - Component component2 = otherLib.findOrCreateComponent("foo.Bar"); - - otherLib.findOrCreateComponent("foo.baz"); - otherLib.findOrCreateRenderKit("foo.kit"); - lib.merge(otherLib); - assertEquals(2, lib.getComponents().size()); - assertEquals(1, lib.getRenderKits().size()); - } - - /** * Test method for {@link org.richfaces.cdk.model.ComponentLibrary#accept(org.richfaces.cdk.model.LibraryVisitor, java.lang.Object)}. * @throws Exception */ @Test public void testAcceptLibraryVisitorOfRPP() throws Exception { ComponentLibrary lib = new ComponentLibrary(); - final Component component = lib.findOrCreateComponent("foo.Bar"); + final Component component = new Component(new Component.Type("foo.Bar")); + lib.getComponents().add(component); LibraryVisitor<Boolean, Boolean> visitor = new LibraryVisitor<Boolean, Boolean>() { @Override public Boolean visit(Visitable c, Boolean param) { @@ -79,28 +63,15 @@ } /** - * Test method for {@link org.richfaces.cdk.model.ComponentLibrary#findOrCreateComponent(java.lang.String)}. - */ - @Test - public void testFindOrCreateComponent() { - ComponentLibrary lib = new ComponentLibrary(); - Component component = lib.findOrCreateComponent("foo.Bar"); - - assertNotNull(component); - assertEquals(new Component.Type("foo.Bar"), component.getKey()); - assertSame(component, lib.findOrCreateComponent("foo.Bar")); - } - - /** * Test method for {@link org.richfaces.cdk.model.ComponentLibrary#findOrCreateRenderer(java.lang.String, java.lang.String)}. */ @Test public void testFindOrCreateRenderKit() { ComponentLibrary lib = new ComponentLibrary(); - RenderKit renderKit = lib.findOrCreateRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT); + RenderKit renderKit = lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT); assertNotNull(renderKit); - assertSame(renderKit, lib.findOrCreateRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT)); + assertSame(renderKit, lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT)); } /** @@ -125,7 +96,7 @@ bar.setDoNotReplace("Replaced"); ComponentLibrary.merge(foo, bar); assertSame(result, foo.getResult()); - assertEquals(new ModelBean.Type("foo"), foo.getKey()); + assertEquals(new ModelBean.Type("foo"), foo.getType()); assertTrue(foo.isVizited()); assertEquals("Important", foo.getDoNotReplace()); assertNull(foo.readOnly); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ModelBean.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -33,7 +33,7 @@ * */ @SuppressWarnings("serial") -public class ModelBean implements ModelElement<ModelBean, ModelBean.Type> { +public class ModelBean implements ModelElement<ModelBean> { /** * <p class="changed_added_4_0"></p> @@ -54,6 +54,22 @@ /** * <p class="changed_added_4_0"></p> + * @return the type + */ + public Type getType() { + return this.type; + } + + /** + * <p class="changed_added_4_0"></p> + * @param type the type to set + */ + public void setType(Type type) { + this.type = type; + } + + /** + * <p class="changed_added_4_0"></p> * @return the vizited */ @Merge @@ -126,11 +142,6 @@ } @Override - public Type getKey() { - return type; - } - - @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { vizited = true; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/CdkResolverTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -1,27 +1,16 @@ package org.richfaces.cdk.xmlconfig; import static org.easymock.EasyMock.*; - import static org.junit.Assert.*; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; -import java.util.logging.LogManager; - -import org.junit.After; -import org.junit.Before; import org.junit.Test; - +import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkWriter.OutputType; -import org.richfaces.cdk.apt.TestAnnotation2; - import org.xml.sax.InputSource; public class CdkResolverTest extends CdkTestBase { @@ -31,7 +20,7 @@ // Prepare Mock compilation context. CdkContext cdkContext = createMockContext(); - expect(cdkContext.getLoader()).andStubReturn(CdkEntityResolver.class.getClassLoader()); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); CdkEntityResolver entityResolver = new CdkEntityResolver(cdkContext); @@ -45,7 +34,7 @@ // Prepare Mock compilation context. CdkContext cdkContext = createMockContext(); - ClassLoader loader = new ClassLoader(CdkEntityResolver.class.getClassLoader()) { + CdkClassLoader loader = new CdkClassLoader(CdkEntityResolver.class.getClassLoader()) { @Override public InputStream getResourceAsStream(String name) { if ("foo/bar.xml".equals(name)) { @@ -70,9 +59,8 @@ // Prepare Mock compilation context. CdkContext cdkContext = createMockContext(); - ClassLoader loader = CdkEntityResolver.class.getClassLoader(); - expect(cdkContext.getLoader()).andStubReturn(loader); + expect(cdkContext.getLoader()).andStubReturn(createClassLoader()); replay(cdkContext); CdkEntityResolver entityResolver = new CdkEntityResolver(cdkContext); @@ -85,7 +73,7 @@ CdkContext cdkContext = createMock(CdkContext.class); expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory); - expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null); + expect(cdkContext.getOutputFolder((org.richfaces.cdk.CdkContext.OutputType) anyObject())).andStubReturn(null); return cdkContext; } Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -28,6 +28,7 @@ import static org.junit.Assert.*; import java.util.Collection; +import java.util.Map; import org.junit.Test; @@ -49,7 +50,7 @@ public class FacesConfigTest extends CdkTestBase { @Test public void testComponentUnmarshal() throws Exception { - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); JAXBBinding jaxbBinding = new JAXBBinding(); jaxbBinding.init(contextBase); @@ -70,13 +71,13 @@ assertEquals("Panel", component.getDisplayname()); assertTrue(component.isGenerate()); - Facet facet = Iterables.getOnlyElement(component.getFacets()); - - assertEquals("header", facet.getName().toString()); + Facet facet = Iterables.getOnlyElement(component.getFacets().values()); + String key = Iterables.getOnlyElement(component.getFacets().keySet()); + assertEquals("header", key); assertEquals("Header facet", facet.getDescription()); assertTrue(facet.isGenerate()); - Collection<Property> attributes = component.getAttributes(); + Map<String, Property> attributes = component.getAttributes(); assertEquals(3, attributes.size()); } Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -29,11 +29,13 @@ import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Set; import org.junit.Test; import org.richfaces.cdk.CdkContextBase; +import org.richfaces.cdk.CdkTestBase; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.Property; @@ -44,15 +46,15 @@ * @author asmirnov(a)exadel.com * */ -public class FragmentParserTest { +public class FragmentParserTest extends CdkTestBase { @Test public void parserTest() throws Exception { FragmentParser parser = new FragmentParser(); - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); parser.init(contextBase); - Collection<Property> properties = + Map<String, Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/fragment.xml"); assertEquals(3, properties.size()); @@ -61,11 +63,11 @@ @Test public void xincludeTest() throws Exception { FragmentParser parser = new FragmentParser(); - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); parser.init(contextBase); - Collection<Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/parent.xml"); + Map<String, Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/parent.xml"); assertEquals(2, properties.size()); } @@ -73,11 +75,11 @@ @Test public void nestedXincludeTest() throws Exception { FragmentParser parser = new FragmentParser(); - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); parser.init(contextBase); - Collection<Property> properties = + Map<String, Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/parent2.xml"); assertEquals(2, properties.size()); @@ -86,18 +88,18 @@ @Test public void propertyTest() throws Exception { FragmentParser parser = new FragmentParser(); - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); parser.init(contextBase); - Collection<Property> properties = + Map<String, Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/properties.xml"); assertEquals(1, properties.size()); - Property property = Iterables.getOnlyElement(properties); + Property property = properties.get("ontest2"); - assertEquals("ontest2", property.getName().toString()); + assertNotNull(property); assertEquals("int", property.getType().getName()); assertEquals("test2 property", property.getDescription()); assertEquals("ontest2.png", property.getIcon().getSmallIcon()); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -11,6 +11,7 @@ import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.model.ComponentBean; +import org.richfaces.cdk.xmlconfig.model.PropertyBase; import org.richfaces.cdk.xmlconfig.model.ComponentBean.ComponentExtension; public class JAXBCopyTest { @@ -26,17 +27,17 @@ component.setDescription(FOO_DESCTIPTION); component.setComponentClass(new ClassDescription(FOO_UI_BAR)); - component.findOrCreateAttribute(BAZ); + component.addAttribute(BAZ); component.setFamily(FOO_FAMILY); ComponentBean componentBean = JAXBBinding.createAdapter(ComponentBean.class, component); assertEquals(FOO_BAR, componentBean.getType()); - List<Property> attributes = componentBean.getAttributes(); + List<PropertyBase> attributes = componentBean.getAttributes(); - assertEquals(1, attributes.size()); - assertEquals(BAZ, attributes.get(0).getName().toString()); + assertEquals(0, attributes.size()); + assertEquals(BAZ, attributes.get(0).getKey().toString()); ComponentExtension extension = componentBean.getExtension(); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -13,22 +13,24 @@ import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.RenderKit; +import org.richfaces.cdk.model.Renderer; import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; public class JaxbMarshalTest extends JaxbTestBase { @Test public void testMarshalResultStringT() throws Exception { - CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader()); + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); JAXBBinding jaxbBinding = new JAXBBinding(); jaxbBinding.init(contextBase); ComponentLibrary library = new ComponentLibrary(); - Component component = library.findOrCreateComponent("foo.bar"); - RenderKit renderKit = library.findOrCreateRenderKit("HTML"); + Component component = new Component( new Component.Type("foo.bar")); + library.getComponents().add(component); + RenderKit renderKit = library.addRenderKit("HTML"); + Renderer renderer = new Renderer(new Renderer.Type("foo.Renderer")); + renderKit.getRenderers().add(renderer); - renderKit.findOrCreateRenderer("foo.Renderer"); - StringWriter writer = new StringWriter(); StreamResult result = new StreamResult(writer); FacesConfigAdapter adapter = new FacesConfigAdapter(); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbTestBase.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -7,28 +7,16 @@ import org.junit.After; import org.junit.Before; +import org.richfaces.cdk.CdkTestBase; -public class JaxbTestBase { +public class JaxbTestBase extends CdkTestBase { protected static final String XML_PROLOG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; public JaxbTestBase() { super(); } - /** - * <p class="changed_added_4_0"></p> - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception {} - /** - * <p class="changed_added_4_0"></p> - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception {} - protected <T> T unmarshal(Class<T> type, String src) { StringBuilder xml = new StringBuilder(XML_PROLOG); Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java 2009-12-11 01:43:28 UTC (rev 16108) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/apt/TestClass.java 2009-12-11 01:44:15 UTC (rev 16109) @@ -30,5 +30,5 @@ * @author asmirnov(a)exadel.com * */ -@TestAnnotation("foo") +//@TestAnnotation("foo") public class TestClass {}