Author: alexsmirnov
Date: 2009-02-18 18:47:10 -0500 (Wed, 18 Feb 2009)
New Revision: 12690
Added:
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/lib/
trunk/sandbox/ui/layout/
trunk/sandbox/ui/layout/pom.xml
trunk/sandbox/ui/layout/src/
trunk/sandbox/ui/layout/src/main/
trunk/sandbox/ui/layout/src/main/config/
trunk/sandbox/ui/layout/src/main/config/component/
trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml
trunk/sandbox/ui/layout/src/main/config/component/page.xml
trunk/sandbox/ui/layout/src/main/java/
trunk/sandbox/ui/layout/src/main/java/org/
trunk/sandbox/ui/layout/src/main/java/org/richfaces/
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
trunk/sandbox/ui/layout/src/main/resources/
trunk/sandbox/ui/layout/src/main/templates/
trunk/sandbox/ui/layout/src/main/templates/org/
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
trunk/sandbox/ui/layout/src/test/
trunk/sandbox/ui/layout/src/test/java/
trunk/sandbox/ui/layout/src/test/java/org/
trunk/sandbox/ui/layout/src/test/java/org/richfaces/
trunk/test-applications/realworld/upload.tgz
Removed:
trunk/DEADJOE
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java
trunk/samples/seamIntegration/pom.xml
trunk/samples/seamIntegration/profiles.xml
trunk/sandbox/ui/pom.xml
trunk/test-applications/ajaxTest/pom.xml
trunk/test-applications/ajaxTest/src/test/java/org/richfaces/RepeaterTest.java
trunk/test-applications/ajaxTest/src/test/resources/org/richfaces/logging.properties
Log:
https://jira.jboss.org/jira/browse/RF-6010 fixed.
Layout components project have been created in the sandbox
Fixed default viewroot locale in the jsf-test.
Deleted: trunk/DEADJOE
===================================================================
--- trunk/DEADJOE 2009-02-18 17:32:02 UTC (rev 12689)
+++ trunk/DEADJOE 2009-02-18 23:47:10 UTC (rev 12690)
@@ -1,16 +0,0 @@
-
-*** These modified files were found in JOE when it aborted on Wed Oct 31 15:45:33 2007
-*** JOE was aborted because the terminal closed
-
-*** File '(Unnamed)'
-/home/asmirnov/.bash_profile
-deployRelease.sh
-./ui/drag-drop/pom.xml
-./samples/ajaxPortlet/pom.xml
-./cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
-./framework/impl/pom.xml
-framework/impl/src/main/java/org/richfaces/VersionBean.java
-ui/paint2D/src/org/richfaces/renderkit/html/Paint2DResource.java
-ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java
-pom.xml
-/home/asmirnov/work/jboss-4.2.0.GA-src/build/output/jboss-4.2.0.GA/server/default/conf/jboss-log4j.xml
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2009-02-18
17:32:02 UTC (rev 12689)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -142,8 +142,7 @@
}
if (!found) {
- if (component instanceof AjaxChildrenEncoder
- && (!limitToList)) {
+ if (component instanceof AjaxChildrenEncoder) {
((AjaxChildrenEncoder) component).encodeAjaxChild(context,
currentPath, ids, renderedAreas);
} else {
Modified:
trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java
===================================================================
---
trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-02-18
17:32:02 UTC (rev 12689)
+++
trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -3,10 +3,13 @@
*/
package org.richfaces.test;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.EventListener;
+import java.util.Locale;
+import java.util.Properties;
import java.util.logging.LogManager;
import javax.faces.FactoryFinder;
@@ -19,6 +22,7 @@
import javax.faces.context.FacesContextFactory;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
+import javax.faces.render.RenderKitFactory;
import javax.faces.webapp.FacesServlet;
import javax.servlet.Filter;
@@ -212,9 +216,31 @@
/**
* This template method called from the {@link #setUp()} to populate virtual server
content.
- * The default implementation do nothing.
+ * The default implementation tries to load web content from directory pointed by the
System property
+ * "webroot" or same property from the "/webapp.properties" file.
*/
protected void setupWebContent() {
+ String webappDirectory = System.getProperty("webroot");
+ File webFile = null;
+ if (null == webappDirectory) {
+ URL resource =
this.getClass().getResource("/webapp.properties");
+ if (null != resource &&
"file".equals(resource.getProtocol())) {
+ Properties webProperties = new Properties();
+ try {
+ InputStream inputStream = resource.openStream();
+ webProperties.load(inputStream);
+ inputStream.close();
+ webFile = new File(resource.getPath());
+ webFile = new File(webFile.getParentFile(),
webProperties.getProperty("webroot")).getAbsoluteFile();
+ facesServer.addResourcesFromDirectory("/", webFile);
+ } catch (IOException e) {
+ throw new TestException(e);
+ }
+ }
+ } else {
+ webFile = new File(webappDirectory);
+ facesServer.addResourcesFromDirectory("/", webFile);
+ }
}
@@ -252,6 +278,8 @@
protected UIViewRoot setupView() {
UIViewRoot viewRoot = (UIViewRoot)
application.createComponent(UIViewRoot.COMPONENT_TYPE);
viewRoot.setViewId("/test.xhtml");
+ viewRoot.setLocale(Locale.getDefault());
+ viewRoot.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
return viewRoot;
}
Modified:
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java
===================================================================
---
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java 2009-02-18
17:32:02 UTC (rev 12689)
+++
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -473,11 +473,15 @@
if (!file.isDirectory()) {
file = file.getParentFile();
}
+ if(file.exists()){
try {
addFiles(baseDirectory, file);
} catch (MalformedURLException e) {
throw new TestException(e);
}
+ } else {
+ throw new TestException("Base webapp directory ["+file.getPath()+"]
does not exist");
+ }
}
/**
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2009-02-18 17:32:02 UTC (rev 12689)
+++ trunk/samples/seamIntegration/pom.xml 2009-02-18 23:47:10 UTC (rev 12690)
@@ -13,7 +13,7 @@
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
<properties>
- <seam.version>2.1.1-SNAPSHOT</seam.version>
+ <seam.version>2.1.2-SNAPSHOT</seam.version>
</properties>
<build>
<finalName>seamIntegration</finalName>
Modified: trunk/samples/seamIntegration/profiles.xml
===================================================================
--- trunk/samples/seamIntegration/profiles.xml 2009-02-18 17:32:02 UTC (rev 12689)
+++ trunk/samples/seamIntegration/profiles.xml 2009-02-18 23:47:10 UTC (rev 12690)
@@ -19,8 +19,14 @@
<profile>
<id>seam-devel</id>
<properties>
- <seam.version>2.1.0-SNAPSHOT</seam.version>
+ <seam.version>2.1.2-SNAPSHOT</seam.version>
</properties>
</profile>
+ <profile>
+ <id>seam-stable</id>
+ <properties>
+ <seam.version>2.1.1.GA</seam.version>
+ </properties>
+ </profile>
</profiles>
</profilesXml>
\ No newline at end of file
Added: trunk/sandbox/ui/layout/pom.xml
===================================================================
--- trunk/sandbox/ui/layout/pom.xml (rev 0)
+++ trunk/sandbox/ui/layout/pom.xml 2009-02-18 23:47:10 UTC (rev 12690)
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces.sandbox</groupId>
+ <version>3.3.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>layout</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ <name>layout</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>generate-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <shortName>layout</shortName>
+ </taglib>
+ </library>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Property changes on: trunk/sandbox/ui/layout/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml
===================================================================
--- trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml
(rev 0)
+++ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-18 23:47:10
UTC (rev 12690)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"
"http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <component>
+ <name>org.richfaces.LayoutPanel</name>
+ <family>org.richfaces.LayoutPanel</family>
+ <classname>org.richfaces.component.html.HtmlLayoutPanel</classname>
+ <superclass>org.richfaces.component.UILayoutPanel</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.LayoutPanelRenderer</name>
+ <template>org/richfaces/htmlLayoutPanel.jspx</template>
+ </renderer>
+ <tag>
+ <name>layoutPanel</name>
+ <classname>org.richfaces.taglib.LayoutPanelTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ </component>
+</components>
Property changes on: trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/config/component/page.xml
===================================================================
--- trunk/sandbox/ui/layout/src/main/config/component/page.xml
(rev 0)
+++ trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-18 23:47:10 UTC
(rev 12690)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN"
"http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <component>
+ <name>org.richfaces.Page</name>
+ <family>org.richfaces.Page</family>
+ <classname>org.richfaces.component.html.HtmlPage</classname>
+ <superclass>org.richfaces.component.UIPage</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.PageRenderer</name>
+ <template>org/richfaces/htmlPage.jspx</template>
+ </renderer>
+ <tag>
+ <name>page</name>
+ <classname>org.richfaces.taglib.PageTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ &ajax_region_attributes;
+ &html_universal_attributes;
+ <property hidden="true" existintag="true">
+ <name>renderRegionOnly</name>
+ <classname>boolean</classname>
+ <description>
+ Flag to disable rendering in AJAX responses content
+ outside of active region. If this attribute set to
+ "true" , no one of the components outside of region will
+ be included to AJAX response. If set to "false", search
+ for components to include in response will be performed
+ on all tree. Default value is "true".
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>pageTitle</name>
+ <classname>java.lang.String</classname>
+ <description>
+ String for output as a page title.
+ </description>
+ </property>
+ <property>
+ <name>onload</name>
+ <classname>java.lang.String</classname>
+ <description>
+ JavaScript code to execute on a page load.
+ </description>
+ </property>
+ <property>
+ <name>onunload</name>
+ <classname>java.lang.String</classname>
+ <description>
+ JavaScript code to execute on a page unload.
+ </description>
+ </property>
+ <property>
+ <name>format</name>
+ <classname>java.lang.String</classname>
+ <description>
+ <![CDATA[Page layout format ( html, xhtml, html-transitional, html-3.2 ) for
encoding DOCTYPE, namespace and Content-Type definitions]]>
+ </description>
+ </property>
+ <property>
+ <name>contentType</name>
+ <classname>java.lang.String</classname>
+ <description>
+ <![CDATA[Set custom mime content type to response]]>
+ </description>
+ </property>
+ <property>
+ <name>namespace</name>
+ <classname>java.lang.String</classname>
+ <description>
+ <![CDATA[Set html element default namespace]]>
+ </description>
+ </property>
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ </component>
+</components>
Property changes on: trunk/sandbox/ui/layout/src/main/config/component/page.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
(rev 0)
+++
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+
+package org.richfaces.component;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UILayoutPanel extends UIComponentBase {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.LayoutPanel";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.LayoutPanel";
+
+}
Property changes on:
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
(rev 0)
+++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+
+package org.richfaces.component;
+
+import javax.faces.component.UIComponentBase;
+
+import org.ajax4jsf.component.UIAjaxRegion;
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UIPage extends UIAjaxRegion {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.Page";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Page";
+
+
+
+}
Property changes on:
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
===================================================================
---
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
(rev 0)
+++
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -0,0 +1,43 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.html;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.renderkit.html.AjaxPageRenderer;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class HtmlPageRenderer extends AjaxPageRenderer {
+
+
+ @Override
+ public void doEncodeBegin(ResponseWriter out, FacesContext context,
+ UIComponent component) throws IOException {
+ // generate page lead with header, up to body tag.
+ super.doEncodeBegin(out, context, component);
+ // header facet.
+ // start content body.
+ // menu facet.
+ // content placeholder.
+ }
+
+
+ @Override
+ public void doEncodeEnd(ResponseWriter out, FacesContext context,
+ UIComponent component) throws IOException {
+ // close content .
+ // footer facet.
+ // Close page body.
+ // generate page trailer closing tags.
+ super.doEncodeEnd(out, context, component);
+ }
+
+}
Property changes on:
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx
===================================================================
--- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx
(rev 0)
+++
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-18
23:47:10 UTC (rev 12690)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+
xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c="
http://java.sun.com/jsf/core"
+ xmlns:ui="
http://ajax4jsf.org/cdk/ui"
+ xmlns:u="
http://ajax4jsf.org/cdk/u"
+ xmlns:x="
http://ajax4jsf.org/cdk/x"
+ class="org.richfaces.renderkit.html.LayoutPanelRenderer"
+ baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase"
+ component="org.richfaces.component.UILayoutPanel"
+ >
+ <f:clientid var="clientId"/>
+ <div id="#{clientId}"
+ x:passThruWithExclusions="value,name,type,id"
+ >
+ </div>
+</f:root>
\ No newline at end of file
Property changes on:
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
===================================================================
--- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
(rev 0)
+++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-18
23:47:10 UTC (rev 12690)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+
xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c="
http://java.sun.com/jsf/core"
+ xmlns:ui="
http://ajax4jsf.org/cdk/ui"
+ xmlns:u="
http://ajax4jsf.org/cdk/u"
+ xmlns:x="
http://ajax4jsf.org/cdk/x"
+ class="org.richfaces.renderkit.html.PageRenderer"
+ baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase"
+ component="org.richfaces.component.UIPage"
+ >
+ <f:clientid var="clientId"/>
+ <div id="#{clientId}"
+ x:passThruWithExclusions="value,name,type,id"
+ >
+ </div>
+</f:root>
\ No newline at end of file
Property changes on:
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2009-02-18 17:32:02 UTC (rev 12689)
+++ trunk/sandbox/ui/pom.xml 2009-02-18 23:47:10 UTC (rev 12690)
@@ -19,5 +19,6 @@
<!--module>rex-button</module-->
<module>sortableHeader</module>
<module>colorPicker</module>
+ <module>layout</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/test-applications/ajaxTest/pom.xml
===================================================================
--- trunk/test-applications/ajaxTest/pom.xml 2009-02-18 17:32:02 UTC (rev 12689)
+++ trunk/test-applications/ajaxTest/pom.xml 2009-02-18 23:47:10 UTC (rev 12690)
@@ -43,7 +43,7 @@
<configuration>
<systemProperties>
<property>
- <name>webapp</name>
+ <name>webroot</name>
<value>${basedir}/src/main/webapp</value>
</property>
</systemProperties>
@@ -94,12 +94,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_11</version>
+ <version>1.2_12</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_11</version>
+ <version>1.2_12</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/test-applications/ajaxTest/src/test/java/org/richfaces/RepeaterTest.java
===================================================================
---
trunk/test-applications/ajaxTest/src/test/java/org/richfaces/RepeaterTest.java 2009-02-18
17:32:02 UTC (rev 12689)
+++
trunk/test-applications/ajaxTest/src/test/java/org/richfaces/RepeaterTest.java 2009-02-18
23:47:10 UTC (rev 12690)
@@ -25,12 +25,7 @@
@Override
protected void setupWebContent() {
- String webappDirectory = System.getProperty("webapp");
- if (null == webappDirectory) {
- throw new TestException("The 'webapp' system property does not
set");
- }
- File webFile = new File(webappDirectory);
- facesServer.addResourcesFromDirectory("/", webFile);
+ super.setupWebContent();
facesServer.addResource("/WEB-INF/faces-config.xml",
"test-faces-config.xml");
}
Modified:
trunk/test-applications/ajaxTest/src/test/resources/org/richfaces/logging.properties
===================================================================
---
trunk/test-applications/ajaxTest/src/test/resources/org/richfaces/logging.properties 2009-02-18
17:32:02 UTC (rev 12689)
+++
trunk/test-applications/ajaxTest/src/test/resources/org/richfaces/logging.properties 2009-02-18
23:47:10 UTC (rev 12690)
@@ -11,5 +11,5 @@
org.ajax4jsf.level=INFO
javax.enterprise.resource.webcontainer.jsf.level=INFO
com.gargoylesoftware.htmlunit.level=INFO
-org.richfaces.level=INFO
+org.richfaces.test.level=ALL
\ No newline at end of file
Added: trunk/test-applications/realworld/upload.tgz
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/upload.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream