Author: nbelaevski Date: 2009-11-05 15:37:23 -0500 (Thu, 05 Nov 2009) New Revision: 15844 Modified: root/cdk/trunk/plugins/annotations/pom.xml root/cdk/trunk/plugins/generator/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml root/examples-sandbox/trunk/backwardCompatibility/pom.xml root/examples-sandbox/trunk/components/ajax/pom.xml root/examples-sandbox/trunk/pom.xml root/examples/trunk/components/repeater-demo/pom.xml root/examples/trunk/pom.xml root/framework/trunk/impl/pom.xml root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/BaseCacheTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/LRUMapCacheTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/codec/CodecTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FacesConfigTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FrameworkConfigurationTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/MockServletContext.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebXMLTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebappHandlerTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/context/InitParametersTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/io/Test.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/javascript/JSMinTest.java root/framework/trunk/impl/src/test/java/org/ajax4jsf/renderkit/RendererUtilsTest.java root/framework/trunk/impl/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java root/framework/trunk/impl/src/test/java/org/richfaces/component/nsutils/NSUtilsTest.java root/framework/trunk/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java root/framework/trunk/impl/src/test/java/org/richfaces/json/SerializationTest.java root/framework/trunk/impl/src/test/java/org/richfaces/json/Test.java root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateEncoderRendererBaseTest.java root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractCacheableResourceTest.java root/framework/trunk/impl/src/test/java/org/richfaces/resource/CacheableResourceImpl.java root/framework/trunk/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java root/framework/trunk/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java root/framework/trunk/impl/src/test/java/org/richfaces/skin/SkinTestCase.java root/framework/trunk/legacy-tests/pom.xml root/framework/trunk/pom.xml root/framework/trunk/version-matrix/pom.xml root/ui-sandbox/trunk/pom.xml root/ui/trunk/components/core/pom.xml root/ui/trunk/components/pom.xml root/ui/trunk/pom.xml root/ui/trunk/version-matrix/pom.xml Log: Environment update: - JSF 2.0.1 -> 2.0.2 - EasyMock 2.5 -> 2.5.2 - richfaces-test-base -> org.jboss.test-jsf.* Modified: root/cdk/trunk/plugins/annotations/pom.xml =================================================================== --- root/cdk/trunk/plugins/annotations/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/cdk/trunk/plugins/annotations/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,7 +28,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/cdk/trunk/plugins/generator/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -125,7 +125,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> @@ -163,7 +163,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>com.google.collections</groupId> Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -40,7 +40,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: root/examples/trunk/components/repeater-demo/pom.xml =================================================================== --- root/examples/trunk/components/repeater-demo/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/examples/trunk/components/repeater-demo/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -32,7 +32,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>mojarra-jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: root/examples/trunk/pom.xml =================================================================== --- root/examples/trunk/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/examples/trunk/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -52,13 +52,13 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <!--scope>provided</scope--> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <!--scope>provided</scope--> </dependency> <dependency> @@ -110,13 +110,13 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: root/examples-sandbox/trunk/backwardCompatibility/pom.xml =================================================================== --- root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/examples-sandbox/trunk/backwardCompatibility/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -121,13 +121,13 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: root/examples-sandbox/trunk/components/ajax/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/ajax/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/examples-sandbox/trunk/components/ajax/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -65,12 +65,12 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> Modified: root/examples-sandbox/trunk/pom.xml =================================================================== --- root/examples-sandbox/trunk/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/examples-sandbox/trunk/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -52,13 +52,13 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <!--scope>provided</scope--> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> <!--scope>provided</scope--> </dependency> <dependency> Modified: root/framework/trunk/impl/pom.xml =================================================================== --- root/framework/trunk/impl/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -128,10 +128,16 @@ <artifactId>richfaces-api</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>richfaces-test-base</artifactId> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>opensymphony</groupId> <artifactId>oscache</artifactId> <optional>true</optional> Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/BaseCacheTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/BaseCacheTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/BaseCacheTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -26,7 +26,7 @@ import java.util.Date; import java.util.Map; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; /** * @author Nick Belaevski Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/LRUMapCacheTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/LRUMapCacheTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/LRUMapCacheTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -27,10 +27,9 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; +import org.ajax4jsf.cache.lru.CacheEntry; import org.ajax4jsf.cache.lru.CacheMap; import org.ajax4jsf.cache.lru.LRUMapCache; -import org.ajax4jsf.cache.lru.CacheEntry; - import org.junit.Assert; import org.junit.Test; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/codec/CodecTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/codec/CodecTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/codec/CodecTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -24,9 +24,9 @@ package org.ajax4jsf.codec; import org.ajax4jsf.util.base64.Codec; +import org.jboss.test.faces.AbstractThreadedTest; +import org.jboss.test.faces.AbstractThreadedTest.TestCaseRunnable; -import org.richfaces.test.AbstractThreadedTest; - public class CodecTest extends AbstractThreadedTest { Codec c; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FacesConfigTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FacesConfigTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FacesConfigTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -25,14 +25,11 @@ import java.io.IOException; import java.io.InputStream; - import java.net.URL; - import java.util.Enumeration; import java.util.Vector; import javax.faces.webapp.FacesServlet; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FrameworkConfigurationTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FrameworkConfigurationTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/FrameworkConfigurationTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -6,9 +6,8 @@ import javax.faces.context.ExternalContext; import org.ajax4jsf.config.FrameworkConfiguration.InitParam; +import org.jboss.test.faces.AbstractFacesTest; -import org.richfaces.test.AbstractFacesTest; - /** * @author Anton Belevich * Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/MockServletContext.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/MockServletContext.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/MockServletContext.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -24,10 +24,8 @@ package org.ajax4jsf.config; import java.io.InputStream; - import java.net.MalformedURLException; import java.net.URL; - import java.util.Enumeration; import java.util.Set; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebXMLTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebXMLTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebXMLTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -24,7 +24,6 @@ package org.ajax4jsf.config; import java.io.InputStream; - import java.util.List; import junit.framework.TestCase; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebappHandlerTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebappHandlerTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/config/WebappHandlerTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,7 +28,6 @@ import junit.framework.TestCase; import org.ajax4jsf.config.WebappHandler.ServletMappingHandler; - import org.xml.sax.ContentHandler; /** Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/context/InitParametersTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/context/InitParametersTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/context/InitParametersTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -6,7 +6,7 @@ import javax.faces.FacesException; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; /** * @author asmirnov Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/io/Test.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/io/Test.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/io/Test.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -23,14 +23,14 @@ package org.ajax4jsf.io; -import org.junit.Ignore; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; +import org.junit.Ignore; + @Ignore public final class Test { private static final int ARRAY_LENGTH = 27; Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/javascript/JSMinTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/javascript/JSMinTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/javascript/JSMinTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -26,12 +26,12 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import junit.framework.TestCase; + import org.ajax4jsf.javascript.JSMin.UnterminatedCommentException; import org.ajax4jsf.javascript.JSMin.UnterminatedRegExpLiteralException; import org.ajax4jsf.javascript.JSMin.UnterminatedStringLiteralException; -import junit.framework.TestCase; - /** * @author asmirnov * Modified: root/framework/trunk/impl/src/test/java/org/ajax4jsf/renderkit/RendererUtilsTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/ajax4jsf/renderkit/RendererUtilsTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/ajax4jsf/renderkit/RendererUtilsTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -29,11 +29,11 @@ import java.util.List; import java.util.Map; +import junit.framework.TestCase; + import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.renderkit.RendererUtils.ScriptHashVariableWrapper; -import junit.framework.TestCase; - /** * @author Nick Belaevski * @since 3.3.2 Modified: root/framework/trunk/impl/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/component/UIRangedNumberInputTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -23,7 +23,7 @@ package org.richfaces.component; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; public class UIRangedNumberInputTest extends AbstractFacesTest { private UIRangedNumberInput input; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/component/nsutils/NSUtilsTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/component/nsutils/NSUtilsTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/component/nsutils/NSUtilsTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,7 +28,7 @@ import javax.faces.component.UIInput; import javax.faces.context.ResponseWriter; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; public class NSUtilsTest extends AbstractFacesTest { public void setUp() throws Exception { Modified: root/framework/trunk/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,8 +28,8 @@ import javax.faces.component.UIOutput; import javax.faces.component.UIViewRoot; +import org.jboss.test.faces.AbstractFacesTest; import org.richfaces.component.EnclosingFormRequiredException; -import org.richfaces.test.AbstractFacesTest; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -26,7 +26,6 @@ import static org.junit.Assert.fail; import java.net.URL; - import java.util.Iterator; import org.junit.After; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/json/SerializationTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/json/SerializationTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/json/SerializationTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,7 +28,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import java.util.Iterator; import junit.framework.TestCase; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/json/Test.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/json/Test.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/json/Test.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -23,14 +23,13 @@ package org.richfaces.json; -import junit.framework.TestCase; - import java.io.StringWriter; - import java.util.Collection; import java.util.Iterator; import java.util.Map; +import junit.framework.TestCase; + import org.junit.Ignore; /** Modified: root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -2,7 +2,6 @@ import java.io.IOException; import java.io.StringWriter; - import java.util.Arrays; import java.util.Map; @@ -13,7 +12,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; public class CompositeRendererTest extends AbstractFacesTest { private CompositeRenderer compositeRenderer; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateEncoderRendererBaseTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateEncoderRendererBaseTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateEncoderRendererBaseTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -30,7 +30,7 @@ import javax.faces.component.html.HtmlPanelGroup; import javax.faces.context.ResponseWriter; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; /** * Created 26.10.2007 Modified: root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -24,7 +24,6 @@ package org.richfaces.renderkit; import java.io.StringReader; - import java.util.List; import junit.framework.TestCase; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractBaseResourceTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -25,10 +25,8 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; - import java.net.URL; import java.net.URLConnection; - import java.util.Calendar; import java.util.Collections; import java.util.Date; @@ -39,8 +37,7 @@ import javax.faces.context.FacesContext; import org.easymock.EasyMock; - -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; import org.richfaces.util.Util; /** Modified: root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractCacheableResourceTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractCacheableResourceTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/resource/AbstractCacheableResourceTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -25,11 +25,8 @@ import java.io.IOException; import java.io.InputStream; - import java.net.URL; - import java.text.SimpleDateFormat; - import java.util.Collections; import java.util.Date; import java.util.Locale; @@ -40,9 +37,8 @@ import org.easymock.IAnswer; import org.easymock.classextension.EasyMock; +import org.jboss.test.faces.AbstractFacesTest; -import org.richfaces.test.AbstractFacesTest; - /** * @author Nick Belaevski * @since 4.0 Modified: root/framework/trunk/impl/src/test/java/org/richfaces/resource/CacheableResourceImpl.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/resource/CacheableResourceImpl.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/resource/CacheableResourceImpl.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -26,7 +26,6 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; - import java.util.Date; import java.util.Map; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -28,9 +28,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; - import java.net.URL; - import java.util.Arrays; import java.util.Calendar; import java.util.Collections; @@ -43,7 +41,7 @@ import javax.faces.application.Resource; import javax.faces.context.FacesContext; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; /** * @author Nick Belaevski Modified: root/framework/trunk/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/resource/ResourceHandlerImplTest.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -24,21 +24,17 @@ package org.richfaces.resource; import java.io.File; - import java.net.URL; - import java.util.Calendar; import java.util.Date; import java.util.TimeZone; import javax.faces.application.ResourceHandler; - import javax.servlet.http.HttpServletResponse; import org.easymock.classextension.EasyMock; - -import org.richfaces.test.AbstractFacesTest; -import org.richfaces.test.LocalWebClient; +import org.jboss.test.faces.AbstractFacesTest; +import org.jboss.test.faces.htmlunit.LocalWebClient; import org.richfaces.util.Util; import com.gargoylesoftware.htmlunit.WebRequestSettings; Modified: root/framework/trunk/impl/src/test/java/org/richfaces/skin/SkinTestCase.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/skin/SkinTestCase.java 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/impl/src/test/java/org/richfaces/skin/SkinTestCase.java 2009-11-05 20:37:23 UTC (rev 15844) @@ -26,13 +26,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Method; - import java.util.HashMap; import java.util.Map; import javax.faces.FacesException; -import org.richfaces.test.AbstractFacesTest; +import org.jboss.test.faces.AbstractFacesTest; /** * Test for Skin/skin factory methods. Modified: root/framework/trunk/legacy-tests/pom.xml =================================================================== --- root/framework/trunk/legacy-tests/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/legacy-tests/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -47,7 +47,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.htmlunit</groupId> Modified: root/framework/trunk/pom.xml =================================================================== --- root/framework/trunk/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -30,11 +30,15 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <version>${project.version}</version> - <scope>test</scope> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement> Modified: root/framework/trunk/version-matrix/pom.xml =================================================================== --- root/framework/trunk/version-matrix/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/framework/trunk/version-matrix/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -161,12 +161,12 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> @@ -254,7 +254,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>2.5</version> + <version>2.5.2</version> </dependency> <dependency> <groupId>org.easymock</groupId> Modified: root/ui/trunk/components/core/pom.xml =================================================================== --- root/ui/trunk/components/core/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/ui/trunk/components/core/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -39,12 +39,17 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> <scope>test</scope> Modified: root/ui/trunk/components/pom.xml =================================================================== --- root/ui/trunk/components/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/ui/trunk/components/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -21,12 +21,16 @@ <artifactId>richfaces-api</artifactId> <version>${framework.version}</version> </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <version>${framework.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> </dependencies--> <modules> <module>core</module> Modified: root/ui/trunk/pom.xml =================================================================== --- root/ui/trunk/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/ui/trunk/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -77,10 +77,15 @@ <artifactId>richfaces-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <scope> test </scope> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> </dependencies> <modules> Modified: root/ui/trunk/version-matrix/pom.xml =================================================================== --- root/ui/trunk/version-matrix/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/ui/trunk/version-matrix/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -94,12 +94,17 @@ <artifactId>richfaces-impl</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.4</version> @@ -107,12 +112,12 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.2-SNAPSHOT</version> </dependency> <!-- Dependencies of JSF 2.0 --> Modified: root/ui-sandbox/trunk/pom.xml =================================================================== --- root/ui-sandbox/trunk/pom.xml 2009-11-05 17:06:52 UTC (rev 15843) +++ root/ui-sandbox/trunk/pom.xml 2009-11-05 20:37:23 UTC (rev 15844) @@ -75,15 +75,20 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-test-base</artifactId> - <scope> test </scope> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> </dependencies> <modules> - <module>components</module> + <module>components</module> </modules> </project> \ No newline at end of file