JBoss Rich Faces SVN: r16343 - branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-01-20 09:39:07 -0500 (Wed, 20 Jan 2010)
New Revision: 16343
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-8195
Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2010-01-20 14:25:17 UTC (rev 16342)
+++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2010-01-20 14:39:07 UTC (rev 16343)
@@ -11,6 +11,12 @@
.rich-calendar-header{
text-align:center;
}
+
+ .organizer-cell {
+ width: 90px;
+ height: 90px;
+ overflow: hidden;
+ }
</style>
<h:form id="form">
@@ -26,12 +32,10 @@
<h:outputText value="Current Month" styleClass="header"/>
</h:panelGroup>
</f:facet>
- <a4j:outputPanel layout="block" id="cell" onclick="#{rich:component('organizer')}.resetSelectedDate()" style="height: 100%;">
- <h:panelGrid columns="1">
- <h:outputText value="{day}" style="align:center"/>
- <h:outputText value="{data.shortDescription.escapeHTML()}"/>
- <h:outputText value="{data.description.escapeHTML()}"/>
- </h:panelGrid>
+ <a4j:outputPanel layout="block" id="cell" onclick="#{rich:component('organizer')}.resetSelectedDate()" style="height: 100%;" styleClass="organizer-cell">
+ <h:outputText value="{day}" style="align:center"/><br />
+ <h:outputText value="{data.shortDescription.escapeHTML()}" /><br />
+ <h:outputText value="{data.description.escapeHTML()}"/>
</a4j:outputPanel>
</rich:calendar>
</h:form>
14 years, 3 months
JBoss Rich Faces SVN: r16342 - root.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-01-20 09:25:17 -0500 (Wed, 20 Jan 2010)
New Revision: 16342
Removed:
root/DEADJOE
Log:
remove unexpected core dump
Deleted: root/DEADJOE
===================================================================
--- root/DEADJOE 2010-01-20 10:52:25 UTC (rev 16341)
+++ root/DEADJOE 2010-01-20 14:25:17 UTC (rev 16342)
@@ -1,71 +0,0 @@
-
-*** These modified files were found in JOE when it aborted on Mon Aug 3 18:27:46 2009
-*** JOE was aborted by UNIX signal 1
-
-*** File '/home/asmirnov/.zshrc'
-#
-# .zshrc is sourced in interactive shells.
-# It should contain commands to set up aliases,
-# functions, options, key bindings, etc.
-#
-
-autoload -U compinit
-compinit
-
-#allow tab completion in the middle of a word
-setopt COMPLETE_IN_WORD
-
-## keep background processes at full speed
-#setopt NOBGNICE
-## restart running processes on exit
-#setopt HUP
-
-## history
-#setopt APPEND_HISTORY
-## for sharing history between zsh processes
-setopt INC_APPEND_HISTORY
-setopt SHARE_HISTORY
-
-## never ever beep ever
-setopt NO_BEEP
-
-## automatically decide when to page a list of completions
-#LISTMAX=0
-
-## disable mail checking
-MAILCHECK=0
-
-autoload -U colors
-colors
-
-alias -g rf4=~/work/jsf/jsf2.0-workspace/root
-alias -g rf=~/work/richfaces/richfaces
-alias -g jfx=~/work/JavaFX
-*** File '(Unnamed)'
-clean install
-(arg|ARG)/:arg:
-
-*** File '(Unnamed)'
-deploy
-docs
-port
-portlet
-Collections.<
-emptyList
-jquery
-firefox
-arg/:arg:
-java.net
-
-*** File '(Unnamed)'
-pom.xml
-pom.xml
-pom.xml
-pom.xml
-mock/pom.xml
-mock/pom.xml
-pom.xml
-stage/pom.xml
-/home/asmirnov/.m2t/settings.xml
-pom.xml
-/home/asmirnov/.zshrc
14 years, 3 months
JBoss Rich Faces SVN: r16341 - root/examples-sandbox/trunk/javascripts-draft/position.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-01-20 05:52:25 -0500 (Wed, 20 Jan 2010)
New Revision: 16341
Modified:
root/examples-sandbox/trunk/javascripts-draft/position/1.html
Log:
RichFaces.Event sample draft
Modified: root/examples-sandbox/trunk/javascripts-draft/position/1.html
===================================================================
--- root/examples-sandbox/trunk/javascripts-draft/position/1.html 2010-01-20 10:39:34 UTC (rev 16340)
+++ root/examples-sandbox/trunk/javascripts-draft/position/1.html 2010-01-20 10:52:25 UTC (rev 16341)
@@ -18,23 +18,24 @@
*/
function a (id, namespace) {
this.getComponentName = function() {return "a"};
- this.getNamespace = function() {return '.rf.'+this.getComponentName()+'.'+this.id+(namespace ? '.'+namespace : '');}
+ this.namespace = RichFaces.Event.createNamespace(this.getComponentName(), id);
+ if (namespace) this.namespace+="."+namespace;
this.onClick = function(event) {
alert(event.data.component.getComponentName());
};
this.clearEventHandlers = function() {
- RichFaces.Event.unbind(id,'click'+this.getNamespace());
+ RichFaces.Event.unbind(id,'click.'+this.namespace);
}
this.id = id;
jQuery(id).component = this;
- RichFaces.Event.bind(id,'click'+this.getNamespace(), this.onClick, this);
+ RichFaces.Event.bind(id,'click.'+this.namespace, this.onClick, this);
};
- var _a = new a('#aaa');
+ var _a = new a('#aaa','0');
alert(_a.getComponentName());
var _b = new a('#bbb');
- var _aa = new a('#aaa');
- //_a.clearEventHandlers();
+ var _aa = new a('#aaa','1');
+ _a.clearEventHandlers();
</script>
</boby>
</html>
\ No newline at end of file
14 years, 3 months
JBoss Rich Faces SVN: r16340 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-01-20 05:39:34 -0500 (Wed, 20 Jan 2010)
New Revision: 16340
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
Log:
small corrections
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-01-20 10:36:29 UTC (rev 16339)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-01-20 10:39:34 UTC (rev 16340)
@@ -39,16 +39,13 @@
return basefw(selector).triggerHandler(event, data);
},
// TODO: rename argument names
- createNamespace : function(componentName, id, prefix, suffix) {
+ createNamespace : function(componentName, id, prefix) {
var a = [];
- a.push(prefix || RICH_NAMESPACE);
+ a.push(prefix || richfaces.Event.RICH_NAMESPACE);
if (componentName) {
a.push(componentName);
if (id) {
a.push(id);
- if (suffix) {
- a.push(suffix);
- }
}
}
return a.join('.');
14 years, 3 months
JBoss Rich Faces SVN: r16339 - in root/cdk/trunk/plugins: generator/src/main/java/org/richfaces/cdk and 13 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-01-20 05:36:29 -0500 (Wed, 20 Jan 2010)
New Revision: 16339
Added:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehavior.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfConverter.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedClass.java
Removed:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Validator.java
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taglib/validator.ftl
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/freemarker/ValidatorTaglibGeneratorTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/UIBar.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java
Log:
https://jira.jboss.org/jira/browse/RF-8232
Tags support
- validator class generator
- rename annotations
- remove render(ComponentLibrary library) method
Deleted: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,55 +0,0 @@
-/*
- * $Id$
- *
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.cdk.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * <p class="changed_added_4_0">
- * </p>
- *
- * @author asmirnov(a)exadel.com
- */
-(a)Retention(RetentionPolicy.CLASS)
-(a)Target(ElementType.TYPE)
-@Inherited
-public @interface Behavior {
-
- public static final String NAME = "org.richfaces.cdk.annotations.Behavior";
-
- /**
- * <p class="changed_added_4_0">
- * behavior-id with which instances of implementation class can be created b JSF Application implementation. If this
- * value an empty, behavior-id will be inferred from class name.
- * </p>
- *
- * @return converter type.
- */
- public String value();
-
-}
Deleted: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,49 +0,0 @@
-/*
- * $Id$
- *
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.cdk.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * <p class="changed_added_4_0">
- * </p>
- *
- * @author asmirnov(a)exadel.com
- */
-(a)Retention(RetentionPolicy.CLASS)
-(a)Target(ElementType.TYPE)
-@Inherited
-public @interface Converter {
-
- public static final String NAME = "org.richfaces.cdk.annotations.Converter";
-
- public String id() default "";
-
- public Class<?> forClass() default Object.class;
-
-}
Copied: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehavior.java (from rev 16329, root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java)
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehavior.java (rev 0)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehavior.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ */
+(a)Retention(RetentionPolicy.CLASS)
+(a)Target(ElementType.TYPE)
+@Inherited
+public @interface JsfBehavior {
+
+ public static final String NAME = "org.richfaces.cdk.annotations.JsfBehavior";
+
+ /**
+ * <p class="changed_added_4_0">
+ * behavior-id with which instances of implementation class can be created b JSF Application implementation. If this
+ * value an empty, behavior-id will be inferred from class name.
+ * </p>
+ *
+ * @return converter type.
+ */
+ public String value();
+
+}
Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfBehavior.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Copied: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfConverter.java (from rev 16329, root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java)
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfConverter.java (rev 0)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfConverter.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,49 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ */
+(a)Retention(RetentionPolicy.CLASS)
+(a)Target(ElementType.TYPE)
+@Inherited
+public @interface JsfConverter {
+
+ public static final String NAME = "org.richfaces.cdk.annotations.JsfConverter";
+
+ public String id() default "";
+
+ public Class<?> forClass() default Object.class;
+
+}
Property changes on: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfConverter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Copied: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.java (from rev 16329, root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Validator.java)
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.java (rev 0)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/JsfValidator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,23 @@
+package org.richfaces.cdk.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+
+/**
+ * @author akolonitsky
+ * @since Jan 13, 2010
+ */
+(a)Retention(RetentionPolicy.CLASS)
+(a)Target(ElementType.TYPE)
+@Inherited
+public @interface JsfValidator {
+
+ public static final String NAME = "org.richfaces.cdk.annotations.JsfValidator";
+
+ public String id() default "";
+
+ public String validatorClass() default "";
+}
Deleted: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Validator.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Validator.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Validator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,21 +0,0 @@
-package org.richfaces.cdk.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-
-/**
- * @author akolonitsky
- * @since Jan 13, 2010
- */
-(a)Retention(RetentionPolicy.CLASS)
-(a)Target(ElementType.TYPE)
-@Inherited
-public @interface Validator {
-
- public static final String NAME = "org.richfaces.cdk.annotations.Validator";
-
- public String id() default "";
-}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -25,18 +25,12 @@
package org.richfaces.cdk;
-import org.richfaces.cdk.model.ComponentLibrary;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
*
*/
public interface CdkWriter extends CdkWorker {
- /**
- * @deprecated Use {@link #render()} instead
- */
- public void render(ComponentLibrary library) throws CdkException;
public void render() throws CdkException;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -25,8 +25,6 @@
package org.richfaces.cdk;
-import org.richfaces.cdk.model.ComponentLibrary;
-
/**
* <p class="changed_added_4_0">This is dummy generator for not yet implemented output types</p>
* @author asmirnov(a)exadel.com
@@ -48,19 +46,7 @@
* (non-Javadoc)
* @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary)
*/
- /**
- * @deprecated Use {@link #render()} instead
- */
@Override
- public void render(ComponentLibrary library) throws CdkException {
- render();
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary)
- */
- @Override
public void render() throws CdkException {
// Do nothing
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -34,6 +34,7 @@
*/
public enum StandardOutputs implements OutputType {
COMPONENT_CLASSES(StandardOutputFolders.JAVA_CLASSES),
+ VALIDATOR_CLASSES(StandardOutputFolders.JAVA_CLASSES),
RENDERER_CLASSES(StandardOutputFolders.JAVA_CLASSES),
EVENT_LISTENER_CLASSES(StandardOutputFolders.JAVA_CLASSES),
EVENT_SOURCE_CLASSES(StandardOutputFolders.JAVA_CLASSES),
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -28,7 +28,7 @@
import javax.lang.model.element.TypeElement;
import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.annotations.Behavior;
+import org.richfaces.cdk.annotations.JsfBehavior;
/**
* <p class="changed_added_4_0"></p>
@@ -48,7 +48,7 @@
@Override
public Class<? extends Annotation> getProcessedAnnotation() {
- return Behavior.class;
+ return JsfBehavior.class;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -22,7 +22,7 @@
package org.richfaces.cdk.apt;
import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.annotations.Converter;
+import org.richfaces.cdk.annotations.JsfConverter;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ConverterModel;
@@ -35,12 +35,12 @@
* @author akolonitsky
* @since Jan 4, 2010
*/
-@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Converter.NAME})
+@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", JsfConverter.NAME})
public class ConverterProcessor extends ProcessorBase implements CdkAnnotationProcessor {
@Override
public void process(TypeElement element) throws CdkProcessingException {
- Converter converter = element.getAnnotation(Converter.class);
+ JsfConverter converter = element.getAnnotation(JsfConverter.class);
ConverterModel converterModel = new ConverterModel();
converterModel.setConverterId(converter.id());
@@ -59,7 +59,7 @@
@Override
public Class<? extends Annotation> getProcessedAnnotation() {
- return Converter.class;
+ return JsfConverter.class;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -22,7 +22,7 @@
package org.richfaces.cdk.apt;
import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.annotations.Validator;
+import org.richfaces.cdk.annotations.JsfValidator;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ValidatorModel;
@@ -35,18 +35,15 @@
* @author akolonitsky
* @since Jan 13, 2010
*/
-@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Validator.NAME})
+@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", JsfValidator.NAME})
public class ValidatorProcessor extends ProcessorBase implements CdkAnnotationProcessor {
@Override
public void process(TypeElement element) throws CdkProcessingException {
- Validator validator = element.getAnnotation(Validator.class);
+ JsfValidator validator = element.getAnnotation(JsfValidator.class);
ValidatorModel validatorModel = new ValidatorModel(validator.id(), new ClassDescription(element.getQualifiedName().toString()));
- if (element.getModifiers().contains(Modifier.ABSTRACT)) {
- validatorModel.setGenerate(true);
- }
-
+ setClassNames(element, validatorModel, validator);
setDescription(element, validatorModel);
getLibrary().getValidators().add(validatorModel);
@@ -54,6 +51,25 @@
@Override
public Class<? extends Annotation> getProcessedAnnotation() {
- return Validator.class;
+ return JsfValidator.class;
}
+
+ public static void setClassNames(TypeElement componentElement, ValidatorModel validatorModel, JsfValidator validator) {
+ String baseClass = componentElement.getQualifiedName().toString();
+ if (validator == null) {
+ validatorModel.setClassNames(baseClass, null);
+ return;
+ }
+
+ String validatorClass = validator.validatorClass();
+ if (validatorClass == null || validatorClass.isEmpty() || baseClass.equals(validatorClass)) {
+ if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
+ throw new IllegalStateException("You can't use an abstract class as a validator. Please set the validatorClass or remove the 'abstract' modifier.");
+ } else {
+ validatorModel.setClassNames(baseClass, null);
+ }
+ } else {
+ validatorModel.setClassNames(validatorClass, baseClass);
+ }
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -25,23 +25,21 @@
package org.richfaces.cdk.freemarker;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
import org.richfaces.cdk.CdkContext;
+import org.richfaces.cdk.CdkContext.OutputType;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWriter;
-import org.richfaces.cdk.CdkContext.OutputType;
-import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.LibraryVisitor;
import org.richfaces.cdk.model.Trackable;
import org.richfaces.cdk.model.Visitable;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
/**
* <p class="changed_added_4_0">Base class for all output file buildes that use FreeMarker as template engine.</p>
@@ -65,15 +63,7 @@
}
}
- /**
- * @deprecated Use {@link #render()} instead
- */
@Override
- public void render(ComponentLibrary library) throws CdkException {
- library.accept(this, getVisitorParameter());
- }
-
- @Override
public void render() throws CdkException {
context.getLibrary().accept(this, getVisitorParameter());
}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , 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.generate.java;
+
+import org.richfaces.cdk.CdkContext;
+import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.CdkWriter;
+import org.richfaces.cdk.StandardOutputs;
+import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
+import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.ValidatorModel;
+import org.richfaces.cdk.model.Visitable;
+
+import java.io.File;
+
+/**
+ * @author akolonitsky
+ * @since Jan 15, 2010
+ */
+public class ValidatorClassGenerator extends FreeMarkerRenderer<ValidatorModel, ComponentLibrary> implements CdkWriter {
+ @Override
+ public void init(CdkContext context) {
+ super.init(context);
+ }
+
+ @Override
+ protected boolean isMyComponent(Visitable visitable) {
+ if (visitable instanceof ValidatorModel) {
+ ValidatorModel validator = (ValidatorModel) visitable;
+
+ return validator.isGenerate();
+ }
+
+ return false;
+ }
+
+ @Override
+ protected String getOutputFile(ValidatorModel validator) throws CdkException {
+ return validator.getValidatorClass().getName().replace('.', File.separatorChar) + ".java";
+ }
+
+ @Override
+ protected String getTemplateName() {
+ return "validator.ftl";
+ }
+
+ @Override
+ protected CdkContext.OutputType getOutputType() {
+ return StandardOutputs.VALIDATOR_CLASSES;
+ }
+}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -86,8 +86,6 @@
@Override
public void merge(ComponentModel otherComponent) {
- ComponentLibrary.merge(renderers, otherComponent.getRenderers());
-
//merge facets, renderers, events ...
attributes.putAll(otherComponent.getAttributes());
facets.putAll(otherComponent.getFacets());
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -41,6 +41,8 @@
private ClassDescription validatorClass;
+ private ClassDescription baseClass;
+
private final ModelMap<String,Property> attributes = ModelMap.<String,Property>create();
public ValidatorModel() {
@@ -76,6 +78,25 @@
this.validatorClass = validatorClass;
}
+ public ClassDescription getBaseClass() {
+ return baseClass;
+ }
+
+ public void setBaseClass(ClassDescription baseClass) {
+ this.baseClass = baseClass;
+ }
+
+ public void setClassNames(String validatorClass, String baseClass) {
+ this.validatorClass = new ClassDescription(validatorClass);
+
+ if (baseClass != null) {
+ this.baseClass = new ClassDescription(baseClass);
+ this.generate = true;
+ } else {
+ this.generate = false;
+ }
+ }
+
public Map<String,Property> getAttributes() {
return attributes;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -66,22 +66,7 @@
* org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary
* )
*/
- /**
- * @deprecated Use {@link #render()} instead
- */
@Override
- public void render(ComponentLibrary library) throws CdkException {
- render();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary
- * )
- */
- @Override
public void render() throws CdkException {
ComponentLibrary library = context.getLibrary();
for (RenderKitModel renderKit : library.getRenderKits().values()) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -70,22 +70,7 @@
* org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary
* )
*/
- /**
- * @deprecated Use {@link #render()} instead
- */
@Override
- public void render(ComponentLibrary library) throws CdkException {
- render();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary
- * )
- */
- @Override
public void render() throws CdkException {
ComponentLibrary library = context.getLibrary();
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,6 +1,6 @@
<#macro concat seq delimiter=",">
<#list seq as item>
- <#nested item/><#if item_has_next>${delimiter}</#if>
+ <#nested item/><#if item_has_next>${delimiter}</#if>
</#list>
</#macro>
/*
@@ -42,23 +42,23 @@
import javax.el.ValueExpression;
/**
- * ${description?if_exists}
+ * ${description?if_exists}
**/
@Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"})
public class ${componentClass.simpleName} extends ${baseClass} <#if (eventNames?size > 0)>implements ClientBehaviorHolder</#if> {
public static final String COMPONENT_TYPE="${type}";
-
+
<#if family?exists>
public static final String COMPONENT_FAMILY="${family}";
-
+
@Override
public String getFamily() {
return (COMPONENT_FAMILY);
}
</#if>
-
+
<#if (eventNames?size > 0)>
private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList(
<@concat seq=eventNames ; event>"${event.name}"</@concat>
@@ -73,7 +73,6 @@
</#if>
protected enum Properties {
<@concat seq=generatedAttributes ; attribute>${attribute.name}</@concat>
- ;
}
<#list generatedAttributes as attribute>
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taglib/validator.ftl
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taglib/validator.ftl 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taglib/validator.ftl 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" version="2.0">
+<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" version="2.0">
<tag>
+ <tag-name>${validatorClass}</tag-name>
<validator>
<validator-id>${validatorId}</validator-id>
<handler-class>${validatorClass}</handler-class>
@@ -13,7 +16,6 @@
</#if>
<name>${attribute.name}</name>
<type>${attribute.type}</type>
- <required>${attribute.required}</required>
</attribute>
</#list>
</tag>
Added: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,137 @@
+/*
+ * $Id: component.ftl 16229 2009-12-29 21:36:27Z alexsmirnov $
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright , 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 ${validatorClass.package};
+
+import javax.annotation.Generated;
+import javax.faces.component.StateHelper;
+import javax.faces.component.UIComponent;
+import javax.faces.component.PartialStateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * ${description?if_exists}
+ **/
+@Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"})
+public class ${validatorClass.simpleName} extends ${baseClass} implements Validator, PartialStateHolder {
+
+ @Override
+ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+
+ }
+
+ protected enum Properties {
+ <#list generatedAttributes as attribute>${attribute.name}<#if attribute_has_next>${",\n "}</#if></#list>
+ }
+
+
+ <#list generatedAttributes as attribute>
+ /**
+ * ${attribute.description?if_exists}
+ **/
+ public ${attribute.type} ${attribute.getterName}(){
+ return (${attribute.type})getStateHelper().eval(Properties.${attribute.name});
+ }
+
+ /**
+ * Setter for ${attribute.name}
+ **/
+ public void ${attribute.setterName}(${attribute.type} ${attribute.name}){
+ getStateHelper().put(Properties.${attribute.name},${attribute.name});
+ }
+ </#list>
+
+
+
+ protected StateHelper getStateHelper() {
+ return getStateHelper(true);
+ }
+
+ protected StateHelper getStateHelper(boolean create) {
+ return null;
+ }
+
+ // ----------------------------------------------------- StateHolder Methods
+ @Override
+ public Object saveState(FacesContext context) {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ if (!initialStateMarked()) {
+ Object values[] = new Object[1];
+ <#list generatedAttributes as attribute>
+ values[${attribute_index}] = this.${attribute.getterName}();
+ </#list>
+
+ return values;
+ }
+ return null;
+ }
+
+ @Override
+ public void restoreState(FacesContext context, Object state) {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ if (state == null) {
+ return;
+ }
+
+ Object values[] = (Object[]) state;
+ <#list generatedAttributes as attribute>
+ ${attribute.setterName}((${attribute.type}) values[${attribute_index}]);
+ </#list>
+ }
+
+ private boolean transientValue = false;
+
+ @Override
+ public boolean isTransient() {
+ return this.transientValue;
+ }
+
+ @Override
+ public void setTransient(boolean transientValue) {
+ this.transientValue = transientValue;
+ }
+
+
+ private boolean initialState;
+
+ @Override
+ public void markInitialState() {
+ initialState = true;
+ }
+
+ @Override
+ public boolean initialStateMarked() {
+ return initialState;
+ }
+
+ @Override
+ public void clearInitialState() {
+ initialState = false;
+ }
+}
\ No newline at end of file
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -21,12 +21,21 @@
package org.richfaces.cdk.apt;
+import org.easymock.EasyMock;
+import org.junit.Assert;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.junit.Test;
+import org.richfaces.cdk.annotations.JsfValidator;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ValidatorModel;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
/**
* @author akolonitsky
@@ -49,4 +58,126 @@
}
}
}
+
+ @Test
+ public void testSetNames() {
+ ValidatorModel model;
+
+ // @JsfValidator public class BaseClass { ...
+ model = getValidatorModelForSetNames(true, null, "BaseClass", false);
+ check("BaseClass", null, false, model);
+
+ // @JsfValidator(validatorClass = "") public class BaseClass { ...
+ model = getValidatorModelForSetNames(true, "", "BaseClass", false);
+ check("BaseClass", null, false, model);
+
+ // @JsfValidator(validatorClass = BaseClass) public class BaseClass { ...
+ model = getValidatorModelForSetNames(true, "BaseClass", "BaseClass", false);
+ check("BaseClass", null, false, model);
+
+ // @JsfValidator(validatorClass = GeneratedClass) public class BaseClass { ...
+ model = getValidatorModelForSetNames(true, "GeneratedClass", "BaseClass", false);
+ check("GeneratedClass", "BaseClass", true, model);
+
+ ///////////////////////////////// ABSTRACT ///////////////////////////////////////
+ // @JsfValidator public abstract class BaseClass { ...
+ checkAbstractWithException(null);
+
+ // @JsfValidator(validatorClass = "") public abstract class BaseClass { ...
+ checkAbstractWithException("");
+
+ // @JsfValidator(validatorClass = BaseClass) public abstract class BaseClass { ...
+ checkAbstractWithException("BaseClass");
+
+ // @JsfValidator(validatorClass = GeneratedClass) public abstract class BaseClass { ...
+ model = getValidatorModelForSetNames(true, "GeneratedClass", "BaseClass", true);
+ check("GeneratedClass", "BaseClass", true, model);
+ }
+
+ private void checkAbstractWithException(String validatorClass) {
+ try {
+ getValidatorModelForSetNames(true, validatorClass, "BaseClass", true);
+ Assert.fail("Abstract class can't be a validator.");
+ } catch (IllegalStateException e) {
+ // Do nothing.
+ }
+ }
+
+ private void check(String validatorClass, String baseClass, boolean generate, ValidatorModel model) {
+ if (baseClass != null) {
+ assertEquals(model.getBaseClass().toString(), baseClass);
+ } else {
+ assertNull(model.getBaseClass());
+ }
+
+ if (validatorClass != null) {
+ assertEquals(model.getValidatorClass().toString(), validatorClass);
+ } else {
+ assertNull(model.getValidatorClass());
+ }
+
+ assertEquals(generate, model.isGenerate());
+ }
+
+ private ValidatorModel getValidatorModelForSetNames(boolean isAnnotationDefined,
+ String validatorClass,
+ final String baseClass,
+ boolean isAbstractPresent) {
+ Name name = new MyName(baseClass);
+
+ TypeElement element = EasyMock.createMock(TypeElement.class);
+ EasyMock.expect(element.getQualifiedName()).andReturn(name);
+
+ Set<Modifier> set = new HashSet<Modifier>(1);
+ if (isAbstractPresent) {
+ set.add(Modifier.ABSTRACT);
+ }
+ EasyMock.expect(element.getModifiers()).andReturn(set);
+ EasyMock.replay(element);
+
+ ValidatorModel validatorModel = new ValidatorModel();
+ JsfValidator validator = null;
+ if (isAnnotationDefined) {
+ validator = EasyMock.createMock(JsfValidator.class);
+ EasyMock.expect(validator.validatorClass()).andReturn(validatorClass);
+ EasyMock.replay(validator);
+ }
+
+ EasyMock.verify();
+ ValidatorProcessor.setClassNames(element, validatorModel, validator);
+ return validatorModel;
+ }
+
+ private static class MyName implements Name {
+ private final String toString;
+
+ MyName(String toString) {
+ this.toString = toString;
+ }
+
+ @Override
+ public int length() {
+ return 0;
+ }
+
+ @Override
+ public char charAt(int index) {
+ return 0;
+ }
+
+ @Override
+ public CharSequence subSequence(int start, int end) {
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return toString;
+ }
+
+ @Override
+ public boolean contentEquals(CharSequence cs) {
+ return false;
+ }
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -105,7 +105,7 @@
eventNames.add(event);
attribute.setGenerate(false);
generator.visit(component, library);
-// System.out.println(output);
+ System.out.println(output);
verify(mockContext);
compare(output, "UIBar.java");
Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , 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.generate.java;
+
+import org.richfaces.cdk.CdkTestBase;
+import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.CdkContext;
+import org.richfaces.cdk.StandardSources;
+import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.ClassDescription;
+import org.richfaces.cdk.model.Property;
+import org.richfaces.cdk.model.EventName;
+import org.richfaces.cdk.model.ValidatorModel;
+import org.junit.Test;
+import static org.easymock.EasyMock.verify;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.replay;
+
+import javax.faces.component.UIOutput;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Set;
+
+/**
+ * @author akolonitsky
+ * @since Jan 15, 2010
+ */
+public class ValidatorClassGeneratorTest extends CdkTestBase {
+
+ /**
+ * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.ComponentModel)}.
+ * @throws Exception
+ */
+ @Test
+ public void testGetOutputFileValidator() throws Exception {
+ final StringWriter output = new StringWriter();
+ ValidatorClassGenerator generator = new ValidatorClassGenerator() {
+ @Override
+ protected Writer getOutput(ValidatorModel c) throws CdkException {
+ return output;
+ }
+ };
+ CdkContext mockContext = createMockContext();
+
+ generator.init(mockContext);
+
+ ValidatorModel validator = new ValidatorModel();
+ validator.setValidatorId("foo.bar");
+ validator.setClassNames("org.richfaces.cdk.generate.java.GeneratedClass", "Object");
+
+ addAttribute(validator, "testValue", Object.class, true);
+ // TODO test with primitiv type 'boolean'
+ addAttribute(validator, "testFlag", Boolean.class, true);
+ Property attribute = addAttribute(validator, "id", String.class, false);
+
+ Set<EventName> eventNames = attribute.getEventNames();
+ eventNames.add(getEvent("id", false));
+ eventNames.add(getEvent("action", true));
+
+ ComponentLibrary library = new ComponentLibrary();
+ library.getValidators().add(validator);
+ generator.visit(validator, library);
+
+ System.out.println(output);
+
+ verify(mockContext);
+
+ // TODO - check generated file.
+ }
+
+ private EventName getEvent(String name, boolean defaultEvent) {
+ EventName event = new EventName();
+ event.setName(name);
+ event.setDefaultEvent(defaultEvent);
+ return event;
+ }
+
+ private Property addAttribute(ValidatorModel validator, String attributeName, Class<?> type, boolean generate) {
+ Property attribute = validator.addAttribute(attributeName);
+ attribute.setType(new ClassDescription(type));
+ attribute.setGenerate(generate);
+ return attribute;
+ }
+
+ private CdkContext createMockContext() throws Exception {
+ CdkContext cdkContext = createMock(CdkContext.class);
+
+ expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory);
+ expect(cdkContext.getOutputFolder((org.richfaces.cdk.CdkContext.OutputType) anyObject())).andStubReturn(null);
+ expect(cdkContext.getLoader()).andStubReturn(createClassLoader());
+ replay(cdkContext);
+
+ return cdkContext;
+ }
+}
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/freemarker/ValidatorTaglibGeneratorTest.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/freemarker/ValidatorTaglibGeneratorTest.xml 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/freemarker/ValidatorTaglibGeneratorTest.xml 2010-01-20 10:36:29 UTC (rev 16339)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" version="2.0">
+<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" version="2.0">
<tag>
+ <tag-name>javax.faces.component.UIOutput</tag-name>
<validator>
<validator-id>foo.bar</validator-id>
<handler-class>javax.faces.component.UIOutput</handler-class>
@@ -9,12 +12,10 @@
<attribute>
<name>testValue</name>
<type>java.lang.Object</type>
- <required>false</required>
</attribute>
<attribute>
<name>testFlag</name>
<type>boolean</type>
- <required>false</required>
</attribute>
</tag>
</facelet-taglib>
Added: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedClass.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedClass.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedClass.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -0,0 +1,147 @@
+/*
+ * $Id: component.ftl 16229 2009-12-29 21:36:27Z alexsmirnov $
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright , 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.generate.java;
+
+import javax.annotation.Generated;
+import javax.faces.component.StateHelper;
+import javax.faces.component.UIComponent;
+import javax.faces.component.PartialStateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+/**
+ *
+ **/
+@Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"})
+public class GeneratedClass extends Object implements Validator, PartialStateHolder {
+
+ @Override
+ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+
+ }
+
+ protected enum Properties {
+ testValue,
+ testFlag
+ }
+
+
+ /**
+ *
+ **/
+ public java.lang.Object getTestValue(){
+ return (java.lang.Object)getStateHelper().eval(Properties.testValue);
+ }
+
+ /**
+ * Setter for testValue
+ **/
+ public void setTestValue(java.lang.Object testValue){
+ getStateHelper().put(Properties.testValue,testValue);
+ }
+ /**
+ *
+ **/
+ public java.lang.Boolean isTestFlag(){
+ return (java.lang.Boolean)getStateHelper().eval(Properties.testFlag);
+ }
+
+ /**
+ * Setter for testFlag
+ **/
+ public void setTestFlag(java.lang.Boolean testFlag){
+ getStateHelper().put(Properties.testFlag,testFlag);
+ }
+
+
+
+ protected StateHelper getStateHelper() {
+ return getStateHelper(true);
+ }
+
+ protected StateHelper getStateHelper(boolean create) {
+ return null;
+ }
+
+ // ----------------------------------------------------- StateHolder Methods
+ @Override
+ public Object saveState(FacesContext context) {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ if (!initialStateMarked()) {
+ Object values[] = new Object[1];
+ values[0] = this.getTestValue();
+ values[1] = this.isTestFlag();
+
+ return (values);
+ }
+ return null;
+ }
+
+ @Override
+ public void restoreState(FacesContext context, Object state) {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ if (state == null) {
+ return;
+ }
+
+ Object values[] = (Object[]) state;
+ setTestValue((java.lang.Object) values[0]);
+ setTestFlag((java.lang.Boolean) values[1]);
+ }
+
+ private boolean transientValue = false;
+
+ @Override
+ public boolean isTransient() {
+ return this.transientValue;
+ }
+
+ @Override
+ public void setTransient(boolean transientValue) {
+ this.transientValue = transientValue;
+ }
+
+
+ private boolean initialState;
+
+ @Override
+ public void markInitialState() {
+ initialState = true;
+ }
+
+ @Override
+ public boolean initialStateMarked() {
+ return initialState;
+ }
+
+ @Override
+ public void clearInitialState() {
+ initialState = false;
+ }
+}
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/UIBar.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/UIBar.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/UIBar.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -62,7 +62,6 @@
testValue,
testFlag
- ;
}
/**
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -21,7 +21,7 @@
package org.richfaces.cdk.test.component;
-import org.richfaces.cdk.annotations.Converter;
+import org.richfaces.cdk.annotations.JsfConverter;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
@@ -30,7 +30,7 @@
* @author akolonitsky
* @since Jan 14, 2010
*/
-@Converter(id = "my_converter", forClass = Integer.class)
+@JsfConverter(id = "my_converter", forClass = Integer.class)
public class MyConverter implements javax.faces.convert.Converter{
@Override
@@ -44,7 +44,7 @@
}
}
-@Converter(forClass = Integer.class)
+@JsfConverter(forClass = Integer.class)
class MyConverter01 implements javax.faces.convert.Converter{
@Override
@@ -58,7 +58,7 @@
}
}
-@Converter(id = "my_converter_02")
+@JsfConverter(id = "my_converter_02")
class MyConverter02 implements javax.faces.convert.Converter{
@Override
@@ -72,7 +72,7 @@
}
}
-@Converter
+@JsfConverter
class MyConverter03 implements javax.faces.convert.Converter{
@Override
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java 2010-01-20 10:23:29 UTC (rev 16338)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java 2010-01-20 10:36:29 UTC (rev 16339)
@@ -21,7 +21,7 @@
package org.richfaces.cdk.test.component;
-import org.richfaces.cdk.annotations.Validator;
+import org.richfaces.cdk.annotations.JsfValidator;
import javax.faces.validator.ValidatorException;
import javax.faces.context.FacesContext;
@@ -31,7 +31,7 @@
* @author akolonitsky
* @since Jan 14, 2010
*/
-@Validator(id = "my_validator")
+@JsfValidator(id = "my_validator")
public class MyValidator implements javax.faces.validator.Validator {
@Override
@@ -40,7 +40,7 @@
}
}
-@Validator
+@JsfValidator
class MyValidator01 implements javax.faces.validator.Validator {
@Override
14 years, 3 months
JBoss Rich Faces SVN: r16338 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-01-20 05:23:29 -0500 (Wed, 20 Jan 2010)
New Revision: 16338
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
Log:
RichFaces.Event update
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-01-20 06:41:52 UTC (rev 16337)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-01-20 10:23:29 UTC (rev 16338)
@@ -15,7 +15,7 @@
bind : function(selector, type, fn, data) {
// type: namespace can be used, like onclick.rf.conponentName
var f = function (e){
- e.data.fn.call(e.data.component, e, this);
+ e.data.fn.call(e.data.component||this, e, this);
};
basefw(selector).bind(type, {component: data, fn:fn}, f);
return f;
@@ -23,7 +23,7 @@
bindOne: function(selector, type, fn, data) {
// type: namespace can be used, like onclick.rf.conponentName
var f = function (e){
- e.data.fn.call(e.data.component, e, this);
+ e.data.fn.call(e.data.component||this, e, this);
};
basefw(selector).one(type, {component: data, fn:fn}, f);
return f;
@@ -59,7 +59,7 @@
/*
fn : function (eventObject, element) {
- this; // object passed as data to bind function
+ this; // object passed as data to bind function or dom element if no data
element; // dom element
}
14 years, 3 months
JBoss Rich Faces SVN: r16337 - in root/docs/trunk: Component_Reference and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-01-20 01:41:52 -0500 (Wed, 20 Jan 2010)
New Revision: 16337
Modified:
root/docs/trunk/Component_Development_Kit_Guide/pom.xml
root/docs/trunk/Component_Reference/pom.xml
root/docs/trunk/Developer_Guide/pom.xml
root/docs/trunk/Migration_Guide/pom.xml
Log:
Added ability to build books individually
Modified: root/docs/trunk/Component_Development_Kit_Guide/pom.xml
===================================================================
--- root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
+++ root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-01-20 06:41:52 UTC (rev 16337)
@@ -10,162 +10,207 @@
<name>${bookname}-(${translation})</name>
<parent>
- <groupId>org.jboss.richfaces</groupId>
- <artifactId>docs</artifactId>
- <version>1.0</version>
- </parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
- <properties>
- <translation>en-US</translation>
- <docname>Component_Development_Kit_Guide</docname>
- <bookname>Component Development Kit Guide</bookname>
- </properties>
+ <properties>
+ <translation>en-US</translation>
+ <docname>Component_Development_Kit_Guide</docname>
+ <bookname>Component Development Kit Guide</bookname>
+ </properties>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <profiles>
+
+ <profiles>
- <!-- mvn compile -->
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml -->
- <profile>
- <id>html</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml-single -->
- <profile>
- <id>html-single</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Ppdf -->
- <profile>
- <id>pdf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
+
+ <!-- mvn compile -Pdocs -->
+ <!-- For compiling from parent pom.xml -->
+ <profile>
+ <id>docs</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <imageResource>
+ <directory>${docname}/${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
<build>
<plugins>
@@ -188,36 +233,35 @@
</dependency>
</dependencies>
<configuration>
- <sourceDocumentName>${docname}.xml</sourceDocumentName>
- <sourceDirectory>.</sourceDirectory>
- <imageResource>
- <directory>${docname}/${translation}</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: root/docs/trunk/Component_Reference/pom.xml
===================================================================
--- root/docs/trunk/Component_Reference/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
+++ root/docs/trunk/Component_Reference/pom.xml 2010-01-20 06:41:52 UTC (rev 16337)
@@ -10,162 +10,207 @@
<name>${bookname}-(${translation})</name>
<parent>
- <groupId>org.jboss.richfaces</groupId>
- <artifactId>docs</artifactId>
- <version>1.0</version>
- </parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
- <properties>
- <translation>en-US</translation>
- <docname>Component_Reference</docname>
- <bookname>Component Reference</bookname>
- </properties>
+ <properties>
+ <translation>en-US</translation>
+ <docname>Component_Reference</docname>
+ <bookname>Component Reference</bookname>
+ </properties>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <profiles>
+
+ <profiles>
- <!-- mvn compile -->
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml -->
- <profile>
- <id>html</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml-single -->
- <profile>
- <id>html-single</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Ppdf -->
- <profile>
- <id>pdf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
+
+ <!-- mvn compile -Pdocs -->
+ <!-- For compiling from parent pom.xml -->
+ <profile>
+ <id>docs</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <imageResource>
+ <directory>${docname}/${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
<build>
<plugins>
@@ -188,36 +233,35 @@
</dependency>
</dependencies>
<configuration>
- <sourceDocumentName>${docname}.xml</sourceDocumentName>
- <sourceDirectory>.</sourceDirectory>
- <imageResource>
- <directory>${docname}/${translation}</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: root/docs/trunk/Developer_Guide/pom.xml
===================================================================
--- root/docs/trunk/Developer_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
+++ root/docs/trunk/Developer_Guide/pom.xml 2010-01-20 06:41:52 UTC (rev 16337)
@@ -10,162 +10,207 @@
<name>${bookname}-(${translation})</name>
<parent>
- <groupId>org.jboss.richfaces</groupId>
- <artifactId>docs</artifactId>
- <version>1.0</version>
- </parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
- <properties>
- <translation>en-US</translation>
- <docname>Developer_Guide</docname>
- <bookname>Developer Guide</bookname>
- </properties>
+ <properties>
+ <translation>en-US</translation>
+ <docname>Developer_Guide</docname>
+ <bookname>Developer Guide</bookname>
+ </properties>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <profiles>
+
+ <profiles>
- <!-- mvn compile -->
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml -->
- <profile>
- <id>html</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml-single -->
- <profile>
- <id>html-single</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Ppdf -->
- <profile>
- <id>pdf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
+
+ <!-- mvn compile -Pdocs -->
+ <!-- For compiling from parent pom.xml -->
+ <profile>
+ <id>docs</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <imageResource>
+ <directory>${docname}/${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
<build>
<plugins>
@@ -188,36 +233,35 @@
</dependency>
</dependencies>
<configuration>
- <sourceDocumentName>${docname}.xml</sourceDocumentName>
- <sourceDirectory>.</sourceDirectory>
- <imageResource>
- <directory>${docname}/${translation}</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: root/docs/trunk/Migration_Guide/pom.xml
===================================================================
--- root/docs/trunk/Migration_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
+++ root/docs/trunk/Migration_Guide/pom.xml 2010-01-20 06:41:52 UTC (rev 16337)
@@ -10,162 +10,207 @@
<name>${bookname}-(${translation})</name>
<parent>
- <groupId>org.jboss.richfaces</groupId>
- <artifactId>docs</artifactId>
- <version>1.0</version>
- </parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
- <properties>
- <translation>en-US</translation>
- <docname>Migration_Guide</docname>
- <bookname>Migration Guide</bookname>
- </properties>
+ <properties>
+ <translation>en-US</translation>
+ <docname>Migration_Guide</docname>
+ <bookname>Migration Guide</bookname>
+ </properties>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <profiles>
+
+ <profiles>
- <!-- mvn compile -->
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml -->
- <profile>
- <id>html</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Phtml-single -->
- <profile>
- <id>html-single</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- <!-- mvn compile -Ppdf -->
- <profile>
- <id>pdf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
+
+ <!-- mvn compile -Pdocs -->
+ <!-- For compiling from parent pom.xml -->
+ <profile>
+ <id>docs</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <imageResource>
+ <directory>${docname}/${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
<build>
<plugins>
@@ -188,36 +233,35 @@
</dependency>
</dependencies>
<configuration>
- <sourceDocumentName>${docname}.xml</sourceDocumentName>
- <sourceDirectory>.</sourceDirectory>
- <imageResource>
- <directory>${docname}/${translation}</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 3 months
JBoss Rich Faces SVN: r16336 - in root/docs/trunk: Component_Development_Kit_Guide and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-01-20 00:11:39 -0500 (Wed, 20 Jan 2010)
New Revision: 16336
Added:
root/docs/trunk/pom.xml
Modified:
root/docs/trunk/Component_Development_Kit_Guide/pom.xml
root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml
root/docs/trunk/Component_Reference/pom.xml
root/docs/trunk/Developer_Guide/en-US/Author_Group.xml
root/docs/trunk/Developer_Guide/en-US/Book_Info.xml
root/docs/trunk/Developer_Guide/en-US/appe-Developer_Guide-Resources.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Introduction.xml
root/docs/trunk/Developer_Guide/pom.xml
root/docs/trunk/Migration_Guide/pom.xml
Log:
Added root pom.xml but can no longer build individual books
Modified: root/docs/trunk/Component_Development_Kit_Guide/pom.xml
===================================================================
--- root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -3,11 +3,17 @@
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.jboss.project</groupId>
+ <groupId>org.jboss.richfaces</groupId>
<artifactId>${docname}-${translation}</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
+
+ <parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
<properties>
<translation>en-US</translation>
@@ -185,7 +191,7 @@
<sourceDocumentName>${docname}.xml</sourceDocumentName>
<sourceDirectory>.</sourceDirectory>
<imageResource>
- <directory>${translation}</directory>
+ <directory>${docname}/${translation}</directory>
<includes>
<include>images/*</include>
</includes>
Modified: root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml
===================================================================
--- root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -7,23 +7,77 @@
This chapter covers those attributes and features that are common to many of the components in the tag libraries.
</para>
<section id="sect-Component_Reference-Common_features-Positioning_in_popup_components">
- <title>Positioning in popup components</title>
+ <title>Positioning and appearance of components</title>
<para>
- Incomplete
+ A number of attributes relating to positioning and appearance are common to several components.
</para>
+ <variablelist>
+ <varlistentry>
+ <term>disabled</term>
+ <listitem>
+ <para>
+ Specifies whether the component is disabled, which disallows user interaction.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>focus</term>
+ <listitem>
+ <para>
+ References the <varname>id</varname> of an element on which to focus after a request is completed on the client side.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>height</term>
+ <listitem>
+ <para>
+ The height of the component in pixels.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>dir</term>
+ <listitem>
+ <para>
+ Specifies the direction in which to display text that does not inherit its writing direction. Valid values are <literal>LTR</literal> (left-to-right) and <literal>RTL</literal> (right-to-left).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>style</term>
+ <listitem>
+ <para>
+ Specifies Cascading Style Sheet (<acronym>CSS</acronym>) styles to apply to the component.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>styleClass</term>
+ <listitem>
+ <para>
+ Specifies one or more <acronym>CSS</acronym> class names to apply to the component.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>width</term>
+ <listitem>
+ <para>
+ The width of the component in pixels.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
<section id="sect-Component_Reference-Common_features-Calling_available_JavaScript_methods">
<title>Calling available JavaScript methods</title>
<para>
- Client-side JavaScript methods can be called using component events. These JavaScript methods are defined using the relevant event attribute for the component tag.
+ Client-side JavaScript methods can be called using component events. These JavaScript methods are defined using the relevant event attribute for the component tag. Methods are referenced through typical Java syntax within the event attribute, while any parameters for the methods are obtained through the <varname>data</varname> attribute, and referenced using <acronym>JSF</acronym> Expression Language (<acronym>EL</acronym>). <xref linkend="exam-Component_Reference-data-Data_reference_example" /> a simple reference to a JavaScript method with a single parameter.
</para>
- </section>
-
- <section id="sect-Component_Reference-Common_features-Client_side_macro_substitution">
- <title>Client-side macro-substitution</title>
<para>
- Incomplete
+ Refer to <xref linkend="sect-Component_Reference-Common_Ajax_attributes-Events_and_JavaScript_interactions" /> or to event descriptions unique to each component for specific usage.
</para>
</section>
Modified: root/docs/trunk/Component_Reference/pom.xml
===================================================================
--- root/docs/trunk/Component_Reference/pom.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Component_Reference/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -3,11 +3,17 @@
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.jboss.project</groupId>
+ <groupId>org.jboss.richfaces</groupId>
<artifactId>${docname}-${translation}</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
+
+ <parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
<properties>
<translation>en-US</translation>
@@ -185,7 +191,7 @@
<sourceDocumentName>${docname}.xml</sourceDocumentName>
<sourceDirectory>.</sourceDirectory>
<imageResource>
- <directory>${translation}</directory>
+ <directory>${docname}/${translation}</directory>
<includes>
<include>images/*</include>
</includes>
Modified: root/docs/trunk/Developer_Guide/en-US/Author_Group.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/Author_Group.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Developer_Guide/en-US/Author_Group.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -8,11 +8,72 @@
<author>
<firstname>Sean</firstname>
<surname>Rogers</surname>
+ <contrib>Documentation lead for 4.0</contrib>
<affiliation>
<orgname>Red Hat</orgname>
<orgdiv>Engineering Content Services</orgdiv>
</affiliation>
<email>serogers(a)redhat.com</email>
</author>
+ <author>
+ <firstname>Svetlana</firstname>
+ <surname>Mukhina</surname>
+ <contrib>Documentation lead for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>smukhina(a)exadel.com</email>
+ </author>
+ <author>
+ <firstname>Anastasiya</firstname>
+ <surname>Bogachuk</surname>
+ <contrib>Documentation for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>abogachuk(a)exadel.com</email>
+ </author>
+ <author>
+ <firstname>Gleb</firstname>
+ <surname>Galkin</surname>
+ <contrib>Documentation for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>ggalkin(a)exadel.com</email>
+ </author>
+ <author>
+ <firstname>Mikhail</firstname>
+ <surname>Sorokin</surname>
+ <contrib>Documentation for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>msorokin(a)exadel.com</email>
+ </author>
+ <author>
+ <firstname>Alexander</firstname>
+ <surname>Tsebro</surname>
+ <contrib>Documentation for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>atsebro(a)exadel.com</email>
+ </author>
+ <author>
+ <firstname>Olga</firstname>
+ <surname>Chikvina</surname>
+ <contrib>Documentation for 3.3</contrib>
+ <affiliation>
+ <orgname>Exadel</orgname>
+ <orgdiv>Documentation</orgdiv>
+ </affiliation>
+ <email>ochikvina(a)exadel.com</email>
+ </author>
</authorgroup>
Modified: root/docs/trunk/Developer_Guide/en-US/Book_Info.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/Book_Info.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Developer_Guide/en-US/Book_Info.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -13,7 +13,7 @@
<edition>0</edition>
<pubsnumber>1</pubsnumber>
<abstract>
- <para>This book is a comprehensive reference for getting started and
+ <para>Read this book for a comprehensive guide to getting started and
working with RichFaces &VERSION;. It includes details of the
architecture, the framework's use in different applications,
and skinning implementations.</para>
Modified: root/docs/trunk/Developer_Guide/en-US/appe-Developer_Guide-Resources.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/appe-Developer_Guide-Resources.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Developer_Guide/en-US/appe-Developer_Guide-Resources.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -7,7 +7,36 @@
<appendix id="appe-Developer_Guide-Resources">
<title>Resources</title>
<para>
- Incomplete
+ Refer to these resources for further information on RichFaces.
</para>
+ <variablelist>
+ <varlistentry>
+ <term>JBoss RichFaces</term>
+ <listitem>
+ <para>
+ <ulink url="http://www.jboss.com/richfaces/">http://www.jboss.com/richfaces/</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>RichFaces Project Space</term>
+ <listitem>
+ <para>
+ <ulink url="http://community.jboss.org/en/richfaces">http://community.jboss.org/en/richfaces</ulink>
+ </para>
+ <para>
+ Includes forum and wiki.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>RichFaces Team Blog</term>
+ <listitem>
+ <para>
+ <ulink url="http://jroller.com/a4j/">http://jroller.com/a4j/</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</appendix>
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Introduction.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Introduction.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Introduction.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -7,7 +7,50 @@
<chapter id="chap-Developer_Guide-Introduction">
<title>Introduction</title>
<para>
- RichFaces is a rich component library for JavaServer Faces (<acronym>JSF</acronym>) built on the open-source Ajax4jsf framework. It allows easy integration of Ajax capabilities into enterprise application development without needing to use Javascript.
+ RichFaces is a rich component library for JavaServer Faces (<acronym>JSF</acronym>) 2 built on the open-source Ajax4jsf framework. It allows integration of Ajax capabilities into enterprise web application development without needing to use JavaScript.
</para>
+ <para>
+ RichFaces leverages several parts of the JSF2 framework including lifecycle, validation, conversion facilities, and management of static and dynamic resources. The RichFaces framework includes components with built-in Ajax support and a customizable look-and-feel that can be incorporated into JSF applications.
+ </para>
+ <para>
+ RichFaces provides a number of advantages for enterprise web application development:
+ <itemizedlist>
+ <listitem>
+ <para>
+ Build on the benefits of JavaServer Faces with support for Ajax. RichFaces is fully integrated into the JSF lifecycle. While other frameworks only give access to the managed bean facility, RichFaces uses the action and value change listeners, and invokes server-side validators and converters during the Ajax request-response cycle.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Add Ajax capability to existing JSF applications. The core Ajax library (<classname>a4j</classname>) adds Ajax functionality into existing pages, such that extra JavaScript code is unnecessary and existing components do not need to be replaced with Ajax ones. RichFaces enables page-wide Ajax support instead of the traditional component-wide support, and events can be defined on the page for invoking an Ajax requests and JSF Component Tree synchronization.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Create complex application views using out-of-the-box components. The RichFaces user interface (<acronym>UI</acronym>) library (<classname>rich</classname>) contains components for adding rich interactive features to JSF applications. It extends the RichFaces framework to include a large set of Ajax-enabled components that come with extensive skinning support. Additionally, RichFaces components are designed to be used seamlessly with other 3d-party component libraries on the same page, so you have more options for developing your applications.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Write your own customized rich components with built-in Ajax support. The Component Development Kit (<acronym>CDK</acronym>), used for the RichFaces UI library creation, includes a code-generation facility and a templating facility using a JavaServer Pages (<acronym>JSP</acronym>)-like syntax.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Package resources with application Java classes. Ajax functionality in RichFaces provides an advanced support for the management of different resources, such as pictures, JavaScript code, and CSS stylesheets. The resource framework makes it possible to pack these resources into <filename>jar</filename> Java archive files along with the code for any custom components.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Generate binary resources on the fly. The resource framework can generate images, sounds, Microsoft <application>Excel</application> spreadsheets, and more during run-time.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Create a modern rich user-interface with skinning technology. RichFaces provides a skinning feature that allows you to define and manage different color schemes and other parameters of the look and feel. It is possible to access the skin parameters from JSP code and Java code during run-time. RichFaces comes packaged with a number of skins to get you started, but you can also easily create your own customized skins too.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
</chapter>
Modified: root/docs/trunk/Developer_Guide/pom.xml
===================================================================
--- root/docs/trunk/Developer_Guide/pom.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Developer_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -3,11 +3,17 @@
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.jboss.project</groupId>
+ <groupId>org.jboss.richfaces</groupId>
<artifactId>${docname}-${translation}</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
+
+ <parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
<properties>
<translation>en-US</translation>
@@ -185,7 +191,7 @@
<sourceDocumentName>${docname}.xml</sourceDocumentName>
<sourceDirectory>.</sourceDirectory>
<imageResource>
- <directory>${translation}</directory>
+ <directory>${docname}/${translation}</directory>
<includes>
<include>images/*</include>
</includes>
Modified: root/docs/trunk/Migration_Guide/pom.xml
===================================================================
--- root/docs/trunk/Migration_Guide/pom.xml 2010-01-20 01:09:03 UTC (rev 16335)
+++ root/docs/trunk/Migration_Guide/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -3,11 +3,17 @@
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.jboss.project</groupId>
+ <groupId>org.jboss.richfaces</groupId>
<artifactId>${docname}-${translation}</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
+
+ <parent>
+ <groupId>org.jboss.richfaces</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.0</version>
+ </parent>
<properties>
<translation>en-US</translation>
@@ -185,7 +191,7 @@
<sourceDocumentName>${docname}.xml</sourceDocumentName>
<sourceDirectory>.</sourceDirectory>
<imageResource>
- <directory>${translation}</directory>
+ <directory>${docname}/${translation}</directory>
<includes>
<include>images/*</include>
</includes>
Added: root/docs/trunk/pom.xml
===================================================================
--- root/docs/trunk/pom.xml (rev 0)
+++ root/docs/trunk/pom.xml 2010-01-20 05:11:39 UTC (rev 16336)
@@ -0,0 +1,17 @@
+<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.jboss.richfaces</groupId>
+ <version>1.0</version>
+ <artifactId>docs</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>Component_Development_Kit_Guide</module>
+ <module>Component_Reference</module>
+ <module>Developer_Guide</module>
+ <module>Migration_Guide</module>
+ </modules>
+</project>
+
14 years, 3 months
JBoss Rich Faces SVN: r16335 - branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-01-19 20:09:03 -0500 (Tue, 19 Jan 2010)
New Revision: 16335
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
Log:
https://jira.jboss.org/jira/browse/RF-8243
Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
===================================================================
--- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2010-01-19 19:32:12 UTC (rev 16334)
+++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2010-01-20 01:09:03 UTC (rev 16335)
@@ -129,10 +129,13 @@
static String formatMessage(String msg, Locale locale, Object... messageParams) {
if (msg.contains("{")) {
+ try {
MessageFormat messageFormat = new MessageFormat(
msg, locale);
msg = messageFormat.format(messageParams);
-
+ } catch (IllegalArgumentException e) {
+ // Do nothing, use original string unchanged.
+ }
}
return msg;
}
14 years, 3 months
JBoss Rich Faces SVN: r16334 - in root: cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes and 12 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-01-19 14:32:12 -0500 (Tue, 19 Jan 2010)
New Revision: 16334
Added:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java
Modified:
root/cdk/trunk/plugins/annotations/pom.xml
root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy
root/examples-sandbox/trunk/backwardCompatibility/pom.xml
root/examples-sandbox/trunk/components/ajax/pom.xml
root/examples-sandbox/trunk/pom.xml
root/examples/trunk/components/repeater-demo/pom.xml
root/examples/trunk/pom.xml
root/framework/trunk/commons/
root/framework/trunk/legacy-tests/pom.xml
root/framework/trunk/version-matrix/pom.xml
root/ui/trunk/version-matrix/pom.xml
Log:
JSF version updated to 2.0.3-SNAPSHOT
XhtmlAttributesParsingTest added with required changes in pom.xml file
Modified: root/cdk/trunk/plugins/annotations/pom.xml
===================================================================
--- root/cdk/trunk/plugins/annotations/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/cdk/trunk/plugins/annotations/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -28,7 +28,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java
===================================================================
--- root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java 2010-01-19 19:32:12 UTC (rev 16334)
@@ -172,4 +172,12 @@
}
return true;
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return super.toString() + " " + getName();
+ }
}
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -36,7 +36,7 @@
<version>1.0</version>
<executions>
<execution>
- <phase>process-resources</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -44,7 +44,7 @@
<properties>
<sourceSchema>src/main/resources/META-INF/schema/xhtml-el.xsd</sourceSchema>
<targetNamespace>http://richfaces.org/cdk/xhtml-el</targetNamespace>
- <outputFile>META-INF/cdk/attributes/xhtml-el.xml</outputFile>
+ <outputFile>generated-resources/META-INF/cdk/attributes/xhtml-el.xml</outputFile>
</properties>
<classpath>
<element>
@@ -92,6 +92,18 @@
</configuration> </plugin
-->
</plugins>
+ <resources>
+ <resource>
+ <directory>
+ src/main/resources
+ </directory>
+ </resource>
+ <resource>
+ <directory>
+ ${project.build.directory}/generated-resources
+ </directory>
+ </resource>
+ </resources>
</build>
<dependencies>
<dependency>
@@ -140,7 +152,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Modified: root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/cdk/trunk/plugins/generator/src/main/script/SchemaAttributesParserTask.groovy 2010-01-19 19:32:12 UTC (rev 16334)
@@ -37,7 +37,7 @@
String sourceSchemaFileName = project.basedir.getAbsolutePath() + '/' + sourceSchemaParam;
def outputFileParam = project.properties['outputFile'];
- String outputFileName = project.build.outputDirectory + '/' + outputFileParam;
+ String outputFileName = project.build.directory + '/' + outputFileParam;
log.info("Parsing: " + sourceSchemaFileName);
log.info("Writing attributes XML data to: " + outputFileName);
Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java 2010-01-19 19:32:12 UTC (rev 16334)
@@ -0,0 +1,188 @@
+/*
+ * 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.templatecompiler;
+
+import static org.junit.Assert.assertTrue;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.TreeSet;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.richfaces.cdk.attributes.Attribute;
+import org.richfaces.cdk.attributes.Element;
+import org.richfaces.cdk.attributes.Schema;
+import org.richfaces.cdk.attributes.SchemaSet;
+import org.richfaces.cdk.attributes.Attribute.Kind;
+
+import com.google.common.base.Predicate;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class XhtmlAttributesParsingTest {
+
+ private Schema xhtmlSchema;
+
+ private void verifyAttributesByPredicate(Collection<Attribute> attributes, Predicate<Attribute> predicate) {
+ for (Attribute attribute : attributes) {
+ Assert.assertTrue(attribute.getName(), predicate.apply(attribute));
+ }
+ }
+
+ private Collection<Attribute> findAttributesByPredicate(Predicate<Attribute> predicate) {
+ List<Attribute> result = new ArrayList<Attribute>();
+
+ Collection<Element> elements = xhtmlSchema.getElements().values();
+ for (Element element : elements) {
+ Collection<Attribute> attributes = element.getAttributes().values();
+ for (Attribute attribute : attributes) {
+ if (predicate.apply(attribute)) {
+ result.add(attribute);
+ }
+ }
+ }
+
+ verifyAttributesByPredicate(result, predicate);
+
+ return result;
+ }
+
+ private Collection<String> getNamesCollection(Collection<Attribute> attributes) {
+ Collection<String> result = new TreeSet<String>();
+ for (Attribute attribute : attributes) {
+ result.add(attribute.getName());
+ }
+
+ return result;
+ }
+
+ private static final class AttributeNullDataPredicate implements Predicate<Attribute> {
+
+ @Override
+ public boolean apply(Attribute attribute) {
+ return attribute.getName() == null || attribute.getKind() == null;
+ }
+ }
+
+ private static final class AttributeNamePredicate implements Predicate<Attribute> {
+
+ public AttributeNamePredicate(String name) {
+ super();
+ this.name = name;
+ }
+
+ private String name;
+
+ @Override
+ public boolean apply(Attribute attribute) {
+ return name.equals(attribute.getName());
+ }
+ }
+
+ private static final class AttributeKindPredicate implements Predicate<Attribute> {
+
+ private Kind kind;
+
+ public AttributeKindPredicate(Kind kind) {
+ super();
+ this.kind = kind;
+ }
+
+ @Override
+ public boolean apply(Attribute attribute) {
+ return kind.equals(attribute.getKind());
+ }
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
+ URL parsedSchemaDataResource = contextCL.getResource("META-INF/cdk/attributes/xhtml-el.xml");
+
+ JAXBContext jc = JAXBContext.newInstance(SchemaSet.class);
+ Unmarshaller unmarshaller = jc.createUnmarshaller();
+
+ SchemaSet schemaSet = (SchemaSet) unmarshaller.unmarshal(parsedSchemaDataResource);
+ // TODO make constants
+ xhtmlSchema = schemaSet.getSchemas().get("http://richfaces.org/cdk/xhtml-el");
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ xhtmlSchema = null;
+ }
+
+ @Test
+ public void testAttributeDataIsNonNull() throws Exception {
+ Collection<Attribute> foundAttributes = findAttributesByPredicate(new AttributeNullDataPredicate());
+ assertTrue(foundAttributes.isEmpty());
+ }
+
+ @Test
+ public void testAttributeKinds() throws Exception {
+ AttributeKindPredicate booleanAttributePredicate = new AttributeKindPredicate(Kind.BOOLEAN);
+ AttributeKindPredicate genericAttributePredicate = new AttributeKindPredicate(Kind.GENERIC);
+ AttributeKindPredicate uriAttributePredicate = new AttributeKindPredicate(Kind.URI);
+
+ Collection<Attribute> booleanAttributes = findAttributesByPredicate(booleanAttributePredicate);
+ Collection<Attribute> genericAttributes = findAttributesByPredicate(genericAttributePredicate);
+ Collection<Attribute> uriAttributes = findAttributesByPredicate(uriAttributePredicate);
+
+ Collection<String> booleanAttributesNames = getNamesCollection(booleanAttributes);
+ Collection<String> genericAttributesNames = getNamesCollection(genericAttributes);
+ Collection<String> uriAttributesNames = getNamesCollection(uriAttributes);
+
+ System.out.println("XhtmlAttributesParsingTest.testAttributeKinds(), BOOLEAN attribute names: "
+ + booleanAttributesNames);
+ System.out.println("XhtmlAttributesParsingTest.testAttributeKinds(), URI attribute names: "
+ + uriAttributesNames);
+
+ for (String booleanAttributeName : booleanAttributesNames) {
+ Collection<Attribute> foundAttributes = findAttributesByPredicate(new AttributeNamePredicate(
+ booleanAttributeName));
+ verifyAttributesByPredicate(foundAttributes, booleanAttributePredicate);
+ }
+
+ for (String genericAttributeName : genericAttributesNames) {
+ Collection<Attribute> foundAttributes = findAttributesByPredicate(new AttributeNamePredicate(
+ genericAttributeName));
+ verifyAttributesByPredicate(foundAttributes, genericAttributePredicate);
+ }
+
+ for (String uriAttributeName : uriAttributesNames) {
+ Collection<Attribute> foundAttributes = findAttributesByPredicate(new AttributeNamePredicate(
+ uriAttributeName));
+ verifyAttributesByPredicate(foundAttributes, uriAttributePredicate);
+ }
+ }
+
+}
Modified: root/examples/trunk/components/repeater-demo/pom.xml
===================================================================
--- root/examples/trunk/components/repeater-demo/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/examples/trunk/components/repeater-demo/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>mojarra-jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: root/examples/trunk/pom.xml
===================================================================
--- root/examples/trunk/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/examples/trunk/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -52,13 +52,13 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<!--scope>provided</scope-->
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<!--scope>provided</scope-->
</dependency>
<dependency>
@@ -109,13 +109,13 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: root/examples-sandbox/trunk/backwardCompatibility/pom.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -121,13 +121,13 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: root/examples-sandbox/trunk/components/ajax/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/ajax/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/examples-sandbox/trunk/components/ajax/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -65,12 +65,12 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/examples-sandbox/trunk/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -52,13 +52,13 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<!--scope>provided</scope-->
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<!--scope>provided</scope-->
</dependency>
<dependency>
Property changes on: root/framework/trunk/commons
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
bin
.clover
Modified: root/framework/trunk/legacy-tests/pom.xml
===================================================================
--- root/framework/trunk/legacy-tests/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/framework/trunk/legacy-tests/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
Modified: root/framework/trunk/version-matrix/pom.xml
===================================================================
--- root/framework/trunk/version-matrix/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/framework/trunk/version-matrix/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -161,12 +161,12 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
@@ -259,7 +259,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
</dependency>
</dependencies>
Modified: root/ui/trunk/version-matrix/pom.xml
===================================================================
--- root/ui/trunk/version-matrix/pom.xml 2010-01-19 13:41:53 UTC (rev 16333)
+++ root/ui/trunk/version-matrix/pom.xml 2010-01-19 19:32:12 UTC (rev 16334)
@@ -122,12 +122,12 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<!-- Dependencies of JSF 2.0 -->
14 years, 3 months