forked from resteasy/resteasy
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request resteasy#454 from psakar/Branch_2_3
arquillian - update bom version, use upstream version for jboss-as-arqui...
- Loading branch information
Showing
133 changed files
with
1,299 additions
and
4,033 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>org.jboss.resteasy</groupId> | ||
<artifactId>arquillian-deployment-scenario-provider</artifactId> | ||
<version>1.0.0.Final</version> | ||
|
||
<properties> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
|
||
<maven.compiler.source>1.6</maven.compiler.source> | ||
<maven.compiler.target>1.6</maven.compiler.target> | ||
</properties> | ||
|
||
<dependencyManagement> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.jboss.arquillian</groupId> | ||
<artifactId>arquillian-bom</artifactId> | ||
<version>1.0.2.Final</version> | ||
<scope>import</scope> | ||
<type>pom</type> | ||
</dependency> | ||
</dependencies> | ||
</dependencyManagement> | ||
|
||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.jboss.arquillian.container</groupId> | ||
<artifactId>arquillian-container-spi</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.jboss.arquillian.test</groupId> | ||
<artifactId>arquillian-test-spi</artifactId> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
28 changes: 28 additions & 0 deletions
28
...der/src/main/java/org/jboss/resteasy/arquillian/extension/DeploymentScenarioProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package org.jboss.resteasy.arquillian.extension; | ||
|
||
import java.lang.annotation.Annotation; | ||
|
||
import org.jboss.arquillian.container.spi.client.deployment.DeploymentScenario; | ||
import org.jboss.arquillian.core.api.Instance; | ||
import org.jboss.arquillian.core.api.annotation.Inject; | ||
import org.jboss.arquillian.test.api.ArquillianResource; | ||
import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; | ||
|
||
public class DeploymentScenarioProvider implements ResourceProvider | ||
{ | ||
@Inject | ||
private Instance<DeploymentScenario> deploymentScenario; | ||
|
||
@Override | ||
public Object lookup(ArquillianResource resource, Annotation... qualifiers) | ||
{ | ||
return deploymentScenario.get(); | ||
} | ||
|
||
@Override | ||
public boolean canProvide(Class<?> type) | ||
{ | ||
return DeploymentScenario.class.isAssignableFrom(type); | ||
} | ||
|
||
} |
16 changes: 16 additions & 0 deletions
16
...ain/java/org/jboss/resteasy/arquillian/extension/DeploymentScenarioProviderExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.jboss.resteasy.arquillian.extension; | ||
|
||
import org.jboss.arquillian.core.spi.LoadableExtension; | ||
import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; | ||
|
||
public class DeploymentScenarioProviderExtension implements LoadableExtension { | ||
|
||
@Override | ||
public void register(ExtensionBuilder builder) { | ||
builder.service(ResourceProvider.class, DeploymentScenarioProvider.class); | ||
} | ||
|
||
} | ||
|
||
|
||
|
1 change: 1 addition & 0 deletions
1
...ider/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.jboss.resteasy.arquillian.extension.DeploymentScenarioProviderExtension |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
.../RESTEASY-736/src/test/java/org/jboss/resteasy/test/resteasy736/AsyncTimeoutTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package org.jboss.resteasy.test.resteasy736; | ||
|
||
import org.jboss.arquillian.container.test.api.Deployment; | ||
import org.jboss.arquillian.container.test.api.RunAsClient; | ||
import org.jboss.arquillian.junit.Arquillian; | ||
import org.jboss.resteasy.resteasy736.TestApplication; | ||
import org.jboss.resteasy.resteasy736.TestResource; | ||
import org.jboss.shrinkwrap.api.Archive; | ||
import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
import org.jboss.shrinkwrap.api.spec.WebArchive; | ||
import org.junit.runner.RunWith; | ||
|
||
/** | ||
* | ||
* @author <a href="ron.sigal@jboss.com">Ron Sigal</a> | ||
* @version $Revision: 1.1 $ | ||
* | ||
* Copyright Aug 3, 2012 | ||
*/ | ||
@RunWith(Arquillian.class) | ||
@RunAsClient | ||
public abstract class AsyncTimeoutTestCase | ||
{ | ||
@Deployment | ||
public static Archive<?> createTestArchive() | ||
{ | ||
return ShrinkWrap.create(WebArchive.class, "RESTEASY-736.war") | ||
.addClasses(TestApplication.class, TestResource.class) | ||
.addAsWebInfResource("web.xml"); | ||
} | ||
|
||
} |
Oops, something went wrong.