Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[JSFUNIT-300] Update to arquillian 1.0.0.Final

  • Loading branch information...
commit ffc0d517019ab5c96500c7553b8fc8d8b7c6a15a 1 parent 5a9c51f
@joserodolfofreitas joserodolfofreitas authored ALRubinger committed
View
27 examples-arquillian/hellojsf/pom.xml
@@ -1,4 +1,3 @@
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -30,13 +29,13 @@
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-spi</artifactId>
@@ -60,28 +59,28 @@
<artifactId>jboss-jsfunit-core</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.jsfunit</groupId>
<artifactId>jsfunit-arquillian</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
</dependency>
-
+
<!--
<dependency>
<groupId>org.slf4j</groupId>
@@ -90,7 +89,7 @@
</dependency>
-->
</dependencies>
-
+
<profiles>
<profile>
<id>jbossas-embedded-6</id>
@@ -144,7 +143,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>jetty-embedded</id>
<build>
@@ -158,7 +157,7 @@
<name>jetty-embedded</name>
<value>active</value>
</property>
- </systemProperties>
+ </systemProperties>
<excludes>
<exclude>**/FormAuthenticationTest.java</exclude>
</excludes>
@@ -185,7 +184,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>tomcatx</id>
<build>
@@ -208,6 +207,6 @@
</plugins>
</build>
</profile>
-
+
</profiles>
</project>
View
57 examples-arquillian/hellojsf/src/test/java/org/jboss/jsfunit/example/hellojsf/Deployments.java
@@ -10,7 +10,7 @@
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -23,16 +23,13 @@
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.AuthMethodType;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.jboss.shrinkwrap.descriptor.spi.Node;
-import org.jboss.shrinkwrap.descriptor.spi.NodeProvider;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
/**
* Deployments
- *
+ *
* @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
@@ -86,7 +83,7 @@ private static WebArchive createBaseDeployment() {
private static void appendForEmbedded(WebArchive war) {
if (IS_JETTY || IS_TOMCAT) {
war.addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
- .loadDependenciesFromPom("src/test/resources-tomcat/pom.xml")
+ .loadMetadataFromPom("src/test/resources-tomcat/pom.xml")
.artifacts("javax.annotation:jsr250-api:1.0", "javax.servlet:jstl:1.2").resolveAsFiles());
// "com.sun.faces:jsf-api:2.0.4-b03", "com.sun.faces:jsf-impl:2.0.4-b03",
@@ -100,17 +97,15 @@ private static void appendForEmbedded(WebArchive war) {
public static WebAppDescriptor createCDIWebXML() {
WebAppDescriptor desc = Descriptors.create(WebAppDescriptor.class);
- if (IS_JETTY || IS_TOMCAT) {
- if (IS_TOMCAT) // jetty is added by default. It finds weld-servlet on appCl and insists on loading it.
- {
- desc.listener("org.jboss.weld.environment.servlet.Listener");
- }
-
- Node rootNode = ((NodeProvider) desc).getRootNode();
-
- rootNode.getOrCreate("/web-app/resource-env-ref").createChild("resource-env-ref-name").text("BeanManager")
- .getParent().createChild("resource-env-ref-type").text("javax.enterprise.inject.spi.BeanManager");
- }
+ /*
+ * if (IS_JETTY || IS_TOMCAT) { if (IS_TOMCAT) // jetty is added by default. It finds weld-servlet on appCl and insists
+ * on loading it. { desc.createListener("org.jboss.weld.environment.servlet.Listener"); }
+ *
+ * // Node rootNode = ((Node) desc).getRootNode();
+ *
+ * // rootNode.getOrCreate("/web-app/resource-env-ref").createChild("resource-env-ref-name").text("BeanManager") //
+ * .getParent().createChild("resource-env-ref-type").text("javax.enterprise.inject.spi.BeanManager"); }
+ */
appendBaseWebXML(desc);
return desc;
}
@@ -125,10 +120,26 @@ public static WebAppDescriptor createWebXML() {
private static void appendBaseWebXML(WebAppDescriptor desc) {
desc.displayName("JSFUnit Arquillian TestCase")
- .contextParam("javax.faces.CONFIG_FILES", "/WEB-INF/local-module-faces-config.xml").welcomeFile("index.html")
- .servlet("javax.faces.webapp.FacesServlet", "*.faces").loadOnStartup(1);
-
- if (!(IS_JETTY || IS_TOMCAT)) {
+ .createContextParam()
+ .paramName("javax.faces.CONFIG_FILES")
+ .paramValue("/WEB-INF/local-module-faces-config.xml").up()
+ .createWelcomeFileList()
+ .welcomeFile("index.xhtml").up()
+ .createServlet()
+ .servletClass("javax.faces.webapp.FacesServlet")
+ .servletName("FacesServlet")
+ .loadOnStartup(1).up()
+ .createServletMapping()
+ .servletName("FacesServlet")
+ .urlPattern("*.faces").up()
+ /*.createFilter().filterName("JSFUnitCleanupTestTreadFilter").filterClass("org.jboss.jsfunit.arquillian.container.JSFUnitCleanupTestTreadFilter").up()
+ .createFilter().filterName("JSFUnitFilter").filterClass("org.jboss.jsfunit.framework.JSFUnitFilter").up()
+ .createFilterMapping().filterName("JSFUnitCleanupTestTreadFilter").urlPattern("/*").up().createFilterMapping()
+ .filterName("JSFUnitFilter").urlPattern("/*").up()*/
+ ;
+
+
+ /*if (!(IS_JETTY || IS_TOMCAT)) {
// SHRINKDESC-48 desc.securityConstraint("Basic Authentication for the Admin")
desc.securityConstraint().webResourceCollection("Authenticated").urlPatterns("/secured-page.faces")
.authConstraint("hellotestadmin").loginConfig(AuthMethodType.BASIC, "Authenticated")
@@ -140,6 +151,6 @@ private static void appendBaseWebXML(WebAppDescriptor desc) {
}
if (IS_TOMCAT || IS_JBOSS_51) {
desc.version("2.5");
- }
+ }*/
}
}
View
72 examples-arquillian/hellojsf/src/test/java/org/jboss/jsfunit/example/hellojsf/FacadeAPITest.java
@@ -36,7 +36,9 @@
import junit.framework.Assert;
import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.spi.TestEnricher;
import org.jboss.jsfunit.api.Browser;
import org.jboss.jsfunit.api.BrowserVersion;
import org.jboss.jsfunit.api.Cookies;
@@ -44,6 +46,9 @@
import org.jboss.jsfunit.api.InitialRequest;
import org.jboss.jsfunit.api.JSFUnitResource;
import org.jboss.jsfunit.api.Proxy;
+import org.jboss.jsfunit.arquillian.container.JSFUnitCleanupTestTreadFilter;
+import org.jboss.jsfunit.arquillian.container.JSFUnitRemoteExtension;
+import org.jboss.jsfunit.arquillian.container.JSFUnitTestEnricher;
import org.jboss.jsfunit.jsfsession.ComponentIDNotFoundException;
import org.jboss.jsfunit.jsfsession.JSFClientSession;
import org.jboss.jsfunit.jsfsession.JSFServerSession;
@@ -71,7 +76,72 @@
@Deployment
public static WebArchive createDeployment() {
- return Deployments.createDeployment();
+ WebArchive war = Deployments.createDeployment();
+ war.addClass(JSFUnitCleanupTestTreadFilter.class)
+ .addPackages(
+ true,
+ org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext.class.getPackage(),
+ org.jboss.arquillian.protocol.servlet.Processor.class.getPackage(),
+ org.jboss.jsfunit.jsfsession.JSFSession.class.getPackage(),
+ org.jboss.jsfunit.framework.WebClientSpec.class.getPackage(),
+ org.jboss.jsfunit.context.JSFUnitFacesContext.class.getPackage(),
+ org.jboss.jsfunit.seam.SeamUtil.class.getPackage(),
+ org.jboss.jsfunit.api.JSFUnitResource.class.getPackage(), // Arquillian JSFunit API
+ org.jboss.jsfunit.arquillian.container.JSFUnitTestEnricher.class.getPackage(), // Support package for
+ // incontainer enrichment
+ org.apache.http.HttpEntity.class.getPackage(), // HTTPClient
+ org.apache.james.mime4j.MimeException.class.getPackage(), // Apache Mime4j, used by HTTP client
+ com.gargoylesoftware.htmlunit.BrowserVersion.class.getPackage(),
+ org.apache.commons.codec.Decoder.class.getPackage(), org.apache.commons.io.IOUtils.class.getPackage(),
+ org.apache.commons.lang.StringUtils.class.getPackage(),
+ net.sourceforge.htmlunit.corejs.javascript.EvaluatorException.class.getPackage(),
+ org.w3c.css.sac.CSSException.class.getPackage(),
+ com.steadystate.css.dom.CSSOMObject.class.getPackage(),
+ com.steadystate.css.parser.CSSOMParser.class.getPackage(),
+ com.steadystate.css.sac.TestCSSParseException.class.getPackage(),
+ com.steadystate.css.userdata.UserDataConstants.class.getPackage(),
+
+ org.apache.commons.logging.LogFactory.class.getPackage(),
+ org.apache.xerces.xni.XNIException.class.getPackage(),
+ org.apache.commons.collections.Transformer.class.getPackage(),
+ org.apache.xerces.dom.AttrImpl.class.getPackage(), org.apache.xerces.impl.Constants.class.getPackage(),
+ org.apache.xerces.jaxp.DocumentBuilderFactoryImpl.class.getPackage(),
+ org.apache.xerces.parsers.AbstractDOMParser.class.getPackage(),
+ org.apache.xerces.util.AttributesProxy.class.getPackage(),
+ org.apache.xerces.xinclude.MultipleScopeNamespaceSupport.class.getPackage(),
+ org.apache.xerces.xpointer.XPointerHandler.class.getPackage(),
+ org.apache.xerces.xs.AttributePSVI.class.getPackage(),
+
+ org.apache.xml.dtm.Axis.class.getPackage(), org.apache.xml.res.XMLErrorResources.class.getPackage(),
+ org.apache.xml.utils.AttList.class.getPackage(), org.apache.xpath.XPath.class.getPackage(),
+ org.apache.xalan.Version.class.getPackage(),
+
+ org.cyberneko.html.HTMLComponent.class.getPackage(), org.cyberneko.html.HTMLEntities.class.getPackage())
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/FF2.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/FF3.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/FF3.6.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/IE6.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/IE7.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/IE8.properties")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.xml")
+ .addAsResource("com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.xsd")
+ .addAsResource("net/sourceforge/htmlunit/corejs/javascript/resources/Messages.properties")
+ .addAsResource("net/sourceforge/htmlunit/corejs/javascript/resources/Messages_fr.properties")
+ .addAsResource("org/cyberneko/html/res/HTMLlat1.properties")
+ .addAsResource("org/cyberneko/html/res/HTMLspecial.properties")
+ .addAsResource("org/cyberneko/html/res/HTMLsymbol.properties")
+ .addAsResource("org/cyberneko/html/res/XMLbuiltin.properties")
+ .addAsResource("com/steadystate/css/parser/SACParserMessages.properties")
+ .addAsResource("com/steadystate/css/parser/SACParserMessages_en.properties")
+ .addAsResource("com/steadystate/css/parser/SACParserMessages_de.properties")
+ /**
+ * TODO use faces-config and web-fragment from jsfunit jar. for now it's not possible because shrinkwrap could
+ * get a different META-INF/faces-config .addAsManifestResource(this.jsfunitFacesConfigXml(),
+ * "faces-config.xml")
+ */
+ .addAsServiceProvider(TestEnricher.class, JSFUnitTestEnricher.class)
+ .addAsServiceProvider(RemoteLoadableExtension.class, JSFUnitRemoteExtension.class);
+ return war;
}
View
6 examples-arquillian/hellojsf/src/test/resources-jboss7/arquillian.xml
@@ -2,10 +2,8 @@
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian-1.0.xsd">
- <engine>
+ <defaultProtocol type="Servlet 3.0" />
+ <engine>
<property name="deploymentExportPath">target/</property>
</engine>
-
- <defaultProtocol type="Servlet 3.0" />
-
</arquillian>
View
51 examples-arquillian/pom.xml
@@ -13,17 +13,16 @@
<name>examples-arquillian</name>
<properties>
- <arquillian.core.version>1.0.0.CR4</arquillian.core.version>
+ <arquillian.bom.version>1.0.0.Final</arquillian.bom.version>
<arquillian.jboss.version>1.0.0.CR2</arquillian.jboss.version>
<arquillian.tomcat.version>1.0.0.CR1</arquillian.tomcat.version>
<arquillian.jetty.version>1.0.0.CR1</arquillian.jetty.version>
<arquillian.glassfish.version>1.0.0.CR1</arquillian.glassfish.version>
<glassfish.vesion>3.1</glassfish.vesion>
- <shrinkwrap.maven.version>1.0.0-beta-5</shrinkwrap.maven.version>
-
+
<version.jboss_60>6.0.0.Final</version.jboss_60>
<version.jboss_51>5.1.0.GA</version.jboss_51>
- <version.jboss_701>7.0.1.Final</version.jboss_701>
+ <version.jboss_711>7.1.1.Final</version.jboss_711>
</properties>
<modules>
@@ -39,11 +38,13 @@
<version>4.8.1</version>
</dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${arquillian.core.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${arquillian.bom.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -51,33 +52,21 @@
<version>${version.jboss_60}</version>
<type>pom</type>
</dependency>
-
+
<dependency>
<groupId>org.jboss.jsfunit</groupId>
<artifactId>jsfunit-arquillian</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<!--<version>1.6.1</version>-->
<version>1.5.10</version>
</dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>${shrinkwrap.maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>${shrinkwrap.maven.version}</version>
- </dependency>
-
+
</dependencies>
-
-
</dependencyManagement>
<profiles>
@@ -132,7 +121,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
- <version>${version.jboss_701}</version>
+ <version>${version.jboss_711}</version>
</dependency>
</dependencies>
</profile>
@@ -239,7 +228,7 @@
</configuration>
</plugin>
</plugins>
-
+
</build>
</profile>
@@ -255,7 +244,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>${version.jboss_51}</version>
+ <version>${version.jboss_51}</version>
<type>pom</type>
</dependency>
</dependencies>
@@ -276,7 +265,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>glassfish-embedded-3.1</id>
<dependencies>
@@ -332,8 +321,8 @@
<artifactId>jetty-plus</artifactId>
<version>7.0.2.v20100331</version>
<scope>test</scope>
- </dependency>
-
+ </dependency>
+
<!-- Weld servlet, EL and JSP required for testing CDI injections -->
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
@@ -472,7 +461,7 @@
</repositories>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
View
26 jboss-jsfunit-arquillian/pom.xml
@@ -9,10 +9,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jsfunit-arquillian</artifactId>
<name>JSFUnit Arquillian Integration</name>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<reporting>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -27,8 +27,8 @@
</plugin>
</plugins>
</reporting>
-
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>org.jboss.jsfunit</groupId>
@@ -53,28 +53,34 @@
<artifactId>arquillian-container-spi</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
</dependency>
-
+
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
</dependency>
-
+
</dependencies>
</project>
View
31 ...sfunit-arquillian/src/main/java/org/jboss/jsfunit/arquillian/client/JSFUnitProtocolArchiveProcessor.java
@@ -10,7 +10,7 @@
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -19,8 +19,6 @@
import org.jboss.arquillian.container.test.spi.TestDeployment;
import org.jboss.arquillian.container.test.spi.client.deployment.ProtocolArchiveProcessor;
-import org.jboss.jsfunit.arquillian.container.JSFUnitCleanupTestTreadFilter;
-import org.jboss.jsfunit.framework.JSFUnitFilter;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -28,11 +26,11 @@
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
/**
* Extension that will add JSFUnit required filters for Servlet 2.5 based applications.
- *
+ *
* @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
@@ -60,14 +58,15 @@ public void process(TestDeployment testDeployment, Archive<?> protocolArchive) {
}
private boolean shouldAddJSFUnitFilters(WebAppDescriptor descriptor) {
- try {
- Double definedVersion = Double.parseDouble(descriptor.getVersion());
+ /*try {
+ Double definedVersion = Double.parseDouble(descriptor.getVersion().toString());
return definedVersion <= WEB_XML_VERSION;
} catch (NumberFormatException e) {
throw new RuntimeException(
"Could not parse the web.xml version number to determine if it is less or equal to 2.5, "
+ "this so we can merge in the JSFUnit support", e);
- }
+ }*/
+ return false;
}
private WebAppDescriptor loadDescriptor(Node node) {
@@ -75,7 +74,19 @@ private WebAppDescriptor loadDescriptor(Node node) {
}
private WebAppDescriptor addJSFUnitFilters(WebAppDescriptor descriptor) {
- return descriptor.filter(JSFUnitCleanupTestTreadFilter.class, "/ArquillianServletRunner").filter(JSFUnitFilter.class,
- "/ArquillianServletRunner");
+ return descriptor
+ .createFilter()
+ .filterClass("org.jboss.jsfunit.arquillian.container.JSFUnitCleanupTestTreadFilter")
+ .filterName("JSFUnitCleanupTestTreadFilter").up()
+ .createFilterMapping()
+ .filterName("JSFUnitCleanupTestTreadFilter")
+ .urlPattern("/ArquillianServletRunner").up()
+ .createFilter()
+ .filterClass("org.jboss.jsfunit.framework.JSFUnitFilter")
+ .filterName("JSFUnitFilter").up()
+ .createFilterMapping()
+ .filterName("JSFUnitFilter")
+ .urlPattern("/ArquillianServletRunner").up();
+
}
}
View
3  ...llian/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor
@@ -0,0 +1,3 @@
+implClass=org.jboss.shrinkwrap.descriptor.impl.webapp30.WebAppDescriptorImpl
+importerClass=org.jboss.shrinkwrap.descriptor.spi.node.dom.XmlDomNodeDescriptorImporterImpl
+defaultName=web.xml
View
170 pom.xml
@@ -14,7 +14,26 @@
<description>JSFUnit is an integration test framework for JavaServer Faces. JSFUnit tests run inside the container, which provides the developer full access to managed beans, the FacesContext, and the internal JSF component tree. At the same time, you also have access to the HTML output of each client request.</description>
<name>JSFUnit</name>
<url>http://www.jsfunit.org</url>
-
+
+ <properties>
+ <richfaces-version>3.3.3.Final</richfaces-version>
+ <!-- <seam-version>2.1.1.GA</seam-version> -->
+ <!--<seam-version>2.1.2.CR1</seam-version> -->
+ <seam-version>2.1.2</seam-version>
+ <arquillian.bom.version>1.0.0.Final</arquillian.bom.version>
+ <junit.vesion>3.8.1</junit.vesion>
+ <htmlunit.version>2.8</htmlunit.version>
+ <apache.mime4j.version>0.6</apache.mime4j.version>
+ <httpcomponents.version>4.0.1</httpcomponents.version>
+ <commons.io.vesion>1.4</commons.io.vesion>
+ <commons.codec.version>1.4</commons.codec.version>
+ <rhino.version>1.7R1</rhino.version>
+ <cssparser.version>0.9.5</cssparser.version>
+ <nekohtml.version>1.9.14</nekohtml.version>
+ <xalan.version>2.7.1</xalan.version>
+ <commons.lang.version>2.4</commons.lang.version>
+ </properties>
+
<inceptionYear>2007</inceptionYear>
<developers>
<developer>
@@ -30,6 +49,17 @@
<timezone>-5</timezone>
</developer>
<developer>
+ <name>Jose Rodolfo Freitas</name>
+ <id>spinner</id>
+ <url>http://jsf.jboss.org</url>
+ <organization>independent</organization>
+ <organizationUrl>http://www.jboss.org</organizationUrl>
+ <roles>
+ <role>Community Lead</role>
+ </roles>
+ <timezone>-3</timezone>
+ </developer>
+ <developer>
<name>Dennis Byrne</name>
<id>dennisbyrne</id>
<email>dennisbyrne@apache.org</email>
@@ -67,7 +97,7 @@
<developerConnection>scm:git:git@github.com:jsfunit/jsfunit.git</developerConnection>
<url>https://github.com/jsfunit/jsfunit/</url>
</scm>
-
+
<!-- Issues -->
<issueManagement>
<system>jira</system>
@@ -129,7 +159,7 @@
</plugins>
</reporting>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -149,7 +179,7 @@
<artifactId>junit</artifactId>
<version>${junit.vesion}</version>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
@@ -161,7 +191,7 @@
<artifactId>htmlunit-core-js</artifactId>
<version>${htmlunit.version}</version>
</dependency>
-
+
<!-- needed by htmlunit -->
<!-- htmlunit's dependencies are not in any Maven repo -->
<dependency>
@@ -181,64 +211,64 @@
<artifactId>httpmime</artifactId>
<version>${httpcomponents.version}</version>
</dependency>
-
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.vesion}</version>
</dependency>
-
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
-
+
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>${rhino.version}</version>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.cssparser</groupId>
<artifactId>cssparser</artifactId>
<version>${cssparser.version}</version>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>${nekohtml.version}</version>
</dependency>
-
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons.lang.version}</version>
</dependency>
-
+
<!--**************************************************-->
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
-
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.0.1-FCS</version>
</dependency>
-
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
@@ -268,26 +298,26 @@
<artifactId>myfaces-api</artifactId>
<version>1.1.6</version>
</dependency>
-
+
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
<version>13-1.7.1</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.core.framework.uberjar.javaEE.13</artifactId>
<version>1.8.0</version>
</dependency>
-
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
@@ -305,80 +335,50 @@
<artifactId>richfaces-ui</artifactId>
<version>${richfaces-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seam-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${seam-version}</version>
</dependency>
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
-
+
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
</dependency>
-
+
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.0.4-b03</version>
</dependency>
-
+
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>2.0.4-b03</version>
</dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-spi</artifactId>
- <version>${arquillian.core.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-spi</artifactId>
- <version>${arquillian.core.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <version>${shrinkwrap.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
- <version>${shrinkwrap.descriptors.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api</artifactId>
- <version>${shrinkwrap.descriptors.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <version>${arquillian.core.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${arquillian.bom.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -397,7 +397,7 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
-
+
<!--
<repository>
<id>maven2-repository.dev.java.net</id>
@@ -412,9 +412,9 @@
<name>java.net Maven 1 Repository</name>
<url>https://maven-repository.dev.java.net/nonav/repository</url>
<layout>legacy</layout>
- </repository>
+ </repository>
-->
-
+
<repository>
<snapshots>
<enabled>true</enabled>
@@ -428,7 +428,7 @@
<url>http://build.canoo.com/NekoHTML/artifacts/m2-repo</url>
<layout>default</layout>
</repository>
-
+
<repository>
<id>jboss-deprecated-repository</id>
<name>JBoss Deprecated Maven Repository</name>
@@ -444,7 +444,7 @@
</snapshots>
</repository>
-
+
<repository>
<snapshots>
<enabled>true</enabled>
@@ -455,7 +455,7 @@
<url>http://htmlunit.sourceforge.net/m2-repo-snapshots</url>
<layout>default</layout>
</repository>
-
+
</repositories>
<modules>
@@ -479,7 +479,7 @@
</releases>
</pluginRepository>
</pluginRepositories>
-
+
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@@ -492,7 +492,7 @@
<!--<showDeprecation>true</showDeprecation>-->
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -506,7 +506,7 @@
</plugin>
<!-- Release -->
- <plugin>
+ <plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version>
<configuration>
@@ -516,29 +516,9 @@
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
-
+
</plugins>
</build>
-
- <properties>
- <richfaces-version>3.3.3.Final</richfaces-version>
- <!-- <seam-version>2.1.1.GA</seam-version> -->
- <!--<seam-version>2.1.2.CR1</seam-version> -->
- <seam-version>2.1.2</seam-version>
- <arquillian.core.version>1.0.0.CR4</arquillian.core.version>
- <shrinkwrap.version>1.0.0-beta-5</shrinkwrap.version>
- <junit.vesion>3.8.1</junit.vesion>
- <htmlunit.version>2.8</htmlunit.version>
- <apache.mime4j.version>0.6</apache.mime4j.version>
- <httpcomponents.version>4.0.1</httpcomponents.version>
- <commons.io.vesion>1.4</commons.io.vesion>
- <commons.codec.version>1.4</commons.codec.version>
- <rhino.version>1.7R1</rhino.version>
- <cssparser.version>0.9.5</cssparser.version>
- <nekohtml.version>1.9.14</nekohtml.version>
- <xalan.version>2.7.1</xalan.version>
- <commons.lang.version>2.4</commons.lang.version>
- <shrinkwrap.descriptors.version>1.1.0-alpha-2</shrinkwrap.descriptors.version>
- </properties>
-
+
+
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.