JBoss Rich Faces SVN: r16996 - in root/core/trunk/impl/src: test/java/org/richfaces/context and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-11 19:50:13 -0400 (Tue, 11 May 2010)
New Revision: 16996
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java
root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java
Log:
Fixed bug in ExtendedPartialViewContext for multiple meta-component IDs addition
Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-05-11 23:45:25 UTC (rev 16995)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-05-11 23:50:13 UTC (rev 16996)
@@ -326,7 +326,7 @@
//TODO replace with constant
sb.append(':');
}
- sb.append(componentId);
+ sb.append(metadataComponentId != null ? metadataComponentId : componentId);
List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes();
if (idTreeChildNodes != null) {
Modified: root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java
===================================================================
--- root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-05-11 23:45:25 UTC (rev 16995)
+++ root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-05-11 23:50:13 UTC (rev 16996)
@@ -748,5 +748,21 @@
"myForm:table:1:nestedTable:2:nestedTableText"
), trackingVisitCallback.getVisitedIds());
}
+
+ //TODO nick - add alike tests
+ @Test
+ public void testMultipleMetaComponentIds() throws Exception {
+ createVisitContext(true);
+
+ renderingContext.getIdsToVisit().add("myForm:table@header");
+ renderingContext.getIdsToVisit().add("myForm:table@footer");
+
+ assertTrue(renderingContext.getIdsToVisit().contains("myForm:table@header"));
+ assertTrue(renderingContext.getIdsToVisit().contains("myForm:table@footer"));
+
+ assertFalse(renderingContext.getIdsToVisit().contains("myForm"));
+ assertFalse(renderingContext.getIdsToVisit().contains("table"));
+ assertFalse(renderingContext.getIdsToVisit().contains("myForm:table"));
+ }
}
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16995 - in root/cdk/trunk/plugins: generator/src/main/java/org/richfaces/cdk/apt/processors and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-05-11 19:45:25 -0400 (Tue, 11 May 2010)
New Revision: 16995
Added:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagLibrary.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java
Modified:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.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/RenderKitModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
Log:
CODING IN PROGRESS - issue RF-7736: Library model verifier.
https://jira.jboss.org/jira/browse/RF-7736
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -46,7 +46,7 @@
*/
public String name() default "";
- public TagType type() default TagType.None;
+ public TagType type() default TagType.Facelets;
public String handler() default "";
Added: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagLibrary.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagLibrary.java (rev 0)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagLibrary.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.cdk.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation defines taglib for which all tags for JSF components from that packages belong to
+ *
+ * @author asmirnov
+ * @version $Id$
+ *
+ */
+(a)Retention(RetentionPolicy.SOURCE)
+(a)Target(ElementType.PACKAGE)
+public @interface TagLibrary {
+ public String tlibVersion();
+
+ public String validatorClass();
+
+ public String displayName();
+
+ public String jspVersion();
+
+ public String listenerClass();
+
+ public String shortName();
+
+ public String uri();
+
+}
Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagLibrary.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -1,35 +1,24 @@
package org.richfaces.cdk.apt.processors;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import org.richfaces.cdk.NamingConventions;
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
import org.richfaces.cdk.apt.SourceUtils;
-import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ClassName;
-import org.richfaces.cdk.model.ComponentModel;
-import org.richfaces.cdk.model.ConverterModel;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.TagModel;
-import org.richfaces.cdk.model.ValidatorModel;
import org.richfaces.cdk.util.Strings;
-import org.richfaces.cdk.NamingConventions;
-import javax.faces.view.facelets.BehaviorHandler;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.ConverterHandler;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
-import javax.xml.validation.ValidatorHandler;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
public abstract class ProcessorBase {
- private static final String COMPONENT_HANDLER_NAME = ComponentHandler.class.getName();
- private static final String VALIDATOR_HANDLER_NAME = ValidatorHandler.class.getName();
- private static final String CONVERTER_HANDLER_NAME = ConverterHandler.class.getName();
- private static final String BEHAVIOR_HANDLER_NAME = BehaviorHandler.class.getName();
@Inject
private Provider<SourceUtils> sourceUtils;
@@ -52,45 +41,21 @@
if (!TagType.None.equals(tag.type())) {
String name = tag.name();
+ // TODO - move to validator.
if (Strings.isEmpty(name)) {
name = getNamingConventions().inferTagName(model.getId());
}
tagModel.setName(name);
tagModel.setType(tag.type());
tagModel.setTargetClass(ClassName.parseName(tag.handler()));
- tagModel.setBaseClass(ClassName.parseName(getBaseClass(tag, model)));
+ tagModel.setBaseClass(ClassName.parseName(tag.baseClass()));
tagModel.setGenerate(tag.generate());
- // TODO - move refference integrity to model.
- tagModel.setModel(model);
model.getTags().add(tagModel);
}
}
- private String getBaseClass(Tag tag, ModelElementBase model) {
- String baseClass = tag.baseClass();
- if (!Strings.isEmpty(baseClass)) {
- return baseClass;
- }
-
- if (model instanceof ComponentModel) {
- return COMPONENT_HANDLER_NAME;
-
- } else if (model instanceof ValidatorModel) {
- return VALIDATOR_HANDLER_NAME;
-
- } else if (model instanceof ConverterModel) {
- return CONVERTER_HANDLER_NAME;
-
- } else if (model instanceof BehaviorModel) {
- return BEHAVIOR_HANDLER_NAME;
-
- } else {
- throw new IllegalStateException("Unknown model class.");
- }
- }
-
protected void setClassNames(TypeElement componentElement, ModelElementBase modelElement,
String generatedClass) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -56,10 +56,6 @@
return new ModelElementBaseTemplateModel((ModelElementBase) obj, this);
}
- if (obj instanceof TagModel) {
- return new TagTemplateModel((TagModel) obj, this);
- }
-
return super.wrap(obj);
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -22,27 +22,37 @@
package org.richfaces.cdk.generate.freemarker;
+import org.richfaces.cdk.model.BehaviorModel;
+import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.ConverterModel;
+import org.richfaces.cdk.model.EventName;
+import org.richfaces.cdk.model.ModelElementBase;
+import org.richfaces.cdk.model.PropertyBase;
+import org.richfaces.cdk.model.TagModel;
+import org.richfaces.cdk.model.ValidatorModel;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
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.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
/**
* @author akolonitsky
* @since Feb 23, 2010
*/
public class TagTemplateModel extends BeanModel implements TemplateModel{
- private final TagModel model;
+// private final TagModel tagModel;
private Set<EventName> eventNames;
+ private final ModelElementBase model;
/**
* <p class="changed_added_4_0">
@@ -51,9 +61,10 @@
* @param object
* @param wrapper
*/
- public TagTemplateModel(TagModel object, BeansWrapper wrapper) {
+ public TagTemplateModel(ModelElementBase model,TagModel object, BeansWrapper wrapper) {
super(object, wrapper);
- model = object;
+ this.model = model;
+// this.tagModel = object;
}
@Override
@@ -70,13 +81,15 @@
return defaultEvent();
} else if ("objectType".equals(key)) {
return getObjectType();
+ } else if ("model".equals(key)) {
+ return wrapper.wrap(model);
}
return super.get(key);
}
private TemplateModel getObjectType() throws TemplateModelException {
- ModelElementBase modelElementBase = this.model.getModel();
+ ModelElementBase modelElementBase = this.model;
if (modelElementBase instanceof ComponentModel) {
return wrapper.wrap("Component");
}
@@ -121,7 +134,7 @@
if (null == eventNames) {
eventNames = Sets.newHashSet();
- for (PropertyBase property : model.getModel().getAttributes()) {
+ for (PropertyBase property : this.model.getAttributes()) {
eventNames.addAll(property.getEventNames());
}
}
@@ -130,7 +143,7 @@
}
private TemplateModel requiredAttributes() throws TemplateModelException {
- Collection<PropertyBase> attributes = model.getModel().getAttributes();
+ Collection<PropertyBase> attributes = this.model.getAttributes();
Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size());
for (PropertyBase entry : attributes) {
if (entry.isGenerate() && entry.isRequired()) {
@@ -142,7 +155,7 @@
}
private TemplateModel generatedAttributes() throws TemplateModelException {
- Collection<PropertyBase> attributes = model.getModel().getAttributes();
+ Collection<PropertyBase> attributes = this.model.getAttributes();
Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size());
for (PropertyBase entry : attributes) {
if (entry.isGenerate() && entry.isBindingAttribute()) {
@@ -153,7 +166,7 @@
return wrapper.wrap(models);
}
private TemplateModel attributes() throws TemplateModelException {
- Collection<PropertyBase> attributes = model.getModel().getAttributes();
+ Collection<PropertyBase> attributes = this.model.getAttributes();
Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size());
for (PropertyBase entry : attributes) {
models.add(new PropertyModel(entry, wrapper));
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -23,13 +23,18 @@
package org.richfaces.cdk.generate.java.taghandler;
import com.google.inject.Inject;
+
+import freemarker.ext.beans.BeansWrapper;
import freemarker.template.Configuration;
+import freemarker.template.ObjectWrapper;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Output;
import org.richfaces.cdk.Outputs;
+import org.richfaces.cdk.generate.freemarker.TagTemplateModel;
+import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.TagModel;
import org.richfaces.cdk.model.Trackable;
@@ -49,11 +54,13 @@
private final FileManager output;
+ private final Configuration configuration;
+
@Inject
public TagHandlerClassGenerator(Configuration configuration,
@Output(Outputs.JAVA_CLASSES) FileManager output) {
+ this.configuration = configuration;
this.output = output;
-
try {
template = configuration.getTemplate(TAGHANDLER_TEMPLATE);
} catch (IOException e) {
@@ -61,11 +68,10 @@
}
}
- public boolean process(TagModel tag) throws CdkException {
+ public boolean process(ModelElementBase model, TagModel tag) throws CdkException {
try {
- Writer writer = getOutput(tag);
-
- template.process(tag, writer);
+ Writer writer = getOutput(tag);
+ template.process(new TagTemplateModel(model, tag, (BeansWrapper) configuration.getObjectWrapper()), writer);
writer.close();
} catch (IOException e) {
throw new CdkException(e);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -38,11 +38,11 @@
*/
public class TagHandlerGeneratorVisitor extends EmptyVisitor {
- private Injector injector;
+ private final TagHandlerClassGenerator tagGenerator;
@Inject
- public TagHandlerGeneratorVisitor(Injector injector) {
- this.injector = injector;
+ public TagHandlerGeneratorVisitor(TagHandlerClassGenerator tagGenerator) {
+ this.tagGenerator = tagGenerator;
}
public void visitComponent(ComponentModel model) {
@@ -64,13 +64,9 @@
private void generateTagHandler(ModelElementBase model) {
for (TagModel tag : model.getTags()) {
if (tag.isGenerate()) {
- generateTagHandler(tag);
+ tagGenerator.process(model,tag);
}
}
}
- private void generateTagHandler(TagModel model) {
- TagHandlerClassGenerator generator = injector.getInstance(TagHandlerClassGenerator.class);
- generator.process(model);
- }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -77,6 +77,7 @@
protected Writer getOutput() throws CdkException {
try {
+ // TODO - use short name from the library.
return output.createOutput("META-INF/" + generator.getNamespace() + ".taglib.xml", library.lastModified());
} catch (IOException e) {
throw new CdkException(e);
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 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -86,6 +86,10 @@
private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel> create();
private ConfigExtension extension;
+
+ private String prefix;
+
+ private Taglib taglib;
private boolean metadataComplete;
@@ -316,6 +320,22 @@
this.metadataComplete = metadataComplete;
}
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public Taglib getTaglib() {
+ return taglib;
+ }
+
+ public void setTaglib(Taglib taglib) {
+ this.taglib = taglib;
+ }
+
@Override
public long lastModified() {
return lastModified;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -25,6 +25,8 @@
package org.richfaces.cdk.model;
+import org.richfaces.cdk.util.ComparatorUtils;
+
import java.util.Collection;
import javax.faces.render.RenderKitFactory;
@@ -114,7 +116,11 @@
@Override
public boolean same(RenderKitModel other) {
- return null != getRenderKitClass() && getRenderKitClass().equals(other.getRenderKitClass());
+ if(null != getId() && null != other.getId()){
+ return getId().equals(other.getId());
+ } else {
+ return ComparatorUtils.nullSafeEquals(getRenderKitClass(), other.getRenderKitClass());
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -37,12 +37,6 @@
private static final long serialVersionUID = 3875718626199223087L;
- /**
- * <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 FacesListener}
- */
- private ModelElementBase model;
-
private ClassName targetClass;
private ClassName baseClass;
@@ -56,14 +50,6 @@
private String name;
- public ModelElementBase getModel() {
- return model;
- }
-
- public void setModel(ModelElementBase model) {
- this.model = model;
- }
-
public String getName() {
return name;
}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -0,0 +1,163 @@
+/**
+ * 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 javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class contains information about tag library.
+ * @author asmirnov
+ *
+ */
+@XmlType(name = "taflib-configType", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+(a)XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+public class Taglib {
+ private String tlibVersion = null;
+ private ClassName validatorClass = null;
+ private String displayName;
+ private String jspVersion;
+ private ClassName listenerClass;
+ private String shortName;
+ private String taglib;
+ private String uri;
+
+ /**
+ * @return the displayName
+ */
+ public String getDisplayName() {
+ return this.displayName;
+ }
+
+ /**
+ * @param displayName the displayName to set
+ */
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ /**
+ * @return the listenerClass
+ */
+ public ClassName getListenerClass() {
+ return this.listenerClass;
+ }
+
+ /**
+ * @param listenerClass the listenerClass to set
+ */
+ public void setListenerClass(ClassName listenerClass) {
+ this.listenerClass = listenerClass;
+ }
+
+ /**
+ * @return the shortName
+ */
+ public String getShortName() {
+ return this.shortName;
+ }
+
+ /**
+ * @param shortName the shortName to set
+ */
+ public void setShortName(String shortName) {
+ this.shortName = shortName;
+ }
+
+ /**
+ * @return the taglib
+ */
+ public String getTaglib() {
+ return this.taglib;
+ }
+
+ /**
+ * @param taglib the taglib to set
+ */
+ public void setTaglib(String taglib) {
+ this.taglib = taglib;
+ }
+
+ /**
+ * @return the uri
+ */
+ public String getUri() {
+ return this.uri;
+ }
+
+ /**
+ * @param uri the uri to set
+ */
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+
+ /**
+ * @return the jspVersion
+ */
+ public String getJspVersion() {
+ return this.jspVersion;
+ }
+
+ /**
+ * @param jspVersion the jspVersion to set
+ */
+ public void setJspVersion(String jspVersion) {
+ this.jspVersion = jspVersion;
+ }
+
+ /**
+ * @return the tlibVersion
+ */
+ public String getTlibVersion() {
+ return this.tlibVersion;
+ }
+
+ /**
+ * @param tlibVersion the tlibVersion to set
+ */
+ public void setTlibVersion(String tlibVersion) {
+ this.tlibVersion = tlibVersion;
+ }
+
+ /**
+ * @return the validatorClass
+ */
+ public ClassName getValidatorClass() {
+ return this.validatorClass;
+ }
+
+ /**
+ * @param validatorClass the validatorClass to set
+ */
+ public void setValidatorClass(ClassName validatorClass) {
+ this.validatorClass = validatorClass;
+ }
+
+ @Override
+ public String toString() {
+ return "Lib: " + getShortName() + ", URL: " + getUri();
+ }
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Taglib.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -23,10 +23,6 @@
package org.richfaces.cdk.model.validator;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.NoSuchElementException;
-
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.Logger;
import org.richfaces.cdk.ModelValidator;
@@ -44,8 +40,18 @@
import org.richfaces.cdk.model.PropertyBase;
import org.richfaces.cdk.model.RenderKitModel;
import org.richfaces.cdk.model.RendererModel;
+import org.richfaces.cdk.model.TagModel;
import org.richfaces.cdk.util.Strings;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.NoSuchElementException;
+
+import javax.faces.view.facelets.BehaviorHandler;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.ConverterHandler;
+import javax.xml.validation.ValidatorHandler;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -60,6 +66,10 @@
*/
public class ValidatorImpl implements ModelValidator {
+ public static final ClassName DEFAULT_COMPONENT_HANDLER = new ClassName(ComponentHandler.class);
+ public static final ClassName DEFAULT_VALIDATOR_HANDLER = new ClassName(ValidatorHandler.class);
+ public static final ClassName DEFAULT_CONVERTER_HANDLER = new ClassName(ConverterHandler.class);
+ public static final ClassName DEFAULT_BEHAVIOR_HANDLER = new ClassName(BehaviorHandler.class);
/**
* <p class="changed_added_4_0">
* </p>
@@ -123,6 +133,10 @@
return namingConventions.inferBehaviorClass(id);
}
});
+ for(TagModel tag : behavior.getTags()){
+ verifyTag(tag, behavior.getId(), DEFAULT_BEHAVIOR_HANDLER);
+ }
+
}
}
@@ -206,6 +220,9 @@
// compact(component.getAttributes());
// Check renderers.
// Check Tag
+ for(TagModel tag : component.getTags()){
+ verifyTag(tag, component.getId(), DEFAULT_COMPONENT_HANDLER);
+ }
verifyDescription(component);
for (FacetModel facet : component.getFacets()) {
verifyDescription(facet);
@@ -213,6 +230,23 @@
}
}
+ protected void verifyTag(TagModel tag, FacesId id, ClassName handler) {
+ if(Strings.isEmpty(tag.getName())){
+ String defaultTagName = namingConventions.inferTagName(id);
+ tag.setName(defaultTagName);
+ }
+ if(tag.isGenerate()){
+ if(null == tag.getBaseClass()){
+ // TODO - choose default handler class by tag type.
+ tag.setBaseClass(handler);
+ }
+ if(null == tag.getTargetClass()){
+ namingConventions.inferTagHandlerClass(id, tag.getType().toString());// TODO - get markup somethere.
+ }
+ }
+ // TODO - copy component description to tag, if it has no description.
+ }
+
/**
* <p class="changed_added_4_0">
* </p>
@@ -235,7 +269,7 @@
}
}) && null == component.getFamily()) {
// Check family.
- component.setFamily(namingConventions.inferUIComponentFamily(component.getType()));
+ component.setFamily(namingConventions.inferUIComponentFamily(component.getId()));
}
}
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 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -39,6 +39,7 @@
import org.richfaces.cdk.model.EventModel;
import org.richfaces.cdk.model.Extensible;
import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.Taglib;
import org.richfaces.cdk.model.ValidatorModel;
import com.google.common.collect.Lists;
@@ -193,6 +194,11 @@
}
public static final class FacesConfigExtension extends ConfigExtension {
+
+ private String prefix;
+
+ private Taglib taglib;
+
private List<EventModel> events = Lists.newArrayList();
@XmlElement(name = "faces-event", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
@@ -209,5 +215,23 @@
public void setEvents(List<EventModel> events) {
this.events = events;
}
+
+ @XmlElement(name = "prefix", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ @XmlElement(name = "taglib", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ public void setTaglib(Taglib taglib) {
+ this.taglib = taglib;
+ }
+
+ public Taglib getTaglib() {
+ return taglib;
+ }
}
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -65,11 +65,10 @@
TagModel tagModel = new TagModel();
tagModel.setName("mytag");
- tagModel.setModel(model);
tagModel.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedTagHandler"));
tagModel.setBaseClass(ClassName.parseName(ComponentHandler.class.getName()));
- generator.process(tagModel);
+ generator.process(model,tagModel);
log.debug(outputWriter.toString());
verify(output);
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-05-11 23:45:25 UTC (rev 16995)
@@ -49,8 +49,8 @@
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-commons</artifactId>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>commons-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2010-05-11 19:23:53 UTC (rev 16994)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2010-05-11 23:45:25 UTC (rev 16995)
@@ -35,6 +35,7 @@
import org.apache.maven.model.FileSet;
import org.apache.maven.model.Resource;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
@@ -56,7 +57,7 @@
* @requiresDependencyResolution compile
* @phase generate-sources
*/
-public class GenerateMojo extends AbstractCDKMojo {
+public class GenerateMojo extends AbstractMojo {
private static final String[] JAVA_INCLUDES = new String[]{"**/*.java"};
private static final String MAIN_CONFIG = "src/main/config";
private static final String MAIN_TEMPLATES = "src/main/templates";
@@ -96,6 +97,11 @@
protected Map<String, String> options;
/**
+ * @parameter
+ */
+ protected Library library;
+
+ /**
* The directory for compiled classes.
*
* @parameter expression="${project.build.outputDirectory}"
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16994 - root/ui/core/trunk/api.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-05-11 15:23:53 -0400 (Tue, 11 May 2010)
New Revision: 16994
Modified:
root/ui/core/trunk/api/pom.xml
Log:
remove duplicated dependencies
Modified: root/ui/core/trunk/api/pom.xml
===================================================================
--- root/ui/core/trunk/api/pom.xml 2010-05-11 18:03:47 UTC (rev 16993)
+++ root/ui/core/trunk/api/pom.xml 2010-05-11 19:23:53 UTC (rev 16994)
@@ -111,16 +111,6 @@
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16993 - root/core/trunk/api/src/main/java/org/richfaces/log.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-11 14:03:47 -0400 (Tue, 11 May 2010)
New Revision: 16993
Modified:
root/core/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java
Log:
RF-8493
Modified: root/core/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java
===================================================================
--- root/core/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java 2010-05-11 17:35:55 UTC (rev 16992)
+++ root/core/trunk/api/src/main/java/org/richfaces/log/RichfacesLogger.java 2010-05-11 18:03:47 UTC (rev 16993)
@@ -1,5 +1,8 @@
package org.richfaces.log;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,4 +29,35 @@
public Logger getLogger() {
return LoggerFactory.getLogger(loggerName);
}
+
+ /**
+ *
+ * Return string which contains formated path from view root to component.
+ * @param component
+ * @return string
+ */
+ public static String getComponentPath(UIComponent component) {
+ StringBuilder builder = new StringBuilder("Component path: ");
+ if (component == null) {
+ builder.append("null");
+ } else {
+ getComponentPath(component, builder);
+ }
+ return builder.toString();
+ }
+
+ private static void getComponentPath(UIComponent component, StringBuilder builder) {
+ if (component != null) {
+ getComponentPath(component.getParent(), builder);
+ builder.append("/").append(component.getClass().getName());
+ if (component instanceof UIViewRoot) {
+ builder.append("[viewId=");
+ builder.append(((UIViewRoot) component).getViewId());
+ } else {
+ builder.append("[id=");
+ builder.append(component.getId());
+ }
+ builder.append("]");
+ }
+ }
}
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16992 - in root: commons/trunk and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-11 13:35:55 -0400 (Tue, 11 May 2010)
New Revision: 16992
Modified:
root/build/resources/trunk/checkstyle/pom.xml
root/commons/trunk/api/pom.xml
root/commons/trunk/bom/pom.xml
root/commons/trunk/parent/pom.xml
root/commons/trunk/pom.xml
Log:
Updated to use qualified artifact id's
Modified: root/build/resources/trunk/checkstyle/pom.xml
===================================================================
--- root/build/resources/trunk/checkstyle/pom.xml 2010-05-11 15:07:10 UTC (rev 16991)
+++ root/build/resources/trunk/checkstyle/pom.xml 2010-05-11 17:35:55 UTC (rev 16992)
@@ -1,14 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
- <artifactId>checkstyle</artifactId>
+ <artifactId>richfaces-build-checkstyle</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <name>Richfaces checkstyle</name>
+ <name>Richfaces Checkstyle</name>
<parent>
<groupId>org.richfaces</groupId>
Modified: root/commons/trunk/api/pom.xml
===================================================================
--- root/commons/trunk/api/pom.xml 2010-05-11 15:07:10 UTC (rev 16991)
+++ root/commons/trunk/api/pom.xml 2010-05-11 17:35:55 UTC (rev 16992)
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.commons</groupId>
- <artifactId>commons-api</artifactId>
+ <artifactId>richfaces-commons-api</artifactId>
<name>RichFaces Commons Api</name>
<dependencies>
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-05-11 15:07:10 UTC (rev 16991)
+++ root/commons/trunk/bom/pom.xml 2010-05-11 17:35:55 UTC (rev 16992)
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.commons</groupId>
- <artifactId>bom</artifactId>
+ <artifactId>richfaces-commons-bom</artifactId>
<packaging>pom</packaging>
<version>4.0.0-SNAPSHOT</version>
<name>RichFaces Commons BOM</name>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-11 15:07:10 UTC (rev 16991)
+++ root/commons/trunk/parent/pom.xml 2010-05-11 17:35:55 UTC (rev 16992)
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.commons</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>richfaces-commons-parent</artifactId>
<packaging>pom</packaging>
<version>4.0.0-SNAPSHOT</version>
<name>RichFaces Commons Parent</name>
@@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.commons</groupId>
- <artifactId>bom</artifactId>
+ <artifactId>richfaces-commons-bom</artifactId>
<version>${richfaces.commons.version}</version>
<type>pom</type>
<scope>import</scope>
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-11 15:07:10 UTC (rev 16991)
+++ root/commons/trunk/pom.xml 2010-05-11 17:35:55 UTC (rev 16992)
@@ -29,7 +29,7 @@
</parent>
<groupId>org.richfaces.commons</groupId>
- <artifactId>aggregator</artifactId>
+ <artifactId>richfaces-commons-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16991 - root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-11 11:07:10 -0400 (Tue, 11 May 2010)
New Revision: 16991
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/RepeatRenderer.java
Log:
Fixed renderer generation for a4j:repeat
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/RepeatRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/RepeatRenderer.java 2010-05-11 15:01:43 UTC (rev 16990)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/RepeatRenderer.java 2010-05-11 15:07:10 UTC (rev 16991)
@@ -29,13 +29,14 @@
import org.ajax4jsf.model.DataVisitResult;
import org.ajax4jsf.model.DataVisitor;
+import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.component.UIRepeat;
/**
* @author Nick Belaevski
*
*/
-//@JsfRenderer(type = "org.richfaces.RepeatRenderer")
+@JsfRenderer(type = "org.richfaces.RepeatRenderer", family = UIRepeat.COMPONENT_FAMILY)
public class RepeatRenderer extends Renderer {
@Override
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16990 - in root: dist/trunk and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-11 11:01:43 -0400 (Tue, 11 May 2010)
New Revision: 16990
Added:
root/dist/trunk/readme-examples.txt
root/dist/trunk/readme-ui.txt
root/dist/trunk/richfaces-examples.xml
root/dist/trunk/richfaces.xml
Removed:
root/JBossORG-EULA.txt
root/lgpl.txt
root/readme-examples.txt
root/readme-ui.txt
root/richfaces-examples.xml
root/richfaces.xml
Log:
move assembly resources in /dist
Deleted: root/JBossORG-EULA.txt
===================================================================
--- root/JBossORG-EULA.txt 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/JBossORG-EULA.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,104 +0,0 @@
-LICENSE AGREEMENT
-JBOSS(r)
-
-This License Agreement governs the use of the Software Packages and any updates to the Software
-Packages, regardless of the delivery mechanism. Each Software Package is a collective work
-under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
-the user ("Client") a license to the applicable collective work(s) pursuant to the
-GNU Lesser General Public License v. 2.1 except for the following Software Packages:
-(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
-GNU General Public License v.2;
-
-(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
-
-(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
-(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
-it may purchase a license from Sleepycat Software);
-
-and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
-and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
-royalty-free patent licenses.
-
-Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
-
-1. The Software. "Software Packages" refer to the various software modules that are created and made available
-for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
-may be comprised of hundreds of software components. The end user license agreement for each component is located in
-the component's source code. With the exception of certain image files identified in Section 2 below,
-the license terms for the components permit Client to copy, modify, and redistribute the component,
-in both source code and binary code forms. This agreement does not limit Client's rights under,
-or grant Client rights that supersede, the license terms of any particular component.
-
-2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
-and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
-remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
-individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
-in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
-using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
-trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
-these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
-If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
-http://www.jboss.com/company/logos unless a separate agreement with Red Hat is executed or other permission granted.
-Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
-
-3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
-component, to the maximum extent permitted under applicable law, the Software Packages and the
-components are provided and licensed "as is" without warranty of any kind, expressed or implied,
-including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
-Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
-materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
-Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
-or that the operation of the Software Packages will be entirely error free or appear precisely as described
-in the accompanying documentation. This warranty extends only to the party that purchases the Services
-pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
-
-4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
-described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
-exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
-delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
-refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
-Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
-damages, including lost profits or lost savings arising out of the use or inability to use the Software,
-even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
-Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
-Agreement during the twelve months preceding the action.
-
-5. Export Control. As required by U.S. law, Client represents and warrants that it:
-(a) understands that the Software Packages are subject to export controls under the
-U.S. Commerce Department's Export Administration Regulations ("EAR");
-
-(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
-(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
-
-(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
-or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
-
-(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
-biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
-regulation or specific license;
-
-(e) understands and agrees that if it is in the United States and exports or transfers the Software
-Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
-reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
-address (including country) of each transferee;
-
-and (f) understands that countries other than the United States may restrict the import, use, or
-export of encryption products and that it shall be solely responsible for compliance with any such
-import, use, or export restrictions.
-
-6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
-that are not part of the Software Packages and which Client must install separately. These third party
-programs are subject to their own license terms. The license terms either accompany the programs or
-can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
-license terms for such programs, then Client may not install them. If Client wishes to install the programs
-on more than one system or transfer the programs to another party, then Client must contact the licensor
-of the programs.
-
-7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
-enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
-State of North Carolina and of the United States, without regard to any conflict of laws provisions,
-except that the United Nations Convention on the International Sale of Goods shall not apply.
-
-Copyright 2006-2008 Red Hat, Inc. All rights reserved.
-"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
-All other trademarks are the property of their respective owners.
Copied: root/dist/trunk/readme-examples.txt (from rev 16981, root/readme-examples.txt)
===================================================================
--- root/dist/trunk/readme-examples.txt (rev 0)
+++ root/dist/trunk/readme-examples.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -0,0 +1,27 @@
+RichFaces 4.0 Examples
+=========================================================
+Version 4.0.0.ALPHA1
+
+This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
+
+Getting up and running quickly
+-------------------------------
+This demo application should be built using Maven 2.1.0
+
+tomcat6/jetty targetted build:
+1) execute "mvn install" in root application folder(richfaces-examples-4.x.y.z/richfaces-demo)
+2) Deploy to tomcat 6.x or just run using maven on jetty using "mvn jetty:run-war"
+
+For JEE5 application server:
+1) execute "mvn install -P jee5" in root application folder(richfaces-examples-4.x.y.z/richfaces-demo)
+2) Deploy to Jboss 4.x or higher or some other jee5 application servers.
+3) Do not forget to change the JSF implementation shipped with application server to JSF 2 (latest SNAPSHOT)
+
+To build both archives execute "mvn install -P release"
+
+Type http://localhost:8080/richfaces-demo in your browser command line after starting server.
+
+Learn more
+----------
+RichFaces Project - http://www.jboss.org/richfaces
+RichFaces 4.0 Wiki - http://www.jboss.org/community/wiki/RichFaces40Planning
\ No newline at end of file
Copied: root/dist/trunk/readme-ui.txt (from rev 16981, root/readme-ui.txt)
===================================================================
--- root/dist/trunk/readme-ui.txt (rev 0)
+++ root/dist/trunk/readme-ui.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -0,0 +1,43 @@
+RichFaces - Ajax enabled JSF 2.0 component library
+=========================================================
+Version 4.0.0.ALPHA1
+
+This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
+
+Getting up and running quickly
+-------------------------------
+
+1) Put RichFaces libraries and its dependencies in your application libraries folder:
+ 1.1) richfaces-api
+ 1.2) richfaces-impl
+ 1.3) core-ui
+ 1.4) commons-logging
+ 1.5) commons-beanutils
+ 1.6) slf4j-api
+ 1.7) slf4j-log4j12 (or whatever else - select the implementation according to logging framework that you use)
+
+2) As opposed to the previous 3.x.y versions of RichFaces, no special configuration steps are necessary.
+You don't need to modify web.xml or faces-config.xml
+
+3) Add RichFaces namespace/taglib declaration to your VDL/XHTML pages which will use RichFaces components
+ Use xmlns:a4j="http://richfaces.org/a4j" namespace
+
+4) Add one of the available RichFaces 4.0.A1 components to your page and try it!
+ 4.1) Take a look at the RichFaces examples distribution for assistance with usage.
+
+Available Components
+---------------------------------
+a4j:ajax
+a4j:commandLink
+a4j:commandButton
+a4j:push
+a4j:mediaOutput
+a4j:status
+a4j:jsFunction
+a4j:log
+a4j:outputPanel
+
+Learn more
+----------
+RichFaces Project - http://www.jboss.org/richfaces
+RichFaces 4.0 Wiki - http://www.jboss.org/community/wiki/RichFaces40Planning
\ No newline at end of file
Copied: root/dist/trunk/richfaces-examples.xml (from rev 16981, root/richfaces-examples.xml)
===================================================================
--- root/dist/trunk/richfaces-examples.xml (rev 0)
+++ root/dist/trunk/richfaces-examples.xml 2010-05-11 15:01:43 UTC (rev 16990)
@@ -0,0 +1,99 @@
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <files>
+ <file>
+ <source>lgpl.txt</source>
+ </file>
+ <file>
+ <source>readme-examples.txt</source>
+ <destName>readme.txt</destName>
+ </file>
+ <file>
+ <source>JBossORG-EULA.txt</source>
+ </file>
+ </files>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <includes>
+ <!--include>org.richfaces.examples:components</include -->
+ <include>org.richfaces.examples:richfaces-demo</include>
+ <!--<include>org.richfaces.examples:photoalbum</include>-->
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping>${module.artifactId}</outputDirectoryMapping>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>src/**</include>
+ <include>readme.txt</include>
+ <include>pom.xml</include>
+
+ <include>build.xml</include>
+ <include>maven-build.properties</include>
+ <include>maven-build.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+
+ <!--
+ <binaries>
+ <outputDirectory>${module.artifactId}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
+ </binaries>
+ -->
+ </moduleSet>
+
+ <!-- moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <includes>
+ <include>org.richfaces.examples.components:core-demo</include>
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping>components/${module.artifactId}</outputDirectoryMapping>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>src/**</include>
+ <include>readme.txt</include>
+ <include>pom.xml</include>
+
+ <include>build.xml</include>
+ <include>maven-build.properties</include>
+ <include>maven-build.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet -->
+
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <includes>
+ <include>org.richfaces:examples</include>
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping />
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Copied: root/dist/trunk/richfaces.xml (from rev 16981, root/richfaces.xml)
===================================================================
--- root/dist/trunk/richfaces.xml (rev 0)
+++ root/dist/trunk/richfaces.xml 2010-05-11 15:01:43 UTC (rev 16990)
@@ -0,0 +1,54 @@
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <files>
+ <file>
+ <source>lgpl.txt</source>
+ </file>
+ <file>
+ <source>readme-ui.txt</source>
+ <destName>readme.txt</destName>
+ </file>
+ <file>
+ <source>JBossORG-EULA.txt</source>
+ </file>
+ </files>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <includes>
+ <include>org.richfaces.framework:richfaces-api</include>
+ <include>org.richfaces.framework:richfaces-impl</include>
+ <include>org.richfaces.ui.components:core-ui</include>
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping>/</outputDirectoryMapping>
+ <excludeSubModuleDirectories>true</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ <outputDirectory>/lib/source</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/apidocs</directory>
+ <outputDirectory>/apidocs/${module.artifactId}</outputDirectory>
+ </fileSet>
+ </fileSets>
+ </sources>
+
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Deleted: root/lgpl.txt
===================================================================
--- root/lgpl.txt 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/lgpl.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
Deleted: root/readme-examples.txt
===================================================================
--- root/readme-examples.txt 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/readme-examples.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,27 +0,0 @@
-RichFaces 4.0 Examples
-=========================================================
-Version 4.0.0.ALPHA1
-
-This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
-
-Getting up and running quickly
--------------------------------
-This demo application should be built using Maven 2.1.0
-
-tomcat6/jetty targetted build:
-1) execute "mvn install" in root application folder(richfaces-examples-4.x.y.z/richfaces-demo)
-2) Deploy to tomcat 6.x or just run using maven on jetty using "mvn jetty:run-war"
-
-For JEE5 application server:
-1) execute "mvn install -P jee5" in root application folder(richfaces-examples-4.x.y.z/richfaces-demo)
-2) Deploy to Jboss 4.x or higher or some other jee5 application servers.
-3) Do not forget to change the JSF implementation shipped with application server to JSF 2 (latest SNAPSHOT)
-
-To build both archives execute "mvn install -P release"
-
-Type http://localhost:8080/richfaces-demo in your browser command line after starting server.
-
-Learn more
-----------
-RichFaces Project - http://www.jboss.org/richfaces
-RichFaces 4.0 Wiki - http://www.jboss.org/community/wiki/RichFaces40Planning
\ No newline at end of file
Deleted: root/readme-ui.txt
===================================================================
--- root/readme-ui.txt 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/readme-ui.txt 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,43 +0,0 @@
-RichFaces - Ajax enabled JSF 2.0 component library
-=========================================================
-Version 4.0.0.ALPHA1
-
-This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
-
-Getting up and running quickly
--------------------------------
-
-1) Put RichFaces libraries and its dependencies in your application libraries folder:
- 1.1) richfaces-api
- 1.2) richfaces-impl
- 1.3) core-ui
- 1.4) commons-logging
- 1.5) commons-beanutils
- 1.6) slf4j-api
- 1.7) slf4j-log4j12 (or whatever else - select the implementation according to logging framework that you use)
-
-2) As opposed to the previous 3.x.y versions of RichFaces, no special configuration steps are necessary.
-You don't need to modify web.xml or faces-config.xml
-
-3) Add RichFaces namespace/taglib declaration to your VDL/XHTML pages which will use RichFaces components
- Use xmlns:a4j="http://richfaces.org/a4j" namespace
-
-4) Add one of the available RichFaces 4.0.A1 components to your page and try it!
- 4.1) Take a look at the RichFaces examples distribution for assistance with usage.
-
-Available Components
----------------------------------
-a4j:ajax
-a4j:commandLink
-a4j:commandButton
-a4j:push
-a4j:mediaOutput
-a4j:status
-a4j:jsFunction
-a4j:log
-a4j:outputPanel
-
-Learn more
-----------
-RichFaces Project - http://www.jboss.org/richfaces
-RichFaces 4.0 Wiki - http://www.jboss.org/community/wiki/RichFaces40Planning
\ No newline at end of file
Deleted: root/richfaces-examples.xml
===================================================================
--- root/richfaces-examples.xml 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/richfaces-examples.xml 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,99 +0,0 @@
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
-
- <files>
- <file>
- <source>lgpl.txt</source>
- </file>
- <file>
- <source>readme-examples.txt</source>
- <destName>readme.txt</destName>
- </file>
- <file>
- <source>JBossORG-EULA.txt</source>
- </file>
- </files>
-
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
- <includes>
- <!--include>org.richfaces.examples:components</include -->
- <include>org.richfaces.examples:richfaces-demo</include>
- <!--<include>org.richfaces.examples:photoalbum</include>-->
- </includes>
-
- <sources>
- <outputDirectoryMapping>${module.artifactId}</outputDirectoryMapping>
- <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
- <fileSets>
- <fileSet>
- <includes>
- <include>src/**</include>
- <include>readme.txt</include>
- <include>pom.xml</include>
-
- <include>build.xml</include>
- <include>maven-build.properties</include>
- <include>maven-build.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
-
- <!--
- <binaries>
- <outputDirectory>${module.artifactId}</outputDirectory>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
- </binaries>
- -->
- </moduleSet>
-
- <!-- moduleSet>
- <includeSubModules>true</includeSubModules>
- <includes>
- <include>org.richfaces.examples.components:core-demo</include>
- </includes>
-
- <sources>
- <outputDirectoryMapping>components/${module.artifactId}</outputDirectoryMapping>
- <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
- <fileSets>
- <fileSet>
- <includes>
- <include>src/**</include>
- <include>readme.txt</include>
- <include>pom.xml</include>
-
- <include>build.xml</include>
- <include>maven-build.properties</include>
- <include>maven-build.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet -->
-
- <moduleSet>
- <includeSubModules>true</includeSubModules>
- <includes>
- <include>org.richfaces:examples</include>
- </includes>
-
- <sources>
- <outputDirectoryMapping />
- <fileSets>
- <fileSet>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
\ No newline at end of file
Deleted: root/richfaces.xml
===================================================================
--- root/richfaces.xml 2010-05-11 14:17:31 UTC (rev 16989)
+++ root/richfaces.xml 2010-05-11 15:01:43 UTC (rev 16990)
@@ -1,54 +0,0 @@
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
-
- <files>
- <file>
- <source>lgpl.txt</source>
- </file>
- <file>
- <source>readme-ui.txt</source>
- <destName>readme.txt</destName>
- </file>
- <file>
- <source>JBossORG-EULA.txt</source>
- </file>
- </files>
-
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
- <includes>
- <include>org.richfaces.framework:richfaces-api</include>
- <include>org.richfaces.framework:richfaces-impl</include>
- <include>org.richfaces.ui.components:core-ui</include>
- </includes>
-
- <sources>
- <outputDirectoryMapping>/</outputDirectoryMapping>
- <excludeSubModuleDirectories>true</excludeSubModuleDirectories>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <includes>
- <include>*-sources.jar</include>
- </includes>
- <outputDirectory>/lib/source</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/apidocs</directory>
- <outputDirectory>/apidocs/${module.artifactId}</outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
-
- <binaries>
- <includeDependencies>false</includeDependencies>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-</assembly>
\ No newline at end of file
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16989 - root/core/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-05-11 10:17:31 -0400 (Tue, 11 May 2010)
New Revision: 16989
Modified:
root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
Log:
similarityGroupingId was changed to requestGroupId
Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
===================================================================
--- root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-11 14:11:15 UTC (rev 16988)
+++ root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-05-11 14:17:31 UTC (rev 16989)
@@ -91,8 +91,8 @@
this.event = event;
- //similarityGroupingId is mutable, thus we need special field for it
- this.similarityGroupingId = this.queueOptions.similarityGroupingId;
+ //requestGroupId is mutable, thus we need special field for it
+ this.requestGroupId = this.queueOptions.requestGroupId;
this.eventsCount = 1;
};
@@ -102,16 +102,16 @@
return this.queueOptions.ignoreDupResponses;
},
- getSimilarityGroupingId: function() {
- return this.similarityGroupingId;
+ getRequestGroupId: function() {
+ return this.requestGroupId;
},
- setSimilarityGroupingId: function(id) {
- this.similarityGroupingId = id;
+ setRequestGroupId: function(id) {
+ this.requestGroupId = id;
},
- resetSimilarityGroupingId: function() {
- this.similarityGroupingId = undefined;
+ resetRequestGroupId: function() {
+ this.requestGroupId = undefined;
},
setReadyToSubmit: function(isReady) {
@@ -321,12 +321,12 @@
* */
push: function (source, event, options) {
var entry = new QueueEntry(this, source, event, options);
- var similarityGroupingId = entry.getSimilarityGroupingId();
+ var requestGroupId = entry.getRequestGroupId();
var lastEntry = getLastEntry();
if (lastEntry) {
- if (lastEntry.getSimilarityGroupingId() == similarityGroupingId) {
+ if (lastEntry.getRequestGroupId() == requestGroupId) {
log.debug("Similar request currently in queue");
log.debug("Combine similar requests and reset timer");
@@ -339,11 +339,11 @@
log.debug("Last queue entry is not the last anymore. Stopping requestDelay timer and marking entry as ready for submission")
lastEntry.stopTimer();
- lastEntry.resetSimilarityGroupingId();
+ lastEntry.resetRequestGroupId();
lastEntry.setReadyToSubmit(true);
items.push(entry);
- log.debug("New request added to queue. Queue similarityGroupingId changed to " + similarityGroupingId);
+ log.debug("New request added to queue. Queue requestGroupId changed to " + requestGroupId);
submitFirst();
}
} else {
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16988 - in root: build/parent/trunk and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-11 10:11:15 -0400 (Tue, 11 May 2010)
New Revision: 16988
Modified:
root/build/bom/trunk/pom.xml
root/build/parent/trunk/pom.xml
root/commons/trunk/api/pom.xml
root/commons/trunk/bom/pom.xml
root/commons/trunk/parent/pom.xml
root/commons/trunk/pom.xml
Log:
Coding in progress, updated based on - http://community.jboss.org/wiki/RichFaces40BuildDirectoryStructure
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/build/bom/trunk/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -1,4 +1,3 @@
-
<!--
JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
Inc. and individual contributors by the @authors tag. See the
@@ -47,8 +46,9 @@
<richfaces.ui.input.version>4.0.0-SNAPSHOT</richfaces.ui.input.version>
<richfaces.ui.output.version>4.0.0-SNAPSHOT</richfaces.ui.output.version>
<richfaces.ui.iteration.version>4.0.0-SNAPSHOT</richfaces.ui.iteration.version>
- <!-- cdk is not really a runtime dependency for RichFaces
- <richfaces.cdk.version>4.0.0-SNAPSHOT</richfaces.cdk.version>
+ <!--
+ cdk is not really a runtime dependency for RichFaces
+ <richfaces.cdk.version>4.0.0-SNAPSHOT</richfaces.cdk.version>
-->
</properties>
@@ -67,7 +67,7 @@
<artifactId>commons</artifactId>
<version>${richfaces.commons.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
@@ -92,14 +92,32 @@
<version>${richfaces.ui.iteration.version}</version>
</dependency>
- <!-- cdk is not really a runtime dependency for RichFaces
- <dependency>
- <groupId>org.richfaces</groupId>
+ <!--
+ cdk is not really a runtime dependency for RichFaces
+ <dependency> <groupId>org.richfaces</groupId>
<artifactId>cdk</artifactId>
<version>${richfaces.cdk.version}</version>
- </dependency>
+ </dependency>
-->
+ <!-- JSF 2 -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/build/parent/trunk/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -1,4 +1,3 @@
-
<!--
JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
Inc. and individual contributors by the @authors tag. See the
@@ -34,7 +33,7 @@
</parent>
<description>
- The Parent for all RichFaces sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the richfaces-bom.
+ The Parent for all RichFaces sub-projects. This specifies build, plugin and project meta-data.
</description>
<url>http://www.jboss.org/richfaces</url>
@@ -97,30 +96,138 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
- <!-- Dependency management - import bom, and define any test, or other dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${richfaces.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
-
- <!-- Test Dependencies -->
- </dependencyManagement>
<!-- Build -->
+ <build>
+ <!-- Plugin config, including versions to use in the build.
+ Note: some are inherited from jboss-parent
+ -->
+ <pluginManagement>
+ <plugins>
+ <!-- TODO: change to the current CDK version -->
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-javascript-plugin</artifactId>
+ <version>3.3.1.GA</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <!-- <version>2.5.1</version> -->
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+ <addDefaultSpecificationEntries>
+ true
+ </addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <mode>development</mode>
+ <Build-Number>${buildNumber}</Build-Number>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.1.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <!-- Plugin config, including versions to use in the build -->
+
<!-- Profiles -->
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <javadocVersion>1.5</javadocVersion>
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<!-- SCM and distribution management -->
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/trunk</developerConnection>
Modified: root/commons/trunk/api/pom.xml
===================================================================
--- root/commons/trunk/api/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/commons/trunk/api/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -1,62 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.richfaces</groupId>
- <artifactId>framework</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-commons</artifactId>
- <name>RichFaces commons classes</name>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>commons-api</artifactId>
+ <name>RichFaces Commons Api</name>
+
+ <dependencies>
+ <!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/commons/trunk/bom/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -0,0 +1,63 @@
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>bom</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>RichFaces Commons BOM</name>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <description>
+ The RichFaces Commons "Bill of Materials". This defines any commons specific runtime dependency versions.
+ </description>
+
+ <url>http://www.jboss.org/richfaces</url>
+
+ <properties>
+ </properties>
+
+ <!-- Runtime dependency management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${richfaces.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/commons/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/commons/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
+
+</project>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/commons/trunk/parent/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -0,0 +1,71 @@
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>RichFaces Commons Parent</name>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <description>
+ The Parent for all RichFaces Commons sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom.
+ </description>
+
+ <properties>
+ <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>bom</artifactId>
+ <version>${richfaces.commons.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
\ No newline at end of file
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-11 14:04:24 UTC (rev 16987)
+++ root/commons/trunk/pom.xml 2010-05-11 14:11:15 UTC (rev 16988)
@@ -1,352 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <!--<parent>
+ <parent>
<groupId>org.richfaces</groupId>
- <artifactId>commons-bom</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>version-matrix/pom.xml</relativePath>
- </parent>-->
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>commons-root</artifactId>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Richfaces commons root</name>
+ <name>Richfaces Commons Aggregator</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+ <description>The root aggregator for the commons module. This manages intermodule relationships, and destribution assembly where needed.</description>
<modules>
+ <module>bom</module>
+ <module>parent</module>
<module>api</module>
</modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit-core-js</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.cssparser</groupId>
- <artifactId>cssparser</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-mock</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.12</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>de.berlios.jsunit</groupId>
- <artifactId>jsunit</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version >1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version >1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version >1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version >1.5.8</version>
- </dependency>
-
- <!-- Dependencies of JSF 2.0 -->
- <!-- Included because of http://jira.codehaus.org/browse/MNG-2205 -->
- <!-- start -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <!-- end -->
- <dependency>
- <groupId>com.sun.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- TODO: remove commons dependencies -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <!-- -->
-
- <!-- TODO: legacy dependnecies -->
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.3</version>
- </dependency>
- <!-- -->
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.5.2</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
-
- <!-- TODO: change to the current CDK version -->
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-javascript-plugin</artifactId>
- <version>3.3.1.GA</version>
- </plugin>
- <!-- -->
-
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <index>true</index>
- <manifest>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <mode>development</mode>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.1.0</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.cssparser</groupId>
- <artifactId>cssparser</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
14 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r16987 - in root/ui/core/trunk/api/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-11 10:04:24 -0400 (Tue, 11 May 2010)
New Revision: 16987
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java
Log:
fix generation taglib.xml and faces-config.xml
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -29,6 +29,7 @@
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
/**
* @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
@@ -36,7 +37,7 @@
*
*/
@JsfComponent(
- tag = @Tag(name = "jsFunction")
+ tag = @Tag(name = "jsFunction", type = TagType.Facelets)
)
public abstract class AbstractAjaxFunction extends UICommand {
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -31,6 +31,7 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
/**
* @author Nick Belaevski
@@ -41,7 +42,7 @@
@ResourceDependency(name = "richfaces-jsf-log.js"), @ResourceDependency(name = "richfaces.css")
})
@JsfComponent(
- tag = @Tag(name = "log"),
+ tag = @Tag(name = "log", type = TagType.Facelets),
renderer = @JsfRenderer(template = "/org/ajax4jsf/renderkit/html/log.template.xml")
)
public abstract class AbstractAjaxLog extends UIComponentBase {
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -27,11 +27,15 @@
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
/**
* @author Nick Belaevski
*/
-@JsfComponent
+@JsfComponent (
+ tag = @Tag(type = TagType.Facelets)
+)
public abstract class AbstractCommandLink extends UICommand {
public static final String COMPONENT_TYPE = "org.richfaces.CommandLink";
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -29,6 +29,7 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Signature;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
import org.richfaces.resource.MediaOutputResource;
import org.richfaces.webapp.taglib.MethodBindingMethodExpressionAdaptor;
import org.richfaces.webapp.taglib.MethodExpressionMethodBindingAdaptor;
@@ -47,7 +48,7 @@
*
*/
@JsfComponent(
- tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.html.MediaOutputHandler")
+ tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.html.MediaOutputHandler", type = TagType.Facelets)
)
public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2 {
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -27,13 +27,14 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
/**
* @author Nick Belaevski
*
*/
@JsfComponent(
- tag = @Tag(name = "region")
+ tag = @Tag(name = "region", type = TagType.Facelets)
)
public abstract class AbstractRegion extends UIComponentBase implements MetaComponentResolver, AjaxContainer {
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -23,12 +23,13 @@
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
/**
* @author Nick Belaevski
*
*/
-@JsfComponent(generate = "", tag = @Tag(name = "repeat"))
+@JsfComponent(generate = "", tag = @Tag(name = "repeat", type = TagType.Facelets))
public class UIRepeat extends UISequence {
public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2010-05-11 13:54:30 UTC (rev 16986)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2010-05-11 14:04:24 UTC (rev 16987)
@@ -26,6 +26,7 @@
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.renderkit.AjaxCommandRendererBase;
+import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -38,6 +39,10 @@
@JsfRenderer
public abstract class CommandButtonRendererBase extends AjaxCommandRendererBase {
+ public static final String COMPONENT_FAMILY = UICommand.COMPONENT_FAMILY;
+
+ public static final String RENDERER_TYPE = "org.richfaces.CommandButtonRenderer";
+
protected void encodeTypeAndImage(FacesContext context, UIComponent uiComponent) throws IOException {
ResponseWriter writer = context.getResponseWriter();
String type = (String) uiComponent.getAttributes().get("type");
14 years, 6 months
- 1
- 0