richfaces-svn-commits
October 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 92 discussions
JBoss Rich Faces SVN: r15707 - in branches/community/3.3.X/docs/userguide/en: src/main/docbook/modules and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2009-10-08 21:26:32 -0400 (Thu, 08 Oct 2009)
New Revision: 15707
Modified:
branches/community/3.3.X/docs/userguide/en/pom.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml
Log:
Updated supported browsers
Modified: branches/community/3.3.X/docs/userguide/en/pom.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/pom.xml 2009-10-08 19:40:39 UTC (rev 15706)
+++ branches/community/3.3.X/docs/userguide/en/pom.xml 2009-10-09 01:26:32 UTC (rev 15707)
@@ -39,4 +39,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-10-08 19:40:39 UTC (rev 15706)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-10-09 01:26:32 UTC (rev 15707)
@@ -125,17 +125,39 @@
<title>Supported Browsers</title>
<itemizedlist>
- <listitem><para>Internet Explorer 6.0 - 8.0</para></listitem>
+
+ <title>Linux environments</title>
+
+ <listitem><para>Firefox 3.0 and higher</para></listitem>
- <listitem><para>Firefox 2.0 - 3.0</para></listitem>
+ <listitem><para>Opera 8.5 and higher</para></listitem>
- <listitem><para>Opera 8.5 - 9.5</para></listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+
+ <title>Windows environments</title>
+
+ <listitem><para>Internet Explorer 6.0 and higher</para></listitem>
+
+ <listitem><para>Firefox 3.0 and higher</para></listitem>
+
+ <listitem><para>Opera 8.5 and higher</para></listitem>
- <listitem><para>Safari 3.0</para></listitem>
+ <listitem><para>Safari 3.0 and higher</para></listitem>
<listitem><para>Google Chrome</para></listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+
+ <title>Mac OS environments</title>
+
+ <listitem><para>Safari 3.0 and higher</para></listitem>
+ <listitem><para>Firefox 3.5 and higher</para></listitem>
+
</itemizedlist>
<para>This list is composed basing on reports received from our users. We assume the list can be
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15706 - branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2009-10-08 15:40:39 -0400 (Thu, 08 Oct 2009)
New Revision: 15706
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java
Log:
- CalendarTestCase - fixed checking for right name of month in non-default locale
Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java 2009-10-08 15:13:47 UTC (rev 15705)
+++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java 2009-10-08 19:40:39 UTC (rev 15706)
@@ -26,7 +26,9 @@
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
import java.util.Locale;
import org.jboss.richfaces.integrationTest.AbstractSeleniumRichfacesTestCase;
@@ -272,7 +274,7 @@
selenium.click(LOC_DATE_BUTTON);
selenium.click(LOC_RANDOM_DAY);
- String month1 = Month.values()[Calendar.getInstance(new Locale("de")).get(Calendar.MONTH)].toString();
+ String month1 = new SimpleDateFormat("MMMMM", new Locale("de")).format(new Date());
String month2 = selenium.getText(LOC_MONTH_YEAR_LABEL).split(",")[0].trim();
assertTrue(month1.equalsIgnoreCase(month2), "The name of the month is not localized.");
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15705 - in branches/community/3.3.X/ui/menu-components/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-10-08 11:13:47 -0400 (Thu, 08 Oct 2009)
New Revision: 15705
Modified:
branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
Log:
https://jira.jboss.org/jira/browse/RF-7956
Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-10-08 15:01:26 UTC (rev 15704)
+++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-10-08 15:13:47 UTC (rev 15705)
@@ -158,7 +158,7 @@
return paramsMap;
}
- private boolean isNestedInMenu(UIComponent component) {
+ protected boolean isNestedInMenu(UIComponent component) {
for (UIComponent c = component; c != null; c = c.getParent()) {
if (c instanceof MenuComponent) {
return true;
@@ -168,6 +168,14 @@
return false;
}
+ protected String collectItemInlineStyles(FacesContext context, UIMenuItem menuItem, boolean isOnmouseover) {
+ return delegate.collectInlineStyles(context, menuItem, isOnmouseover);
+ }
+
+ protected String collectItemClasses(FacesContext context, UIMenuItem menuItem, boolean isOnmouseover) {
+ return delegate.collectClasses(context, menuItem, isOnmouseover);
+ }
+
public void initializeResources(FacesContext context, UIMenuItem menuItem)
throws IOException {
ComponentVariables variables =
Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2009-10-08 15:01:26 UTC (rev 15704)
+++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2009-10-08 15:13:47 UTC (rev 15705)
@@ -83,6 +83,28 @@
}
}
+ protected String collectInlineStyles(FacesContext context, UIComponent menuItem, boolean isOnmouseover) {
+ String style = (String) menuItem.getAttributes().get("style");
+ String selectStyle = (String) menuItem.getAttributes().get("selectStyle");
+
+ if (isOnmouseover) {
+ return concatStyles(style, selectStyle);
+ } else {
+ return style;
+ }
+ }
+
+ protected String collectClasses(FacesContext context, UIComponent component, boolean isOnmouseover) {
+ String styleClass = (String) component.getAttributes().get("styleClass");
+ String selectClass = (String) component.getAttributes().get("selectClass");
+
+ if (isOnmouseover) {
+ return concatStyles(styleClass, selectClass);
+ } else {
+ return styleClass;
+ }
+ }
+
protected UIComponent getParentMenu(FacesContext context, UIComponent menuItem) {
UIComponent parent = menuItem.getParent();
while (null != parent) {
Modified: branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-10-08 15:01:26 UTC (rev 15704)
+++ branches/community/3.3.X/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-10-08 15:13:47 UTC (rev 15705)
@@ -1,6 +1,7 @@
if(!window.RichFaces) window.RichFaces = {};
if(!RichFaces.Menu) RichFaces.Menu = {};
+
/**
* Fixes IE bug with incorrect layer width when set to auto
* @param layer
@@ -1297,6 +1298,46 @@
return within;
};
+RichFaces.Menu.Utils = {};
+
+RichFaces.Menu.Utils.itemMouseOut = function(event, element, parentClasses, itemClasses) {
+
+ if(!itemClasses && RichFaces.Menu.isWithin(event, element)){
+ return;
+ }
+
+ element.className = 'rich-menu-item rich-menu-item-enabled ' + (parentClasses.styleClass || '') + " " + (itemClasses != null ? itemClasses.itemClass || '' : '');
+ element.style.cssText = (parentClasses.style || '') + "; " + (itemClasses != null ? itemClasses.itemStyle || '' : '');
+ var icon = typeof element.getIcon == 'fuction' ? element.getIcon() : RichFaces.Menu.Utils.getIcon(element);
+ icon.className='rich-menu-item-icon ' + (parentClasses.iconClass || '');
+ var label = typeof element.getLabel == 'fuction' ? element.getLabel() : RichFaces.Menu.Utils.getLabel(element);
+ Element.removeClassName(label, 'rich-menu-item-label-selected');
+
+}
+
+RichFaces.Menu.Utils.itemMouseOver = function(event, element, parentClasses, itemClasses) {
+
+ if(!itemClasses && RichFaces.Menu.isWithin(event, element)){
+ return;
+ }
+
+ element.className = 'rich-menu-item rich-menu-item-hover ' + (parentClasses.styleClass || '') + " " + (parentClasses.selectClass || '') + " " + (itemClasses != null ? itemClasses.selectItemClass || '':'');
+ element.style.cssText = (parentClasses.style || '') + "; " + (itemClasses != null ? itemClasses.itemStyle || '' : '') + "; "+ (parentClasses.selectStyle || '') + "; " + (itemClasses != null ? itemClasses.selectItemStyle || '' : '');
+ var icon = typeof element.getIcon == 'fuction' ? element.getIcon() : RichFaces.Menu.Utils.getIcon(element);
+ icon.className='rich-menu-item-icon rich-menu-item-icon-selected ' + (parentClasses.iconClass || '');
+ var label = typeof element.getLabel == 'fuction' ? element.getLabel() : RichFaces.Menu.Utils.getLabel(element);
+ Element.addClassName(label, 'rich-menu-item-label-selected');
+
+}
+
+RichFaces.Menu.Utils.getIcon = function (element) {
+ return $(element.id + ':icon');
+}
+
+RichFaces.Menu.Utils.getLabel = function (element) {
+ return $(element.id + ':anchor');
+}
+
RichFaces.Menu.Item = Class.create({
initialize: function(id, menu, options) {
this.options = {
@@ -1352,10 +1393,13 @@
return $(this.id);
},
getIcon: function() {
- return $(this.id + ":icon");
+ //return $(this.id + ":icon");
+ return RichFaces.Menu.Utils.getIcon(this);
+
},
getLabel: function() {
- return $(this.id + ":anchor");
+ //return $(this.id + ":anchor");
+ return RichFaces.Menu.Utils.getLabel(this);
},
getInlineStyle: function() {
return this.options.style || "";
@@ -1400,13 +1444,15 @@
if (this.options.flagGroup != 1) {
var menuOptions = this.menu.options;
+ RichFaces.Menu.Utils.itemMouseOver(event, element, this.options, menuOptions);
+ /* var menuOptions = this.menu.options;
element.className = 'rich-menu-item rich-menu-item-hover '
+ (this.options.styleClass || "") + " " + (this.options.selectClass || "") + " "
+ (menuOptions.selectItemClass || "");
element.style.cssText = (this.options.style || "") + "; " + (menuOptions.itemStyle || "")
+ (this.options.selectStyle || "") + "; " + (menuOptions.selectItemStyle || "");
this.getIcon().className='rich-menu-item-icon rich-menu-item-icon-selected ' + (this.options.iconClass || '');
- Element.addClassName(this.getLabel(), 'rich-menu-item-label-selected');
+ Element.addClassName(this.getLabel(), 'rich-menu-item-label-selected'); */
}
},
onmouseout : function(event) {
@@ -1433,12 +1479,16 @@
RichFaces.Menu.Items.onmouseout(this);
if (this.options.flagGroup != 1) {
+
var menuOptions = this.menu.options;
+ RichFaces.Menu.Utils.itemMouseOut(event, element, this.options, menuOptions);
+ /*
+ var menuOptions = this.menu.options;
element.className = 'rich-menu-item rich-menu-item-enabled '
+ (this.options.styleClass || "") + " " + (menuOptions.itemClass || "");
element.style.cssText = (this.options.style || "") + "; " + (menuOptions.itemStyle || "");
this.getIcon().className='rich-menu-item-icon ' + (this.options.iconClass || "");
- Element.removeClassName(this.getLabel(), 'rich-menu-item-label-selected');
+ Element.removeClassName(this.getLabel(), 'rich-menu-item-label-selected'); */
}
},
highLightGroup: function(light) {
@@ -1529,4 +1579,5 @@
element.className = 'rich-menu-group rich-menu-group-enabled ' + (menuGroupHoverClass ? menuGroupHoverClass : '');
element.style.cssText = menuGroupStyle;
-}
\ No newline at end of file
+}
+
Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-10-08 15:01:26 UTC (rev 15704)
+++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-10-08 15:13:47 UTC (rev 15705)
@@ -35,7 +35,7 @@
<jsp:scriptlet><![CDATA[
- if (((org.richfaces.component.UIMenuItem) component).isDisabled()) {
+ if (((org.richfaces.component.UIMenuItem) component).isDisabled()) {
]]></jsp:scriptlet>
@@ -45,7 +45,7 @@
onclick="Event.stop(event);" >
<jsp:scriptlet><![CDATA[
- } else {
+ } else if(!isNestedInMenu(component)) {
/*String onselect = (String) component.getAttributes().get("onselect");
if(null!=onselect&&onselect.length()>0){
onselect = onselect+";";
@@ -54,11 +54,49 @@
}
variables.setVariable("onselect",onselect);
*/
+
+ String itemHoverClass = collectItemClasses(context, component, true);
+ String itemHoverStyle = collectItemInlineStyles(context, component, true);
+ variables.setVariable("itemHoverClass",itemHoverClass);
+ variables.setVariable("itemHoverStyles",itemHoverStyle);
+
+
+ String itemClass = collectItemClasses(context, component, false);
+ String itemStyle = collectItemInlineStyles(context, component, false);
+ variables.setVariable("itemClass",itemClass);
+ variables.setVariable("itemStyles",itemStyle);
+
+
]]></jsp:scriptlet>
+ <c:scriptObject var="onmouseoutClasses">
+ <c:scriptOption name="styleClass" value="#{itemClass}"/>
+ <c:scriptOption name="style" value="#{itemStyles}"/>
+ <c:scriptOption attributes="iconClass"/>
+ </c:scriptObject>
+ <c:scriptObject var="onmouseoverClasses">
+ <c:scriptOption name="styleClass" value="#{itemHoverClass}"/>
+ <c:scriptOption name="style" value="#{itemHoverStyles}"/>
+ <c:scriptOption attributes="iconClass"/>
+ </c:scriptObject>
+
<div id="#{clientId}"
class="#{menuItemClass}"
+ onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{onmouseoutClasses});"
+ onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{onmouseoverClasses});"
+ onclick="#{onclick}"
+ style="#{menuItemStyle}">
+ <f:call name="utils.encodeAttributes">
+ <f:parameter value="onmousemove,onmousedown,onmouseup" />
+ </f:call>
+ <jsp:scriptlet><![CDATA[
+ } else {
+ ]]></jsp:scriptlet>
+
+ <div id="#{clientId}"
+ class="#{menuItemClass}"
+
onclick="#{onclick}"
style="#{menuItemStyle}">
@@ -68,10 +106,9 @@
<jsp:scriptlet><![CDATA[
}
- ]]></jsp:scriptlet>
-
-
- <span id="#{clientId}:icon"
+ ]]></jsp:scriptlet>
+
+ <span id="#{clientId}:icon"
class="rich-menu-item-icon #{iconDisabledClasses} #{component.attributes['iconClass']}"
style="#{component.attributes['iconStyle']}">
@@ -99,14 +136,18 @@
</span>
<jsp:scriptlet><![CDATA[
- if (((org.richfaces.component.UIMenuItem) component).isDisabled()) {
+ if (((org.richfaces.component.UIMenuItem) component).isDisabled()) {
]]></jsp:scriptlet>
</div>
<jsp:scriptlet><![CDATA[
- } else {
+ } if(isNestedInMenu(component)){
]]></jsp:scriptlet>
</div>
<jsp:scriptlet><![CDATA[
+ }else {
+ ]]></jsp:scriptlet>
+ </div>
+ <jsp:scriptlet><![CDATA[
}
]]></jsp:scriptlet>
</f:root>
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15704 - branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-10-08 11:01:26 -0400 (Thu, 08 Oct 2009)
New Revision: 15704
Modified:
branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
Log:
https://jira.jboss.org/jira/browse/RF-7964
Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
===================================================================
--- branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2009-10-08 00:10:49 UTC (rev 15703)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2009-10-08 15:01:26 UTC (rev 15704)
@@ -68,7 +68,7 @@
<div id="#{clientId}:innerd" class="extdt-innerdiv" style="height:100%;width:100%;">
<div id="#{clientId}:cs" class="extdt-hsplit" style="display: none;"/>
<table id="#{clientId}:tu"
- class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
+ class="extdt-table-layout #{component.attributes['styleClass']}"
cellpadding="0"
cellspacing="0"
width="100%"
@@ -88,7 +88,7 @@
]]>
</jsp:scriptlet>
<table id="#{clientId}:empty" width="100%"
- class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
+ class="extdt-table-layout #{component.attributes['styleClass']}"
>
<f:call name="utils.encodePassThruWithExclusions">
<f:parameter value="height,value,name,type,id,class,rows,style,width" />
@@ -103,7 +103,7 @@
]]>
</jsp:scriptlet>
<table id="#{clientId}:n" width="100%;"
- class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
+ class="extdt-table-layout #{component.attributes['styleClass']}"
>
<f:call name="utils.encodePassThruWithExclusions">
<f:parameter value="height,value,name,type,id,class,rows,style,width" />
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15703 - in root/examples-sandbox/trunk/backwardCompatibility: src/main/java/org/ajax4jsf and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-10-07 20:10:49 -0400 (Wed, 07 Oct 2009)
New Revision: 15703
Added:
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml
Removed:
root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/hibernate.cfg.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/import.sql
root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/seamIntegration-ds.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/security.drl
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml
Modified:
root/examples-sandbox/trunk/backwardCompatibility/pom.xml
root/examples-sandbox/trunk/backwardCompatibility/src/main/java/org/ajax4jsf/MenuAction.java
root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/META-INF/persistence.xml
Log:
Make it running on Jboss 5.2 beta
Modified: root/examples-sandbox/trunk/backwardCompatibility/pom.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -2,19 +2,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>examples-sandbox</artifactId>
- <groupId>org.richfaces</groupId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.examples-sandbox</groupId>
+ <parent>
+ <artifactId>examples-sandbox</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.examples-sandbox</groupId>
<artifactId>backwardCompatibility</artifactId>
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
<properties>
<seam.version>2.2.0.GA</seam.version>
- <richfaces.version>3.3.2.GA</richfaces.version>
+ <richfaces.version>3.3.2.GA</richfaces.version>
</properties>
<build>
<finalName>backwardCompatibility</finalName>
@@ -48,50 +48,53 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
<dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richfaces.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>${richfaces.version}</version>
</dependency>
- <!--dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- <scope>runtime</scope>
- </dependency-->
- <!--dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <scope>runtime</scope>
- </dependency-->
+ <!--
+ dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version> <scope>runtime</scope> </dependency
+ -->
+ <!--
+ dependency> <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId> <version>1.2.2</version>
+ <scope>runtime</scope> </dependency
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.4.2</version>
<scope>runtime</scope>
</dependency>
- <!--dependency>
- <groupId>org.hibernate</groupId>
+ -->
+ <!--
+ dependency> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- </dependency-->
+ <version>3.1.0.GA</version> </dependency
+ -->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seam.version}</version>
<type>ejb</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
- <version>2.0.2.CR1</version>
- </dependency-->
+ <version>1.0_02.CR5</version>
+ </dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -114,18 +117,18 @@
<version>${seam.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: root/examples-sandbox/trunk/backwardCompatibility/src/main/java/org/ajax4jsf/MenuAction.java
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/java/org/ajax4jsf/MenuAction.java 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/java/org/ajax4jsf/MenuAction.java 2009-10-08 00:10:49 UTC (rev 15703)
@@ -14,19 +14,19 @@
@Name("menuAction") @Scope(ScopeType.SESSION)
public class MenuAction {
- private int _selectedTab=0;
+ private String _selectedTab=null;
/**
* @return the selectedTab
*/
- public int getSelectedTab() {
+ public String getSelectedTab() {
return _selectedTab;
}
/**
* @param selectedTab the selectedTab to set
*/
- public void setSelectedTab(int selectedTab) {
+ public void setSelectedTab(String selectedTab) {
_selectedTab = selectedTab;
}
Modified: root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/META-INF/persistence.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/META-INF/persistence.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/META-INF/persistence.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="exampleDatabase"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <jta-data-source>java:comp/env/jdbc/DS</jta-data-source>
+ <non-jta-data-source>java:/DefaultDS</non-jta-data-source>
<properties>
- <property name="hibernate.dialect"
- value="org.hibernate.dialect.HSQLDialect" />
- <property name="hibernate.hbm2ddl.auto" value="create" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ <!-- Binds the EntityManagerFactory to JNDI where Seam can look it up.
+ This is only relevant when the container automatically loads the persistence unit, as is the case in JBoss AS 5. -->
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/backwardCompatibilityEntityManagerFactory"/>
</properties>
</persistence-unit>
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/hibernate.cfg.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/hibernate.cfg.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/hibernate.cfg.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,17 +0,0 @@
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
- <session-factory name="java:/bookingDatabase">
- <property name="show_sql">false</property>
- <property name="connection.datasource">java:/DefaultDS</property>
- <property name="hbm2ddl.auto">create-drop</property>
- <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <property name="transaction.flush_before_completion">true</property>
- <property name="connection.release_mode">after_statement</property>
- <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
-
- </session-factory>
-</hibernate-configuration>
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/import.sql
===================================================================
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/seamIntegration-ds.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/seamIntegration-ds.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/seamIntegration-ds.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-
-<datasources>
-
- <local-tx-datasource>
- <jndi-name>seamIntegrationDatasource</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://host</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>username</user-name>
- <password>password</password>
-<!--
- <exception-sorter-class-name>
- org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
- </exception-sorter-class-name>
- <metadata>
- <type-mapping>mySQL</type-mapping>
- </metadata>
--->
- </local-tx-datasource>
-
-</datasources>
-
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/security.drl
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/security.drl 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/resources/security.drl 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,6 +0,0 @@
-package Permissions;
-
-import java.security.Principal;
-
-import org.jboss.seam.security.PermissionCheck;
-import org.jboss.seam.security.Role;
\ No newline at end of file
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:core="http://jboss.com/products/seam/core"
- xmlns:persistence="http://jboss.com/products/seam/persistence"
- xmlns:transaction="http://jboss.com/products/seam/transaction"
- xmlns:drools="http://jboss.com/products/seam/drools"
- xmlns:bpm="http://jboss.com/products/seam/bpm"
- xmlns:security="http://jboss.com/products/seam/security"
- xmlns:mail="http://jboss.com/products/seam/mail"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
- http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
- http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
- http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
-
- <core:init debug="true" /><!-- transaction-management-enabled="false" -->
-
- <core:manager concurrent-request-timeout="500"
- conversation-timeout="120000" conversation-id-parameter="cid" />
-
- <transaction:entity-transaction entity-manager="#{entityManager}" />
-
-
- <persistence:entity-manager-factory name="exampleDatabase" />
-
-
-
- <persistence:managed-persistence-context name="entityManager"
- auto-create="true" entity-manager-factory="#{exampleDatabase}" />
-
-
- <!--
-
- <persistence:managed-persistence-context name="entityManager"
- auto-create="true"
- entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/>
-
- <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory"
- persistence-unit-name="seamIntegration"/>
-
- <drools:rule-base name="securityRules">
- <drools:rule-files><value>/security.drl</value></drools:rule-files>
- </drools:rule-base>
-
- <security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"
- remember-me="true"/>
-
- <event type="org.jboss.seam.notLoggedIn">
- <action expression="#{redirect.captureCurrentView}"/>
- </event>
- <event type="org.jboss.seam.postAuthenticate">
- <action expression="#{redirect.returnToCapturedView}"/>
- </event>
-
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
-
- -->
- <!-- For use with jBPM pageflow or process management -->
- <!--
- <bpm:jbpm>
- <bpm:process-definitions></bpm:process-definitions>
- <bpm:pageflow-definitions></bpm:pageflow-definitions>
- </bpm:jbpm>
- -->
-
-</components>
Added: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml (rev 0)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:persistence="http://jboss.com/products/seam/persistence"
+ xmlns:transaction="http://jboss.com/products/seam/transaction"
+ xmlns:drools="http://jboss.com/products/seam/drools"
+ xmlns:bpm="http://jboss.com/products/seam/bpm"
+ xmlns:security="http://jboss.com/products/seam/security"
+ xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+
+ <core:init debug="true" /><!-- transaction-management-enabled="false" -->
+
+ <core:manager concurrent-request-timeout="500"
+ conversation-timeout="120000" conversation-id-parameter="cid" />
+
+ <transaction:entity-transaction entity-manager="#{entityManager}" />
+
+
+ <persistence:entity-manager-factory name="exampleDatabase" />
+
+
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true" entity-manager-factory="#{exampleDatabase}" />
+
+
+ <!--
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true"
+ entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/>
+
+ <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory"
+ persistence-unit-name="seamIntegration"/>
+
+ <drools:rule-base name="securityRules">
+ <drools:rule-files><value>/security.drl</value></drools:rule-files>
+ </drools:rule-base>
+
+ <security:identity authenticate-method="#{authenticator.authenticate}"
+ security-rules="#{securityRules}"
+ remember-me="true"/>
+
+ <event type="org.jboss.seam.notLoggedIn">
+ <action expression="#{redirect.captureCurrentView}"/>
+ </event>
+ <event type="org.jboss.seam.postAuthenticate">
+ <action expression="#{redirect.returnToCapturedView}"/>
+ </event>
+
+ <mail:mail-session host="localhost" port="2525" username="test" password="test" />
+
+ -->
+ <!-- For use with jBPM pageflow or process management -->
+ <!--
+ <bpm:jbpm>
+ <bpm:process-definitions></bpm:process-definitions>
+ <bpm:pageflow-definitions></bpm:pageflow-definitions>
+ </bpm:jbpm>
+ -->
+
+</components>
Property changes on: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/components.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="1.2"
- 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-facesconfig_1_2.xsd">
-
- <application>
- <message-bundle>messages</message-bundle>
- <locale-config>
- <default-locale>en</default-locale>
- </locale-config>
- <!-- Disabled when using Ajax4JSF -->
- <!--
- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- -->
- <default-render-kit-id>
- org.apache.myfaces.trinidad.core
- </default-render-kit-id>
- </application>
-</faces-config>
Added: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config version="2.0"
+ 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-facesconfig_2_0.xsd">
+ <application>
+ <message-bundle>messages</message-bundle>
+ <locale-config>
+ <default-locale>en</default-locale>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>it</supported-locale>
+ <supported-locale>ru</supported-locale>
+ </locale-config>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application>
+</faces-config>
Property changes on: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml 2009-10-07 18:26:05 UTC (rev 15702)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -1,98 +0,0 @@
-<?xml version="1.0" ?>
-<web-app version="2.5" 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-app_2_5.xsd">
-
-
- <!-- Ajax4jsf -->
- <!--
- <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>com.sun.facelets.FaceletViewHandler</param-value>
- </context-param>
- -->
- <context-param>
- <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
- <param-value>com.sun.facelets.FaceletViewHandler</param-value>
- </context-param>
- <context-param>
- <param-name>org.ajax4jsf.SKIN</param-name>
- <param-value>blueSky</param-value>
- </context-param>
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
- <param-value>*.xhtml</param-value>
- </context-param>
-
- <!-- Seam -->
- <listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
- </listener>
- <filter>
- <filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
- <filter-name>trinidad</filter-name>
- <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>trinidad</filter-name>
- <!-- This assumes that the FacesServlet has been registered -->
- <!-- under the name "faces" -->
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <servlet>
- <servlet-name>Seam Resource Servlet</servlet-name>
- <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Seam Resource Servlet</servlet-name>
- <url-pattern>/seam/resource/*</url-pattern>
- </servlet-mapping>
-
- <!-- Facelets development mode (disable in production) -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <!-- JSF -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.seam</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <servlet>
- <servlet-name>resources</servlet-name>
- <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
- </servlet>
- <!-- This cannot be configured currently -->
- <servlet-mapping>
- <servlet-name>resources</servlet-name>
- <url-pattern>/adf/*</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Added: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml 2009-10-08 00:10:49 UTC (rev 15703)
@@ -0,0 +1,75 @@
+<?xml version="1.0" ?>
+<web-app version="2.5" 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-app_2_5.xsd">
+
+
+ <!-- Ajax4jsf -->
+ <!--
+ <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ -->
+ <context-param>
+ <param-name>org.ajax4jsf.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+
+ <!-- Seam -->
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Facelets development mode (disable in production) -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+ <!-- JSF -->
+ <context-param>
+ <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Property changes on: root/examples-sandbox/trunk/backwardCompatibility/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15702 - root/examples-sandbox/trunk/backwardCompatibility.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-10-07 14:26:05 -0400 (Wed, 07 Oct 2009)
New Revision: 15702
Modified:
root/examples-sandbox/trunk/backwardCompatibility/pom.xml
Log:
properly setup dependencies
Modified: root/examples-sandbox/trunk/backwardCompatibility/pom.xml
===================================================================
--- root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-10-07 17:39:17 UTC (rev 15701)
+++ root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-10-07 18:26:05 UTC (rev 15702)
@@ -48,6 +48,11 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richfaces.version}</version>
+ </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
@@ -66,13 +71,8 @@
<scope>runtime</scope>
</dependency-->
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
+ <artifactId>slf4j-simple</artifactId>
<version>1.4.2</version>
<scope>runtime</scope>
</dependency>
@@ -85,6 +85,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seam.version}</version>
+ <type>ejb</type>
</dependency>
<!--dependency>
<groupId>org.jboss.el</groupId>
@@ -113,10 +114,18 @@
<version>${seam.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15701 - in root/examples-sandbox/trunk: backwardCompatibility and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-10-07 13:39:17 -0400 (Wed, 07 Oct 2009)
New Revision: 15701
Added:
root/examples-sandbox/trunk/backwardCompatibility/
Removed:
root/examples-sandbox/trunk/backwardCompatibility/src/test/java/org/ajax4jsf/BeanTest.java
Modified:
root/examples-sandbox/trunk/backwardCompatibility/pom.xml
Log:
sample application uses RichFaces 3.x and Seam 2.x with JSF 2.0
Copied: root/examples-sandbox/trunk/backwardCompatibility (from rev 15700, branches/community/3.3.X/samples/seamIntegration)
Modified: root/examples-sandbox/trunk/backwardCompatibility/pom.xml
===================================================================
--- branches/community/3.3.X/samples/seamIntegration/pom.xml 2009-10-07 16:15:37 UTC (rev 15700)
+++ root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-10-07 17:39:17 UTC (rev 15701)
@@ -2,21 +2,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.3.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>seamIntegration</artifactId>
+ <parent>
+ <artifactId>examples-sandbox</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.examples-sandbox</groupId>
+ <artifactId>backwardCompatibility</artifactId>
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
<properties>
- <seam.version>2.1.2-SNAPSHOT</seam.version>
+ <seam.version>2.2.0.GA</seam.version>
+ <richfaces.version>3.3.2.GA</richfaces.version>
</properties>
<build>
- <finalName>seamIntegration</finalName>
+ <finalName>backwardCompatibility</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -50,20 +51,20 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>${version}</version>
+ <version>${richfaces.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
<scope>runtime</scope>
- </dependency>
- <dependency>
+ </dependency-->
+ <!--dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
@@ -75,21 +76,21 @@
<version>1.4.2</version>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>3.1.0.GA</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seam.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
<version>2.0.2.CR1</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -117,16 +118,5 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>1.2.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>1.2.10</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted: root/examples-sandbox/trunk/backwardCompatibility/src/test/java/org/ajax4jsf/BeanTest.java
===================================================================
--- branches/community/3.3.X/samples/seamIntegration/src/test/java/org/ajax4jsf/BeanTest.java 2009-10-07 16:15:37 UTC (rev 15700)
+++ root/examples-sandbox/trunk/backwardCompatibility/src/test/java/org/ajax4jsf/BeanTest.java 2009-10-07 17:39:17 UTC (rev 15701)
@@ -1,46 +0,0 @@
-/**
- * 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.ajax4jsf;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
-*/
-public class BeanTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public BeanTest( String testName )
- {
- super( testName );
- }
-
- public void testStub() throws Exception {
-
- }
-}
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15700 - branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-10-07 12:15:37 -0400 (Wed, 07 Oct 2009)
New Revision: 15700
Modified:
branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
Log:
https://jira.jboss.org/jira/browse/RF-7948
Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
===================================================================
--- branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2009-10-07 12:46:47 UTC (rev 15699)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2009-10-07 16:15:37 UTC (rev 15700)
@@ -81,7 +81,7 @@
<tbody>
<tr>
<td colspan="#{columnsCount}" style="padding: 0px;">
- <div id="#{clientId}:sd" class="extdt-content" style="height:50px;width:100%;overflow:hidden;">
+ <div id="#{clientId}:sd" class="extdt-content" style="height:50px;width:100%;">
<jsp:scriptlet>
<![CDATA[
if (component.getRowCount() <= 0) {
@@ -102,7 +102,7 @@
}
]]>
</jsp:scriptlet>
- <table id="#{clientId}:n" style="width:100%; height:100%;overflow: hidden;"
+ <table id="#{clientId}:n" width="100%;"
class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
>
<f:call name="utils.encodePassThruWithExclusions">
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15699 - branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-10-07 08:46:47 -0400 (Wed, 07 Oct 2009)
New Revision: 15699
Modified:
branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
https://jira.jboss.org/jira/browse/RF-7950
Modified: branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-10-06 00:28:31 UTC (rev 15698)
+++ branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-10-07 12:46:47 UTC (rev 15699)
@@ -53,7 +53,7 @@
<button class="rich-mpnl-button" id="#{clientId}FirstHref"></button>
</div>
- <div class="rich-mpnl_panel" >
+ <div class="rich-mpnl-panel" >
<div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9;" class="rich-mp-container">
<div id="#{clientId}ShadowDiv" class="rich-mpnl-shadow"
15 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r15698 - in root/cdk/trunk/plugins: generator/src/main/java/org/richfaces/builder/model and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-10-05 20:28:31 -0400 (Mon, 05 Oct 2009)
New Revision: 15698
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java
Removed:
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenCompilationContext.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenVelocityCompilationContext.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenXMLMerge.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/VelocityTaglibMergeCallBack.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/XMLMergeCallback.java
Modified:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java
Log:
https://jira.jboss.org/jira/browse/RF-7789 , start implementation
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -30,7 +30,12 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">
+ * <p class="changed_added_4_0">This annotation tells CDK to generate event-related classes:
+ * <ul>
+ * <li>Event listener interface</li>
+ * <li>Event source interface</li>
+ * <li>Event tag handler and binding wrapper.</li>
+ * </ul>
* </p>
*
* @author asmirnov(a)exadel.com
@@ -48,9 +53,17 @@
* Name of the listener interface class.
* </p>
*
- * @return component type.
+ * @return name of generated listener interface..
*/
public String listener() default "";
+ /**
+ * <p class="changed_added_4_0">
+ * Name of the listener interface class.
+ * </p>
+ *
+ * @return name of generated source interface..
+ */
+ public String source() default "";
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -43,6 +43,5 @@
}
public JavaComment() {
- // TODO Auto-generated constructor stub
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -39,7 +39,6 @@
private List<MethodBodyStatement> body = new ArrayList<MethodBodyStatement>();
public MethodBody() {
- // TODO Auto-generated constructor stub
}
public MethodBody(JavaMethod method) {
super();
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -56,8 +56,6 @@
@Override
public void init(CdkContext context) throws CdkException {
this.context = context;
- // TODO Auto-generated method stub
-
}
/*
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/TemplateReader.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -34,6 +34,8 @@
import javax.xml.stream.events.XMLEvent;
import org.richfaces.builder.model.JavaClass;
+import org.richfaces.cdk.Logger;
+import org.richfaces.cdk.LoggerFactory;
/**
* @author Nick Belaevski
@@ -41,6 +43,8 @@
*/
public class TemplateReader {
+ private static final Logger log = LoggerFactory.getLogger();
+
private static final class ConsumersTracker {
private final class ConsumerEntry {
@@ -150,14 +154,12 @@
try {
stream.close();
} catch (IOException e) {
- // TODO: handle exception
- e.printStackTrace();
+ log.warn("Error to close XML template stream", e);
}
try {
xmlEventReader.close();
} catch (XMLStreamException e) {
- // TODO: handle exception
- e.printStackTrace();
+ log.warn("Error to close XMLEventReader for renderer template parser", e);
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -80,6 +80,14 @@
* @return
* @throws CdkException
*/
- public <W extends CdkWorker> W getWorkerInstance(Class<W> workerClass) throws CdkException;
+ public <W extends CdkWorker> W getWorkerInstance(Class<W> workerClass) throws CdkException;
+
+ /**
+ * <p class="changed_added_4_0">Get value of configuration option.</p>
+ * TODO make it type safe.
+ * @param name option name.
+ * @return option value or null.
+ */
+ public String getOption(String name);
}
\ No newline at end of file
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -45,6 +45,8 @@
private final ClassLoader loader;
+ private Map<String, String> options = Maps.newHashMap();
+
private Map<SourceType, Iterable<File>> sources = Maps.newHashMap();
private Map<OutputType,File> outputs = Maps.newHashMap();
@@ -57,7 +59,6 @@
public CdkContextBase(ClassLoader loader) {
this.loader = loader;
- // TODO Auto-generated constructor stub
}
/* (non-Javadoc)
@@ -127,7 +128,7 @@
throws CdkException {
CdkWorker worker = workers.get(workerClass);
if(null == worker){
- // TODO - instantiate worker.
+ // instantiate worker.
try {
worker = workerClass.newInstance();
worker.init(this);
@@ -180,4 +181,17 @@
}
return outputFile;
}
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param options the options to set
+ */
+ public void setOptions(Map<String, String> options) {
+ this.options.putAll(options);
+ }
+
+ @Override
+ public String getOption(String name) {
+ return options.get(name);
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -34,7 +34,6 @@
* <p class="changed_added_4_0"></p>
*/
public CdkException() {
- // TODO Auto-generated constructor stub
}
/**
@@ -43,7 +42,6 @@
*/
public CdkException(String message) {
super(message);
- // TODO Auto-generated constructor stub
}
/**
@@ -52,7 +50,6 @@
*/
public CdkException(Throwable cause) {
super(cause);
- // TODO Auto-generated constructor stub
}
/**
@@ -62,7 +59,6 @@
*/
public CdkException(String message, Throwable cause) {
super(message, cause);
- // TODO Auto-generated constructor stub
}
}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -0,0 +1,72 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk;
+
+/**
+ * <p class="changed_added_4_0">That exception indicates recoverable CDK error, that it is, means
+ * errors in source code or configuration files that makes project build failed, so no result shulde be generated, but does not
+ * stop further processing of other classes or files. CDK should collect such errors but do not
+ * stop processing that let developer to know about all errors in the project.</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class CdkProcessingError extends CdkException {
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ */
+ private static final long serialVersionUID = -3696046213271071968L;
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ */
+ public CdkProcessingError() {
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ */
+ public CdkProcessingError(String message) {
+ super(message);
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param cause
+ */
+ public CdkProcessingError(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ * @param cause
+ */
+ public CdkProcessingError(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -48,8 +48,6 @@
@Override
public void init(CdkContext context) {
this.context = context;
- // TODO Auto-generated method stub
-
}
protected CdkContext getContext() {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -41,7 +41,6 @@
* <p class="changed_added_4_0"></p>
*/
public AptException() {
- // TODO Auto-generated constructor stub
}
/**
@@ -50,7 +49,6 @@
*/
public AptException(String message) {
super(message);
- // TODO Auto-generated constructor stub
}
/**
@@ -59,7 +57,6 @@
*/
public AptException(Throwable cause) {
super(cause);
- // TODO Auto-generated constructor stub
}
/**
@@ -69,7 +66,6 @@
*/
public AptException(String message, Throwable cause) {
super(message, cause);
- // TODO Auto-generated constructor stub
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -32,6 +32,7 @@
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.faces.component.FacesComponent;
+import javax.faces.event.FacesEvent;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
@@ -56,6 +57,7 @@
import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.Facets;
import org.richfaces.cdk.annotations.Family;
+import org.richfaces.cdk.annotations.Fires;
import org.richfaces.cdk.annotations.Generate;
import org.richfaces.cdk.annotations.Icon;
import org.richfaces.cdk.annotations.Signature;
@@ -274,6 +276,24 @@
}
}
+ private void setEvents(TypeElement componentElement,
+ org.richfaces.cdk.model.Component component) {
+ Fires fires = componentElement.getAnnotation(Fires.class);
+ if(null != fires){
+ try {
+ for (Class<? extends FacesEvent> eventClass : fires.value()) {
+ component.addEvent(eventClass.getName());
+ }
+ } catch (MirroredTypesException mirror) {
+ for(TypeMirror eventType :mirror.getTypeMirrors()){
+ component.addEvent(eventType.toString());
+ // TODO - check does component already implement eventSource interface
+ }
+ }
+ }
+ }
+
+
private void setClassNames(TypeElement componentElement,
org.richfaces.cdk.model.Component component) {
Generate generate = componentElement.getAnnotation(Generate.class);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -47,7 +47,6 @@
*/
public Type(String type) {
super(type);
- // TODO Auto-generated constructor stub
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,23 +1,17 @@
package org.richfaces.cdk.model;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.model.Event.ClassName;
import org.richfaces.cdk.model.Facet.Name;
-import org.richfaces.cdk.util.Strings;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
/**
@@ -90,10 +84,10 @@
* Application level events fired by the component
* </p>
*/
- private final SearchableCollection<Event,Event.ClassName> events = new ModelCollection<Event, Event.ClassName>() {
+ private final SearchableCollection<Event,Event.Type> events = new ModelCollection<Event, Event.Type>() {
@Override
- public Event create(ClassName key) {
+ public Event create(Event.Type key) {
return new Event(key);
}
};
@@ -269,7 +263,7 @@
public Event addEvent(String className){
// TODO - use a single events collection from library.
- return events.findOrCreate(new Event.ClassName(className));
+ return events.findOrCreate(new Event.Type(className));
}
/**
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -117,6 +117,20 @@
return behavior;
}
};
+
+ /**
+ * <p class="changed_added_4_0">
+ * Application level events fired by the component
+ * </p>
+ */
+ private final SearchableCollection<Event,Event.Type> events = new ModelCollection<Event, Event.Type>() {
+
+ @Override
+ public Event create(Event.Type key) {
+ return new Event(key);
+ }
+ };
+
private final SearchableCollection<Listener, Key> listeners = new ModelCollection<Listener, Key>() {
@Override
@@ -159,6 +173,8 @@
converters.merge(otherLibrary.converters);
validators.merge(otherLibrary.validators);
listeners.merge(otherLibrary.listeners);
+ events.merge(otherLibrary.events);
+ behaviors.merge(otherLibrary.behaviors);
}
public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
@@ -167,6 +183,8 @@
result = accept(converters, visitor, param, result);
result = accept(validators, visitor, param, result);
result = accept(listeners, visitor, param, result);
+ result = accept(events, visitor, param, result);
+ result = accept(behaviors, visitor, param, result);
return result;
}
@@ -265,6 +283,14 @@
}
/**
+ * <p class="changed_added_4_0"></p>
+ * @return the events
+ */
+ public SearchableCollection<Event, Event.Type> getEvents() {
+ return events;
+ }
+
+ /**
* <p class="changed_added_4_0">
* </p>
*
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -33,64 +33,129 @@
*
*/
@SuppressWarnings("serial")
-public class Event implements ModelElement<Event,Event.ClassName>{
+public class Event implements ModelElement<Event,Event.Type>{
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
*
*/
- public static final class ClassName extends Key {
+ public static final class Type extends Key {
/**
* <p class="changed_added_4_0"></p>
* @param type
*/
- public ClassName(String type) {
+ public Type(String type) {
super(type);
- // TODO Auto-generated constructor stub
}
}
/**
* <p class="changed_added_4_0"></p>
- * TODO - create individual key.
*/
- private final ClassName name;
+ private final Type type;
private String description;
- private String className;
- private String listenerInterface;
+ private ClassDescription listenerInterface;
- private String sourceInterface;
+ private ClassDescription sourceInterface;
+
+ private ClassDescription tagHandler;
+
+
/**
* <p class="changed_added_4_0"></p>
- * @return the name
+ * @param type the type to set
*/
- public Key getName() {
- return name;
+ public Event(Type name) {
+ this.type = name;
}
/**
* <p class="changed_added_4_0"></p>
- * @param name the name to set
+ * @return the type
*/
- public Event(ClassName name) {
- this.name = name;
+ public Key getType() {
+ return type;
}
@Override
- public void merge(Event other) {
- ComponentLibrary.merge(this, other);
+ public Type getKey() {
+ return type;
}
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the listenerInterface
+ */
+ public ClassDescription getListenerInterface() {
+ return listenerInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param listenerInterface the listenerInterface to set
+ */
+ public void setListenerInterface(ClassDescription listenerInterface) {
+ this.listenerInterface = listenerInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the sourceInterface
+ */
+ public ClassDescription getSourceInterface() {
+ return sourceInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param sourceInterface the sourceInterface to set
+ */
+ public void setSourceInterface(ClassDescription sourceInterface) {
+ this.sourceInterface = sourceInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the tagHandler
+ */
+ public ClassDescription getTagHandler() {
+ return tagHandler;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param tagHandler the tagHandler to set
+ */
+ public void setTagHandler(ClassDescription tagHandler) {
+ this.tagHandler = tagHandler;
+ }
+
@Override
- public ClassName getKey() {
- return name;
+ public void merge(Event other) {
+ ComponentLibrary.merge(this, other);
}
@Override
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -27,6 +27,8 @@
import javax.faces.render.RenderKitFactory;
+import org.richfaces.cdk.CdkException;
+
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -136,9 +138,9 @@
* @see org.richfaces.cdk.model.ModelElement#accept(org.richfaces.cdk.model.LibraryVisitor, java.lang.Object)
*/
@Override
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) {
- // TODO Auto-generated method stub
- return null;
+ public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
+ R result = visitor.visit(this, param);
+ return ComponentLibrary.accept(renderers, visitor, param, result);
}
@Override
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -104,7 +104,7 @@
@Override
public InputSource getExternalSubset(String name, String baseURI)
throws SAXException, IOException {
- // TODO Auto-generated method stub
+ // do nothing because we use XML schema only.
return null;
}
@@ -143,8 +143,6 @@
InputSource entity = null;
if (null != systemId) {
entity = resolveSystemId(systemId);
- } else {
- // TODO - check publicId
}
return entity;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -33,6 +33,7 @@
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
+import org.richfaces.cdk.model.Event;
import org.richfaces.cdk.model.Facet;
import org.richfaces.cdk.model.Property;
@@ -150,6 +151,7 @@
private List<String> rendererTypes = Lists.newArrayList();
+ private List<Event> events = Lists.newArrayList();
/**
* <p class="changed_added_4_0"></p>
* @param family the family to set
@@ -218,5 +220,23 @@
public List<String> getRendererTypes() {
return rendererTypes;
}
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the events
+ */
+ @XmlElement(name="fires",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(EventAdapter.class)
+ public List<Event> getEvents() {
+ return events;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param events the events to set
+ */
+ public void setEvents(List<Event> events) {
+ this.events = events;
+ }
}
}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -0,0 +1,48 @@
+/*
+ * $Id: EventAdapter.java 15382 2009-08-28 00:25:48Z alexsmirnov $
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.xmlconfig.model;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+import org.richfaces.cdk.model.Event;
+import org.richfaces.cdk.xmlconfig.JAXBBinding;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class EventAdapter extends XmlAdapter<EventBean, Event> {
+
+ @Override
+ public EventBean marshal(Event v) throws Exception {
+ return JAXBBinding.createAdapter(EventBean.class, v);
+ }
+
+ @Override
+ public Event unmarshal(EventBean v) throws Exception {
+ return JAXBBinding.createModelElement(Event.class, v, new Event.Type(v.getType()));
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -0,0 +1,139 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.xmlconfig.model;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.richfaces.cdk.model.ClassDescription;
+import org.richfaces.cdk.model.ComponentLibrary;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+@XmlType(name="faces-eventType",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+public class EventBean {
+
+ private String type;
+
+ private String description;
+
+ private ClassDescription listenerInterface;
+
+ private ClassDescription sourceInterface;
+
+ private ClassDescription tagHandler;
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the type
+ */
+ @XmlElement(name="event-class",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param type the type to set
+ */
+ @XmlElement(name="description",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the listenerInterface
+ */
+ @XmlElement(name="listener-class",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(ClassAdapter.class)
+ public ClassDescription getListenerInterface() {
+ return listenerInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param listenerInterface the listenerInterface to set
+ */
+ public void setListenerInterface(ClassDescription listenerInterface) {
+ this.listenerInterface = listenerInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the sourceInterface
+ */
+ @XmlElement(name="source-class",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(ClassAdapter.class)
+ public ClassDescription getSourceInterface() {
+ return sourceInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param sourceInterface the sourceInterface to set
+ */
+ public void setSourceInterface(ClassDescription sourceInterface) {
+ this.sourceInterface = sourceInterface;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the tagHandler
+ */
+ @XmlElement(name="tag-handler-class",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(ClassAdapter.class)
+ public ClassDescription getTagHandler() {
+ return tagHandler;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param tagHandler the tagHandler to set
+ */
+ public void setTagHandler(ClassDescription tagHandler) {
+ this.tagHandler = tagHandler;
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -33,6 +33,7 @@
import org.richfaces.cdk.model.Component;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
+import org.richfaces.cdk.model.Event;
import org.richfaces.cdk.model.Extensible;
import org.richfaces.cdk.model.RenderKit;
@@ -48,6 +49,21 @@
public static final class FacesConfigExtension extends ConfigExtension {
+ private List<Event> events = Lists.newArrayList();
+ @XmlElement(name="faces-event",namespace=ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(EventAdapter.class)
+ public List<Event> getEvents() {
+ return events;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param events the events to set
+ */
+ public void setEvents(List<Event> events) {
+ this.events = events;
+ }
+
}
@XmlElement(name="component",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE)
@XmlJavaTypeAdapter(ComponentAdapter.class)
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -5,11 +5,15 @@
public class ParsingException extends CdkException {
/**
+ * <p class="changed_added_4_0"></p>
+ */
+ private static final long serialVersionUID = 1629210103196620913L;
+
+ /**
* <p class="changed_added_4_0"></p>
*/
public ParsingException() {
super();
- // TODO Auto-generated constructor stub
}
/**
@@ -19,7 +23,6 @@
*/
public ParsingException(String message, Throwable cause) {
super(message, cause);
- // TODO Auto-generated constructor stub
}
/**
@@ -28,7 +31,6 @@
*/
public ParsingException(String message) {
super(message);
- // TODO Auto-generated constructor stub
}
/**
@@ -37,7 +39,6 @@
*/
public ParsingException(Throwable cause) {
super(cause);
- // TODO Auto-generated constructor stub
}
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -285,21 +285,5 @@
assertTrue(processor.isInitialized());
assertEquals(1, processor.numOfComponents);
}
- /**
- * <p class="changed_added_4_0">
- * </p>
- *
- * @param name
- * TODO
- * @return
- * @throws URISyntaxException
- */
- private JavaFileObject getJavaFileObject(String name)
- throws URISyntaxException {
- final File classFile = getJavaFile(name);
- SimpleJavaFileObject fileObject = new VirtualJavaFileSystemObject(
- classFile);
- return fileObject;
- }
}
Deleted: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenCompilationContext.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenCompilationContext.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenCompilationContext.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,99 +0,0 @@
-/**
- * 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.builder.maven;
-
-import org.richfaces.cdk.CdkContextBase;
-
-/**
- * @author shura
- *
- */
-public class MavenCompilationContext extends CdkContextBase {
-
- private MavenLogger logger;
-
- /**
- * @param logger
- * @throws CompilationException
- */
- public MavenCompilationContext(MavenLogger logger, ClassLoader loader) {
- super(loader);
- this.logger = logger;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#debug(java.lang.String)
- */
- public void debug(String content) {
- logger.debug(content);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#debug(java.lang.String, java.lang.Throwable)
- */
- public void debug(String content, Throwable error) {
- logger.debug(content, error);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#error(java.lang.String)
- */
- public void error(String content) {
- logger.error(content);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#error(java.lang.String, java.lang.Throwable)
- */
- public void error(String content, Throwable error) {
- logger.error(content, error);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#info(java.lang.String)
- */
- public void info(String content) {
- logger.info(content);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#info(java.lang.String, java.lang.Throwable)
- */
- public void info(String content, Throwable error) {
- logger.info(content, error);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#warn(java.lang.String)
- */
- public void warn(String content) {
- logger.warn(content);
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#warn(java.lang.String, java.lang.Throwable)
- */
- public void warn(String content, Throwable error) {
- logger.warn(content, error);
- }
-
-}
Deleted: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenVelocityCompilationContext.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenVelocityCompilationContext.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenVelocityCompilationContext.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,58 +0,0 @@
-/**
- * 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.builder.maven;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.richfaces.cdk.CdkException;
-
-/**
- * @author shura
- *
- */
-public class MavenVelocityCompilationContext extends MavenCompilationContext {
-
- private VelocityEngine engine;
-
- public MavenVelocityCompilationContext(MavenLogger logger,ClassLoader loader,VelocityEngine engine) {
- super(logger, loader);
- this.engine = engine;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.templatecompiler.builder.CompilationContext#getTemplate(java.lang.String)
- */
- public Template getTemplate(String name) throws CdkException {
- try {
- return engine.getTemplate(name);
- } catch (ResourceNotFoundException e) {
- throw new CdkException(e.getLocalizedMessage());
- } catch (ParseErrorException e) {
- throw new CdkException(e.getLocalizedMessage());
- } catch (Exception e) {
- throw new CdkException(e.getLocalizedMessage());
- }
- }
-
-}
Deleted: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenXMLMerge.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenXMLMerge.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/MavenXMLMerge.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,137 +0,0 @@
-/**
- * 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.builder.maven;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.richfaces.cdk.xmlutils.XMLBody;
-import org.richfaces.cdk.xmlutils.XMLBodyMerge;
-import org.richfaces.cdk.xmlutils.XPathComparator;
-
-/**
- * Class is used to locate and merge several xml files
- * @author Maksim Kaszynski
- *
- */
-public class MavenXMLMerge {
-
- class DirectoryItem {
- private File baseDir;
- private String [] includes;
- public DirectoryItem(File baseDir, String[] includes) {
- super();
- this.baseDir = baseDir;
- this.includes = includes;
- }
-
- }
-
- private boolean namespaceAware = false;
-
- private Log log;
-
- private String xPath;
-
- private String keyXPath;
-
- private String [] sortBy = {};
-
- private List<DirectoryItem> directories = new ArrayList<DirectoryItem>();
-
- public MavenXMLMerge() {
- }
-
- public void addDirectory(File dir, String [] includes) {
- directories.add(new DirectoryItem(dir, includes));
- }
-
- public void setSortBy(String ... sortBy) {
- this.sortBy = sortBy;
- }
-
- public void performMerge(XMLMergeCallback callback) throws MojoExecutionException {
- XMLBodyMerge merge = new XMLBodyMerge(xPath, keyXPath);
-
- for (DirectoryItem item : directories) {
- DirectoryScanner ds = new DirectoryScanner();
- ds.setFollowSymlinks(true);
- ds.setBasedir(item.baseDir);
- ds.setIncludes(item.includes);
- ds.addDefaultExcludes();
- ds.scan();
- String[] files = ds.getIncludedFiles();
- for (String file : files) {
- File sourceFile = new File(item.baseDir, file);
- if (log != null){
- log.info("Process file " + sourceFile.getPath());
- }
- try {
- XMLBody configBody = new XMLBody();
- configBody.loadXML(new FileInputStream(sourceFile), namespaceAware);
- merge.add(configBody);
-
- } catch (FileNotFoundException e) {
- throw new MojoExecutionException("Could't read file "
- + sourceFile.getPath(), e);
- } catch (org.richfaces.cdk.xmlutils.ParsingException e) {
- throw new MojoExecutionException(
- "Error parsing config file "
- + sourceFile.getPath(), e);
- }
-
- }
- }
-
- if (sortBy != null) {
- merge.sort(new XPathComparator(sortBy));
- }
-
- try {
- callback.onMergeComplete(merge.getContent());
- } catch (Exception e) {
- throw new MojoExecutionException("Exception uring XML merge", e);
- }
- }
-
- public void setNamespaceAware(boolean namespaceAware) {
- this.namespaceAware = namespaceAware;
- }
-
- public void setLog(Log log) {
- this.log = log;
- }
-
- public void setXPath(String path) {
- xPath = path;
- }
-
- public void setKeyXPath(String keyXPath) {
- this.keyXPath = keyXPath;
- }
-}
Deleted: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/VelocityTaglibMergeCallBack.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/VelocityTaglibMergeCallBack.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/VelocityTaglibMergeCallBack.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,74 +0,0 @@
-/**
- * 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.builder.maven;
-
-import java.io.File;
-import java.io.FileWriter;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.codehaus.plexus.velocity.VelocityComponent;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class VelocityTaglibMergeCallBack implements XMLMergeCallback {
-
- private File target;
-
- private String template;
-
- private VelocityComponent velocity;
-
- private VelocityContext initialContext;
-
- /* (non-Javadoc)
- * @see org.richfaces.builder.maven.XMLMergeCallback#onMergeComplete(java.lang.String)
- */
- public void onMergeComplete(String mergedContent) throws Exception{
-
- VelocityContext velocityContext;
-
- if (initialContext != null) {
- velocityContext = new VelocityContext(initialContext);
- } else {
- velocityContext = new VelocityContext();
- }
-
- VelocityEngine velocityEngine = velocity.getEngine();
- Template template2 = velocityEngine.getTemplate(template);
-
- File parentFile = target.getParentFile();
- if (!parentFile.exists()) {
- parentFile.mkdirs();
- }
-
- FileWriter fileWriter = new FileWriter(target);
-
- template2.merge(velocityContext, fileWriter);
- fileWriter.flush();
- fileWriter.close();
- }
-
-}
Deleted: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/XMLMergeCallback.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/XMLMergeCallback.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/maven/XMLMergeCallback.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -1,31 +0,0 @@
-/**
- * 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.builder.maven;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public interface XMLMergeCallback {
- void onMergeComplete(String mergedContent) throws Exception;
-
-}
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -175,6 +175,11 @@
*/
protected Map<String, String> workers;
+ /**
+ * @parameter
+ */
+ protected Map<String, String> options;
+
/*
* (non-Javadoc)
*
@@ -264,7 +269,10 @@
}
context.addWorker(ModelValidator.class, validatorImpl);
}
-
+ if (null != options) {
+ // TODO make it type safe.
+ context.setOptions(options);
+ }
try {
// Build JSF library.
LibraryBuilder builder = LibraryBuilder.createInstance(context);
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java 2009-10-05 21:26:45 UTC (rev 15697)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/Renderkit.java 2009-10-06 00:28:31 UTC (rev 15698)
@@ -117,7 +117,6 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- // TODO Auto-generated method stub
return "render-kit id ["+_name+"], class ["+_classname+"], content :"+_content;
}
15 years, 5 months
- 1
- 0