You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/25 18:08:50 UTC
[05/11] incubator-usergrid git commit: Back off of Arquillian for now.
Back off of Arquillian for now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/47953555
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/47953555
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/47953555
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 47953555dc5e7f6186e3a0c4bd5d217bdefe66b8
Parents: 99d694b
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 24 16:34:06 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 24 16:34:06 2015 -0500
----------------------------------------------------------------------
stack/rest/pom.xml | 110 ++++++-------------
.../apache/usergrid/rest/AbstractRestIT.java | 32 +++---
2 files changed, 51 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47953555/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index c1c8ea2..70072d9 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -41,35 +41,26 @@
<!-- profile that arquillian uses when it builds/starts tomcat -->
<profiles>
- <profile>
- <id>arquillian-tomcat</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-tomcat-remote-7</artifactId>
- <version>1.0.0.CR7</version>
- <scope>test</scope>
- </dependency>
-
- <!-- only deploy once during tests -->
- <dependency>
- <groupId>org.eu.ingwar.tools</groupId>
- <artifactId>arquillian-suite-extension</artifactId>
- <version>1.1.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
- </profile>
-
+ <!--<profile>-->
+ <!--<id>arquillian-tomcat</id>-->
+ <!--<activation>-->
+ <!--<activeByDefault>true</activeByDefault>-->
+ <!--</activation>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>org.jboss.arquillian.container</groupId>-->
+ <!--<artifactId>arquillian-tomcat-remote-7</artifactId>-->
+ <!--<version>1.0.0.CR7</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.eu.ingwar.tools</groupId>-->
+ <!--<artifactId>arquillian-suite-extension</artifactId>-->
+ <!--<version>1.1.1</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
</profiles>
@@ -377,67 +368,36 @@
<!-- Arquillian deps -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jackson-version}</version>
- <scope>test</scope>
- </dependency>
-
<!--<dependency>-->
- <!--<groupId>org.jboss.arquillian.container</groupId>-->
- <!--<artifactId>arquillian-tomcat-embedded-7</artifactId>-->
- <!--<version>1.1.7.Final</version>-->
+ <!--<groupId>org.codehaus.jackson</groupId>-->
+ <!--<artifactId>jackson-xc</artifactId>-->
+ <!--<version>${jackson-version}</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>1.1.7.Final</version>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.1.7.Final</version>
- <scope>test</scope>
- </dependency>
-
- <!--Some Arquillian dependency runs and old version of Guice.-->
- <!--We're overridding it here so that we include the right value into the test scope-->
<!--<dependency>-->
- <!--<groupId>com.google.inject</groupId>-->
- <!--<artifactId>guice</artifactId>-->
- <!--<version>${guice.version}</version>-->
+ <!--<groupId>org.jboss.arquillian</groupId>-->
+ <!--<artifactId>arquillian-bom</artifactId>-->
+ <!--<version>1.1.7.Final</version>-->
<!--<scope>test</scope>-->
+ <!--<type>pom</type>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>com.google.inject.extensions</groupId>-->
- <!--<artifactId>guice-multibindings</artifactId>-->
- <!--<version>${guice.version}</version>-->
+ <!--<groupId>org.jboss.arquillian.junit</groupId>-->
+ <!--<artifactId>arquillian-junit-container</artifactId>-->
+ <!--<version>1.1.7.Final</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--<dependency>-->
- <!--<groupId>com.google.inject.extensions</groupId>-->
- <!--<artifactId>guice-assistedinject</artifactId>-->
- <!--<version>${guice.version}</version>-->
- <!--<scope>test</scope>-->
+ <!--<groupId>org.jboss.shrinkwrap.resolver</groupId>-->
+ <!--<artifactId>shrinkwrap-resolver-depchain</artifactId>-->
+ <!--<version>2.1.1</version>-->
+ <!--<scope>test</scope>-->
+ <!--<type>pom</type>-->
<!--</dependency>-->
- <!-- documentation here https://github.com/shrinkwrap/resolver -->
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-depchain</artifactId>
- <version>2.1.1</version>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
-
<!-- use the external test client. Just depend on the maven jetty plugin to launch jetty -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47953555/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java
index fab1e55..eb1f628 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java
@@ -65,8 +65,8 @@ import org.slf4j.LoggerFactory;
* following naming convention: test_[HTTP verb]_[action mapping]_[ok|fail][_[specific
* failure condition if multiple]
*/
-@ArquillianSuiteDeployment
-@RunWith(Arquillian.class)
+//@ArquillianSuiteDeployment
+//@RunWith(Arquillian.class)
public abstract class AbstractRestIT extends JerseyTest {
private static final Logger LOG = LoggerFactory.getLogger( AbstractRestIT.class );
private static boolean usersSetup = false;
@@ -104,20 +104,20 @@ public abstract class AbstractRestIT extends JerseyTest {
}
- // We set testable = false so we deploy the archive to the server and test it locally
- @Deployment( testable = false )
- public static WebArchive createTestArchive() {
-
- // we use the MavenImporter from shrinkwrap to just produce whatever maven would build then test with it
-
- // set maven to be in offline mode
-
- System.setProperty( "org.apache.maven.offline", "true" );
- return ShrinkWrap.create(MavenImporter.class)
- .loadPomFromFile( "pom.xml", "arquillian-tomcat" )
- .importBuildOutput()
- .as( WebArchive.class );
- }
+// // We set testable = false so we deploy the archive to the server and test it locally
+// @org.jboss.arquillian.container.test.api.Deployment( testable = false )
+// public static WebArchive createTestArchive() {
+//
+// // we use the MavenImporter from shrinkwrap to just produce whatever maven would build then test with it
+//
+// // set maven to be in offline mode
+//
+// System.setProperty( "org.apache.maven.offline", "true" );
+// return ShrinkWrap.create(MavenImporter.class)
+// .loadPomFromFile( "pom.xml", "arquillian-tomcat" )
+// .importBuildOutput()
+// .as( WebArchive.class );
+// }
@AfterClass