usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [6/6] git commit: Merge branch 'master' into two-dot-o
Date Wed, 03 Sep 2014 13:41:54 GMT
Merge branch 'master' into two-dot-o

Conflicts:
	.gitignore
	stack/core/pom.xml
	stack/pom.xml
	stack/rest/pom.xml
	stack/services/pom.xml
	stack/test-utils/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e395f121
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e395f121
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e395f121

Branch: refs/heads/two-dot-o
Commit: e395f1218f7e57561b9a9c99c84cefc9ef1e22cc
Parents: c9fd821 ac68da7
Author: Dave Johnson <snoopdave@apache.org>
Authored: Wed Sep 3 09:41:37 2014 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Wed Sep 3 09:41:37 2014 -0400

----------------------------------------------------------------------
 .gitignore                                      |  4 ++-
 LICENSE                                         | 28 +++++++++++++++++
 NOTICE                                          | 33 ++------------------
 release/pom.xml                                 |  2 +-
 release/sign-release.sh                         |  2 +-
 release/src/main/assembly/source.xml            |  6 ++++
 stack/core/pom.xml                              |  5 ++-
 .../apache/usergrid/launcher/AppleUtils.java    | 21 +++++++------
 stack/mongo-emulator/pom.xml                    |  2 +-
 stack/pom.xml                                   |  8 ++---
 stack/query-validator/pom.xml                   |  2 +-
 stack/rest/pom.xml                              |  4 +--
 stack/services/pom.xml                          | 10 +++---
 stack/test-utils/pom.xml                        |  2 +-
 stack/tools/pom.xml                             |  2 +-
 stack/websocket/pom.xml                         |  2 +-
 16 files changed, 72 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 4f7205a,47ed041..34ab44c
--- a/.gitignore
+++ b/.gitignore
@@@ -80,4 -59,5 +80,6 @@@ portal/js/templates.j
  /release/target/
  
  /portal/seleniumLog.txt
- !/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties
+ /stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
 -/stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
++/stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
++!/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/core/pom.xml
----------------------------------------------------------------------
diff --cc stack/core/pom.xml
index 08c8c1c,df764c7..709d9aa
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@@ -65,11 -64,11 +65,10 @@@
                  <suite.concurrency>${core.it.suite.concurrency}</suite.concurrency>
                </systemPropertyVariables>
  
 -              <parallel>both</parallel>
 +              <parallel>${core.it.parallel}</parallel>
                <forkCount>${core.it.forkCount}</forkCount>
 -              <reuseForks>false</reuseForks>
 -
 +              <reuseForks>${core.it.reuseForks}</reuseForks>
- 				
-               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
+               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}
                </argLine>
  
                <includes>
@@@ -168,10 -253,8 +167,10 @@@
              <storage-config>${basedir}/src/test/conf</storage-config>
              <target.directory>${project.build.directory}</target.directory>
            </systemPropertyVariables>
 -          <forkMode>once</forkMode>
 +          <parallel>classes</parallel>
 +          <forkCount>${core.it.forkCount}</forkCount>
 +          <reuseForks>${core.it.reuseForks}</reuseForks>
-           <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
+           <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
  
            <includes>
              <include>**/*ConcurrentCoreITSuite.java</include>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/mongo-emulator/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 63c9143,843b72f..c5e3eca
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -1664,11 -1609,7 +1665,10 @@@
            <artifactId>maven-surefire-plugin</artifactId>
            <version>2.15</version>
            <configuration>
 -            <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 +              <parallel>${usergrid.it.parallel}</parallel>
 +              <forkCount>${usergrid.it.forkCount}</forkCount>
 +              <reuseForks>${usergrid.it.reuseForks}</reuseForks>
-           	
-             <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
++              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
            </configuration>
          </plugin>
  

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/query-validator/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/rest/pom.xml
----------------------------------------------------------------------
diff --cc stack/rest/pom.xml
index 6fb977d,cadf14b..4f6ff9c
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@@ -17,416 -17,573 +17,416 @@@
  -->
  <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">
 -  <modelVersion>4.0.0</modelVersion>
 -  <parent>
 -    <groupId>org.apache.usergrid</groupId>
 -    <artifactId>usergrid</artifactId>
 -    <version>1.0.0</version>
 -    <relativePath>../</relativePath>
 -  </parent>
 -
 -  <artifactId>usergrid-rest</artifactId>
 -  <packaging>war</packaging>
 -  <name>Usergrid REST</name>
 -  <description>REST web services for Usergrid system.</description>
 -
 -  <!-- Override these properties in an active profile within your settings.xml -->
 -  <properties>
 -    <!-- If you got the resources, max parallelism = 6 forks -->
 -    <rest.it.forkCount>3</rest.it.forkCount>
 -  </properties>
 -
 -  <profiles>
 -    <profile>
 -      <id>unit</id>
 -      <activation>
 -        <property>
 -          <name>unit</name>
 -          <value>true</value>
 -        </property>
 -      </activation>
 -      <build>
 -        <plugins>
 -          <plugin>
 -            <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-surefire-plugin</artifactId>
 -            <configuration>
 -              <systemPropertyVariables>
 -                <storage-config>${basedir}/src/test/conf</storage-config>
 -                <target.directory>${project.build.directory}</target.directory>
 -              </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 -              <!-- TODO: make this into a small configuration but based on settings.xml -->
 -              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 -
 -              <includes>
 -                <include>**/RestTestSuite.java</include>
 -                <include>**/*Test.java</include>
 -              </includes>
 -              <excludes>
 -                <exclude>**/*IT.java</exclude>
 -                <exclude>**/*ITSuite.java</exclude>
 -                <!-- TODO - add these suites too -->
 -                <!-- <exclude>**/*Test.java</exclude> -->
 -                <exclude>**/ConcurrentRest*Suite.java</exclude>
 -              </excludes>
 -            </configuration>
 -          </plugin>
 -        </plugins>
 -      </build>
 -    </profile>
 -
 -    <profile>
 -      <id>default</id>
 -      <activation>
 -        <activeByDefault>true</activeByDefault>
 -      </activation>
 -      <build>
 -        <plugins>
 -          <plugin>
 -            <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-surefire-plugin</artifactId>
 -            <configuration>
 -              <systemPropertyVariables>
 -                <storage-config>${basedir}/src/test/conf</storage-config>
 -                <target.directory>${project.build.directory}</target.directory>
 -              </systemPropertyVariables>
 -
 -              <parallel>classes</parallel>
 -              <forkCount>${rest.it.forkCount}</forkCount>
 -              <reuseForks>false</reuseForks>
 -              <perCoreThreadCount>false</perCoreThreadCount>
 -              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}
 -              </argLine>
 -
 -              <includes>
 -                <include>**/RestTestSuite.java</include>
 -                <include>**/RestITSuite.java</include>
 -                <include>**/*IT.java</include>
 -                <include>**/*Test.java</include>
 -              </includes>
 -              <excludes>
 -                <exclude>**/*Concurrent*Suite.java</exclude>
 -                <exclude>**/ActivityResourceIT.java</exclude>
 -                <exclude>**/AdminEmailEncodingIT.java</exclude>
 -                <exclude>**/ApplicationRequestCounterIT.java</exclude>
 -                <exclude>**/AssetResourceIT.java</exclude>
 -                <exclude>**/BasicIT.java</exclude>
 -                <exclude>**/CollectionsResourceIT.java</exclude>
 -                <exclude>**/ContentTypeResourceIT.java</exclude>
 -                <exclude>**/DevicesResourceIT.java</exclude>
 -                <exclude>**/EventsResourceIT.java</exclude>
 -                <exclude>**/GroupResourceIT.java</exclude>
 -                <exclude>**/OrganizationResourceIT.java</exclude>
 -                <exclude>**/OrganizationsResourceIT.java</exclude>
 -                <exclude>**/OwnershipResourceIT.java</exclude>
 -                <exclude>**/PagingResourceIT.java</exclude>
 -                <exclude>**/PermissionsResourceIT.java</exclude>
 -                <exclude>**/UserResourceIT.java</exclude>
 -                <exclude>**/UsersOrganizationsResourceIT.java</exclude>
 -              </excludes>
 -            </configuration>
 -          </plugin>
 -        </plugins>
 -      </build>
 -    </profile>
 -
 -    <profile>
 -      <id>scott</id>
 -      <activation>
 -        <property>
 -          <name>unit-concurrent</name>
 -          <value>true</value>
 -        </property>
 -      </activation>
 -      <build>
 -        <plugins>
 -          <plugin>
 -            <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-surefire-plugin</artifactId>
 -            <configuration>
 -              <systemPropertyVariables>
 -                <storage-config>${basedir}/src/test/conf</storage-config>
 -                <target.directory>${project.build.directory}</target.directory>
 -              </systemPropertyVariables>
 -
 -              <parallel>classes</parallel>
 -              <forkCount>${rest.it.forkCount}</forkCount>
 -              <reuseForks>false</reuseForks>
 -              <perCoreThreadCount>false</perCoreThreadCount>
 -              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}
 -              </argLine>
 -
 -              <includes>
 -                <include>**/RestTestSuite.java</include>
 -                <include>**/RestITSuite.java</include>
 -                <include>**/ManagementResourceIT.java</include>
 -                <include>**/ApplicationResourceIT.java</include>
 -              </includes>
 -              <excludes>
 -                <exclude>**/*Test.java</exclude>
 -                <exclude>**/*Concurrent*Suite.java</exclude>
 -              </excludes>
 -            </configuration>
 -          </plugin>
 -        </plugins>
 -      </build>
 -    </profile>
 -
 -    <profile>
 -      <id>unit-concurrent</id>
 -      <activation>
 -        <property>
 -          <name>unit-concurrent</name>
 -          <value>true</value>
 -        </property>
 -      </activation>
 -      <build>
 -        <plugins>
 -          <plugin>
 -            <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-surefire-plugin</artifactId>
 -            <configuration>
 -              <systemPropertyVariables>
 -                <storage-config>${basedir}/src/test/conf</storage-config>
 -                <target.directory>${project.build.directory}</target.directory>
 -              </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 -              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 -
 -              <includes>
 -                <include>**/ConcurrentRestTestSuite.java</include>
 -              </includes>
 -              <excludes>
 -                <exclude>**/*IT.java</exclude>
 -                <exclude>**/*Test.java</exclude>
 -                <exclude>**/RestITSuite.java</exclude>
 -                <exclude>**/RestTestSuite.java</exclude>
 -                <exclude>**/ConcurrentRestITSuite.java</exclude>
 -              </excludes>
 -            </configuration>
 -          </plugin>
 -        </plugins>
 -      </build>
 -    </profile>
 -
 -    <profile>
 -      <id>integ-concurrent</id>
 -      <activation>
 -        <property>
 -          <name>integ-concurrent</name>
 -          <value>true</value>
 -        </property>
 -      </activation>
 -      <build>
 +    <modelVersion>4.0.0</modelVersion>
 +    <parent>
 +        <groupId>org.apache.usergrid</groupId>
 +        <artifactId>usergrid</artifactId>
 +        <version>2.0.0-SNAPSHOT</version>
 +    </parent>
 +
 +    <artifactId>usergrid-rest</artifactId>
 +    <packaging>war</packaging>
 +    <name>Usergrid REST</name>
 +    <description>REST web services for Usergrid system.</description>
 +
 +    <!-- Override these properties in an active profile within your settings.xml -->
 +    <properties>
 +        <!-- If you got the resources, max parallelism = 6 forks -->
 +        <rest.it.forkCount>2</rest.it.forkCount>
 +        <rest.it.reuseForks>false</rest.it.reuseForks>
 +        <rest.it.parallel>suites</rest.it.parallel>
 +    </properties>
 +
 +    <profiles>
 +
 +        <profile>
 +            <id>default</id>
 +            <activation>
 +                <activeByDefault>true</activeByDefault>
 +            </activation>
 +            <build>
 +                <plugins>
 +                    <plugin>
 +                        <groupId>org.apache.maven.plugins</groupId>
 +                        <artifactId>maven-surefire-plugin</artifactId>
 +                        <configuration>
 +
 +                            <systemPropertyVariables>
 +                                <storage-config>${basedir}/src/test/conf</storage-config>
 +                                <target.directory>${project.build.directory}</target.directory>
 +                            </systemPropertyVariables>
 +
 +                            <forkCount>${rest.it.forkCount}</forkCount>
 +                            <reuseForks>${rest.it.reuseForks}</reuseForks>
 +
 +                            <parallel>${rest.it.parallel}</parallel>
 +
-                             <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=src/test/resources/logging.properties</argLine>
++                            <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=src/test/resources/logging.properties ${ug.argline}</argLine>
 +
 +                            <additionalClasspathElements>
 +                                <additionalClasspathElement>./target/classes/jsp/WEB_002dINF/jsp</additionalClasspathElement>
 +                            </additionalClasspathElements>
 +
 +                            <includes>
 +<!--                                <include>**/RestTestSuite.java</include>
 +                                <include>**/RestITSuite.java</include>-->
 +                                <include>**/*IT.java</include>
 +                                <include>**/*Test.java</include>
 +                            </includes>
 +                            <excludes>
 +<!--                                <exclude>**/*Concurrent*Suite.java</exclude>
 +                                <exclude>**/ActivityResourceIT.java</exclude>
 +                                <exclude>**/AdminEmailEncodingIT.java</exclude>
 +                                <exclude>**/ApplicationRequestCounterIT.java</exclude>
 +                                <exclude>**/AssetResourceIT.java</exclude>
 +                                <exclude>**/BasicIT.java</exclude>
 +                                <exclude>**/CollectionsResourceIT.java</exclude>
 +                                <exclude>**/ContentTypeResourceIT.java</exclude>
 +                                <exclude>**/DevicesResourceIT.java</exclude>
 +                                <exclude>**/EventsResourceIT.java</exclude>
 +                                <exclude>**/GroupResourceIT.java</exclude>
 +                                <exclude>**/OrganizationResourceIT.java</exclude>
 +                                <exclude>**/OrganizationsResourceIT.java</exclude>
 +                                <exclude>**/OwnershipResourceIT.java</exclude>
 +                                <exclude>**/PagingResourceIT.java</exclude>
 +                                <exclude>**/PermissionsResourceIT.java</exclude>
 +                                <exclude>**/UserResourceIT.java</exclude>
 +                                <exclude>**/UsersOrganizationsResourceIT.java</exclude>-->
 +                            </excludes>
 +                        </configuration>
 +                    </plugin>
 +                </plugins>
 +            </build>
 +        </profile>
 +
 +    </profiles>
 +
 +    <build>
 +        <finalName>ROOT</finalName>
 +
 +        <resources>
 +            <resource>
 +                <directory>src/main/resources</directory>
 +                <filtering>true</filtering>
 +                <includes>
 +                    <include>**/*.xml</include>
 +                    <include>**/*.json</include>
 +                </includes>
 +            </resource>
 +        </resources>
 +
 +        <testResources>
 +            <testResource>
 +                <directory>src/test/resources</directory>
 +                <filtering>true</filtering>
 +                <includes>
 +                    <include>**/*</include>
 +                </includes>
 +            </testResource>
 +        </testResources>
 +
          <plugins>
 -          <plugin>
 -            <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-surefire-plugin</artifactId>
 -            <configuration>
 -              <systemPropertyVariables>
 -                <storage-config>${basedir}/src/test/conf</storage-config>
 -                <target.directory>${project.build.directory}</target.directory>
 -              </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 -              <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 -
 -              <includes>
 -                <include>**/ConcurrentRestITSuite.java</include>
 -                <include>**/LongRunningNotInSuiteIT.java</include>
 -                <!-- an example -->
 -              </includes>
 -              <excludes>
 -                <exclude>**/*IT.java</exclude>
 -                <exclude>**/*Test.java</exclude>
 -                <exclude>**/RestITSuite.java</exclude>
 -                <exclude>**/RestTestSuite.java</exclude>
 -              </excludes>
 -            </configuration>
 -          </plugin>
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-surefire-plugin</artifactId>
 +                <configuration>
 +        			<parallel>${rest.it.parallel}</parallel>
 +                    <forkCount>${rest.it.forkCount}</forkCount>
 +                    <reuseForks>${rest.it.reuseForks}</reuseForks>
-                     <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
++                    <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 +                </configuration>
 +            </plugin>
 +
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-war-plugin</artifactId>
 +                <version>2.3</version>
 +            </plugin>
 +
 +            <plugin>
 +                <groupId>org.jasig.mojo.jspc</groupId>
 +                <artifactId>jspc-maven-plugin</artifactId>
 +                <version>2.0.0</version>
 +                <configuration>
 +                    <includeInProject>false</includeInProject>
 +                    <webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
 +                </configuration>
 +                <executions>
 +                    <execution>
 +                        <id>jspc</id>
 +                        <goals>
 +                            <goal>compile</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +                <dependencies>
 +                    <dependency>
 +                        <groupId>org.jasig.mojo.jspc</groupId>
 +                        <artifactId>jspc-compiler-tomcat6</artifactId>
 +                        <version>2.0.0</version>
 +                    </dependency>
 +                </dependencies>
 +            </plugin>
 +
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-jar-plugin</artifactId>
 +                <version>2.3.2</version>
 +                <configuration>
 +                    <finalName>${project.artifactId}-${project.version}</finalName>
 +                </configuration>
 +                <executions>
 +                    <execution>
 +                        <id>make-a-jar</id>
 +                        <phase>package</phase>
 +                        <goals>
 +                            <goal>jar</goal>
 +                        </goals>
 +                        <configuration>
 +                            <classifier>classes</classifier>
 +                        </configuration>
 +                    </execution>
 +                    <execution>
 +                        <id>jsp-jar-execution</id>
 +                        <phase>package</phase>
 +                        <goals>
 +                            <goal>jar</goal>
 +                        </goals>
 +                        <configuration>
 +                            <classifier>compiled-jsp</classifier>
 +                            <classesDirectory>${project.build.directory}/jsp-source</classesDirectory>
 +                        </configuration>
 +                    </execution>
 +                    <execution>
 +                        <goals>
 +                            <goal>test-jar</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +            </plugin>
 +
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-install-plugin</artifactId>
 +                <version>2.5.1</version>
 +            </plugin>
 +
          </plugins>
 -      </build>
 -    </profile>
 -  </profiles>
 -
 -  <build>
 -    <finalName>ROOT</finalName>
 -
 -    <resources>
 -      <resource>
 -        <directory>src/main/resources</directory>
 -        <filtering>true</filtering>
 -        <includes>
 -          <include>**/*.xml</include>
 -          <include>**/*.json</include>
 -        </includes>
 -      </resource>
 -    </resources>
 -
 -    <testResources>
 -      <testResource>
 -        <directory>src/test/resources</directory>
 -        <filtering>true</filtering>
 -        <includes>
 -          <include>**/*</include>
 -        </includes>
 -      </testResource>
 -    </testResources>
 -
 -    <plugins>
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-surefire-plugin</artifactId>
 -        <configuration>
 -          <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 -        </configuration>
 -      </plugin>
 -
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-war-plugin</artifactId>
 -        <version>2.3</version>
 -      </plugin>
 -
 -      <plugin>
 -        <groupId>org.jasig.mojo.jspc</groupId>
 -        <artifactId>jspc-maven-plugin</artifactId>
 -        <version>2.0.0</version>
 -        <configuration>
 -          <includeInProject>false</includeInProject>
 -          <webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
 -        </configuration>
 -        <executions>
 -          <execution>
 -            <id>jspc</id>
 -            <goals>
 -              <goal>compile</goal>
 -            </goals>
 -          </execution>
 -        </executions>
 -        <dependencies>
 -          <dependency>
 -            <groupId>org.jasig.mojo.jspc</groupId>
 -            <artifactId>jspc-compiler-tomcat6</artifactId>
 -            <version>2.0.0</version>
 -          </dependency>
 -        </dependencies>
 -      </plugin>
 -
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-jar-plugin</artifactId>
 -        <version>2.3.2</version>
 -        <configuration>
 -          <finalName>${project.artifactId}-${project.version}</finalName>
 -        </configuration>
 -        <executions>
 -          <execution>
 -            <id>make-a-jar</id>
 -            <phase>package</phase>
 -            <goals>
 -              <goal>jar</goal>
 -            </goals>
 -            <configuration>
 -              <classifier>classes</classifier>
 -            </configuration>
 -          </execution>
 -          <execution>
 -            <id>jsp-jar-execution</id>
 -            <phase>package</phase>
 -            <goals>
 -              <goal>jar</goal>
 -            </goals>
 -            <configuration>
 -              <classifier>compiled-jsp</classifier>
 -              <classesDirectory>${project.build.directory}/jsp-source</classesDirectory>
 -            </configuration>
 -          </execution>
 -          <execution>
 -            <goals>
 -              <goal>test-jar</goal>
 -            </goals>
 -          </execution>
 -        </executions>
 -      </plugin>
 -
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-install-plugin</artifactId>
 -        <version>2.5.1</version>
 -      </plugin>
 -    </plugins>
 -  </build>
 -
 -  <dependencies>
 -
 -    <!-- Usergrid Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-config</artifactId>
 -      <version>${project.version}</version>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-core</artifactId>
 -      <version>${project.version}</version>
 -      <exclusions>
 -        <exclusion>
 -          <artifactId>commons-logging</artifactId>
 -          <groupId>commons-logging</groupId>
 -        </exclusion>
 -      </exclusions>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-mongo-emulator</artifactId>
 -      <version>${project.version}</version>
 -    </dependency>
 -
 -    <!-- Apache Dependencies -->
 -
 -    <dependency>
 -      <groupId>commons-collections</groupId>
 -      <artifactId>commons-collections</artifactId>
 -    </dependency>
 -
 -    <!-- SUN, Javax Package, and Other Com Dependencies -->
 -
 -
 -    <dependency>
 -        <groupId>javax.servlet</groupId>
 -        <artifactId>javax.servlet-api</artifactId>
 -        <scope>provided</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>javax.servlet</groupId>
 -      <artifactId>jstl</artifactId>
 -    </dependency>
 -
 -
 -    <dependency>
 -      <groupId>com.sun.jersey.contribs</groupId>
 -      <artifactId>jersey-multipart</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.sun.jersey</groupId>
 -      <artifactId>jersey-json</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.yammer.metrics</groupId>
 -      <artifactId>metrics-spring</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.sun.jersey</groupId>
 -      <artifactId>jersey-client</artifactId>
 -    </dependency>
 -
 -      <dependency>
 -        <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
 -        <artifactId>recaptcha4j</artifactId>
 -      </dependency>
 -
 -    <dependency>
 -      <groupId>com.sun.jersey</groupId>
 -      <artifactId>jersey-server</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.sun.jersey.contribs</groupId>
 -      <artifactId>jersey-spring</artifactId>
 -    </dependency>
 -
 -    <!-- Codehaus, Spring, and Other Org Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-webmvc</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <!-- TODO - should not scope be 'test' ? -->
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>jcl-over-slf4j</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <!-- TODO - should not scope be 'test' ? -->
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>jul-to-slf4j</artifactId>
 -    </dependency>
 -      <dependency>
 -          <groupId>org.slf4j</groupId>
 -          <artifactId>slf4j-log4j12</artifactId>
 -      </dependency>
 -
 -      <dependency>
 -          <groupId>log4j</groupId>
 -          <artifactId>log4j</artifactId>
 -      </dependency>
 -
 -
 -      <!-- Testing and Logging Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-config</artifactId>
 -      <version>${project.version}</version>
 -      <scope>test</scope>
 -      <classifier>tests</classifier>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-test-utils</artifactId>
 -      <version>${project.version}</version>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-core</artifactId>
 -      <version>${project.version}</version>
 -      <scope>test</scope>
 -      <classifier>tests</classifier>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-test</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>junit</groupId>
 -      <artifactId>junit</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.jvnet.mock-javamail</groupId>
 -      <artifactId>mock-javamail</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.hectorclient</groupId>
 -      <artifactId>hector-test</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat.embed</groupId>
 -      <artifactId>tomcat-embed-core</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat.embed</groupId>
 -      <artifactId>tomcat-embed-logging-juli</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat.embed</groupId>
 -      <artifactId>tomcat-embed-jasper</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat</groupId>
 -      <artifactId>tomcat-jasper-el</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat</groupId>
 -      <artifactId>tomcat-jsp-api</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.tomcat</groupId>
 -      <artifactId>juli</artifactId>
 -      <scope>test</scope>
 -    </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>
 -      <artifactId>jersey-test-framework-external</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.sun.jersey.jersey-test-framework</groupId>
 -      <artifactId>jersey-test-framework-core</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.usergrid</groupId>
 -      <artifactId>usergrid-java-client</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-services</artifactId>
 -      <version>${project.version}</version>
 -      <scope>test</scope>
 -      <classifier>tests</classifier>
 -    </dependency>
 -
 -  </dependencies>
 +    </build>
 +
 +    <dependencies>
 +
 +        <!-- Usergrid Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-config</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-core</artifactId>
 +            <version>${project.version}</version>
 +            <exclusions>
 +                <exclusion>
 +                    <artifactId>commons-logging</artifactId>
 +                    <groupId>commons-logging</groupId>
 +                </exclusion>
 +            </exclusions>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-mongo-emulator</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
 +
 +        <!-- Apache Dependencies -->
 +
 +        <dependency>
 +            <groupId>commons-collections</groupId>
 +            <artifactId>commons-collections</artifactId>
 +        </dependency>
 +
 +        <!-- SUN, Javax Package, and Other Com Dependencies -->
 +
 +        <dependency>
 +            <groupId>javax.servlet</groupId>
 +            <artifactId>javax.servlet-api</artifactId>
 +            <scope>provided</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>javax.servlet</groupId>
 +            <artifactId>jstl</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey.contribs</groupId>
 +            <artifactId>jersey-multipart</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-json</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.fasterxml.jackson.jaxrs</groupId>
 +            <artifactId>jackson-jaxrs-json-provider</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.yammer.metrics</groupId>
 +            <artifactId>metrics-spring</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-client</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
 +            <artifactId>recaptcha4j</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-server</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey.contribs</groupId>
 +            <artifactId>jersey-spring</artifactId>
 +        </dependency>
 +
 +        <!-- Codehaus, Spring, and Other Org Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-webmvc</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <!-- TODO - should not scope be 'test' ? -->
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>jcl-over-slf4j</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <!-- TODO - should not scope be 'test' ? -->
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>jul-to-slf4j</artifactId>
 +        </dependency>
 +
 +        <!-- Testing and Logging Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-config</artifactId>
 +            <version>${project.version}</version>
 +            <scope>test</scope>
 +            <classifier>tests</classifier>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-test-utils</artifactId>
 +            <version>${project.version}</version>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-core</artifactId>
 +            <version>${project.version}</version>
 +            <scope>test</scope>
 +            <classifier>tests</classifier>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-test</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>junit</groupId>
 +            <artifactId>junit</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.jvnet.mock-javamail</groupId>
 +            <artifactId>mock-javamail</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.hectorclient</groupId>
 +            <artifactId>hector-test</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +<!--        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-core</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-logging-juli</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-jasper</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat</groupId>
 +            <artifactId>tomcat-jasper-el</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat</groupId>
 +            <artifactId>tomcat-jsp-api</artifactId>
 +            <scope>test</scope>
 +        </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>
 +            <artifactId>jersey-test-framework-external</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.sun.jersey.jersey-test-framework</groupId>
 +            <artifactId>jersey-test-framework-core</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-java-client</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-services</artifactId>
 +            <version>2.0.0-SNAPSHOT</version>
 +            <scope>test</scope>
 +            <classifier>tests</classifier>
 +        </dependency>
 +
 +    </dependencies>
  
  </project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/services/pom.xml
----------------------------------------------------------------------
diff --cc stack/services/pom.xml
index 08e8f59,1a387f4..38692d6
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@@ -65,11 -64,9 +65,11 @@@
                  <storage-config>${basedir}/src/test/conf</storage-config>
                  <target.directory>${project.build.directory}</target.directory>
                </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 +			<parallel>${services.it.parallel}</parallel>
 +            <forkCount>${services.it.forkCount}</forkCount>
 +            <reuseForks>${services.it.reuseForks}</reuseForks>
                <!-- TODO: make this into a small configuration but based on settings.xml -->
-               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
+               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
  
                <includes>
                  <include>**/ServiceTestSuite.java</include>
@@@ -104,11 -101,11 +104,11 @@@
                  <target.directory>${project.build.directory}</target.directory>
                </systemPropertyVariables>
  
 -              <parallel>both</parallel>
 -              <forkCount>${services.it.forkCount}</forkCount>
 -              <reuseForks>false</reuseForks>
 +			<parallel>${services.it.parallel}</parallel>
 +            <forkCount>${services.it.forkCount}</forkCount>
 +            <reuseForks>${services.it.reuseForks}</reuseForks>
  
-               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ${ug.argline}</argLine>
                <argLine>
                  <!-- -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar -->
                  -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
@@@ -168,10 -164,8 +168,10 @@@
                  <storage-config>${basedir}/src/test/conf</storage-config>
                  <target.directory>${project.build.directory}</target.directory>
                </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 +			<parallel>${services.it.parallel}</parallel>
 +            <forkCount>${services.it.forkCount}</forkCount>
 +            <reuseForks>${services.it.reuseForks}</reuseForks>
-               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ${ug.argline}</argLine>
                <argLine>
                 <!--  -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar-->
  			   -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
@@@ -212,10 -206,8 +212,10 @@@
                  <storage-config>${basedir}/src/test/conf</storage-config>
                  <target.directory>${project.build.directory}</target.directory>
                </systemPropertyVariables>
 -              <forkMode>once</forkMode>
 +			<parallel>${services.it.parallel}</parallel>
 +            <forkCount>${services.it.forkCount}</forkCount>
 +            <reuseForks>${services.it.reuseForks}</reuseForks>
-               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+               <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ${ug.argline}</argLine>
                <argLine>
                  <!-- -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar -->
  				-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
@@@ -277,11 -269,11 +277,11 @@@
              <target.directory>${project.build.directory}</target.directory>
            </systemPropertyVariables>
  
 -          <parallel>both</parallel>
 -          <forkCount>${services.it.forkCount}</forkCount>
 -          <reuseForks>false</reuseForks>
 +			<parallel>${services.it.parallel}</parallel>
 +            <forkCount>${services.it.forkCount}</forkCount>
 +            <reuseForks>${services.it.reuseForks}</reuseForks>
  
-           <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+           <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 ${ug.argline}</argLine>
            <argLine>
              <!-- -javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar-->
  			-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --cc stack/test-utils/pom.xml
index a548b1e,961ac2f..9b242e6
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@@ -17,263 -17,254 +17,263 @@@
  -->
  <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">
 -  <modelVersion>4.0.0</modelVersion>
 -  <parent>
 -    <groupId>org.apache.usergrid</groupId>
 -    <artifactId>usergrid</artifactId>
 -    <version>1.0.0</version>
 -    <relativePath>../</relativePath>
 -  </parent>
 -
 -  <artifactId>usergrid-test-utils</artifactId>
 -  <name>Usergrid Test Utils</name>
 -  <description>Test Utilities for Usergrid system.</description>
 -  <packaging>jar</packaging>
 -
 -  <build>
 -    <testResources>
 -      <testResource>
 -        <directory>src/test/resources</directory>
 -        <filtering>true</filtering>
 -        <includes>
 -          <include>**/*.properties</include>
 -          <include>**/*.xml</include>
 -        </includes>
 -      </testResource>
 -    </testResources>
 -
 -    <plugins>
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-surefire-plugin</artifactId>
 -
 -        <configuration>
 -          <systemPropertyVariables>
 -            <storage-config>${basedir}/src/test/conf</storage-config>
 -            <target-directory>${project.build.directory}</target-directory>
 -          </systemPropertyVariables>
 -          <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 -
 -          <includes>
 -            <include>**/CassandraResourceITSuite.java</include>
 -            <!-- <include>**/CassandraResourceTest.java</include>-->
 -          </includes>
 -          <excludes>
 -            <exclude>**/CassandraRunnerTest.java</exclude>
 -            <exclude>**/OtherRunnerTest.java</exclude>
 -          </excludes>
 -        </configuration>
 -      </plugin>
 -    </plugins>
 -  </build>
 -
 -  <dependencies>
 -    <dependency>
 -      <groupId>org.apache.usergrid</groupId>
 -      <artifactId>usergrid-config</artifactId>
 -      <version>${project.version}</version>
 -    </dependency>
 -
 -    <!--<dependency>-->
 -    <!--<groupId>org.apache.usergrid</groupId>-->
 -    <!--<artifactId>usergrid-services</artifactId>-->
 -    <!--<version>${project.version}</version>-->
 -    <!--</dependency>-->
 -
 -    <!-- Apache Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.apache.cassandra</groupId>
 -      <artifactId>cassandra-all</artifactId>
 -      <!-- Exclude the old and problematic Snappy -->
 -      <exclusions>
 -        <exclusion>
 -          <artifactId>snappy-java</artifactId>
 -          <groupId>org.xerial.snappy</groupId>
 -        </exclusion>
 -      </exclusions>
 -    </dependency>
 -
 -    <!-- Include the slighly newer and less problematic snappy -->
 -    <dependency>
 -      <artifactId>snappy-java</artifactId>
 -      <groupId>org.xerial.snappy</groupId>
 -      <version>1.0.5</version>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>jline</groupId>
 -      <artifactId>jline</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.antlr</groupId>
 -      <artifactId>antlr-runtime</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.cassandra</groupId>
 -      <artifactId>cassandra-thrift</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>commons-logging</groupId>
 -      <artifactId>commons-logging</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>commons-lang</groupId>
 -      <artifactId>commons-lang</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>commons-cli</groupId>
 -      <artifactId>commons-cli</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>commons-codec</groupId>
 -      <artifactId>commons-codec</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.yammer.metrics</groupId>
 -      <artifactId>metrics-core</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>commons-io</groupId>
 -      <artifactId>commons-io</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.shiro</groupId>
 -      <artifactId>shiro-core</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.shiro</groupId>
 -      <artifactId>shiro-spring</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.apache.shiro</groupId>
 -      <artifactId>shiro-web</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.yaml</groupId>
 -      <artifactId>snakeyaml</artifactId>
 -    </dependency>
 -
 -    <!-- Spring and Other Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-core</artifactId>
 -      <exclusions>
 -        <exclusion>
 -          <artifactId>commons-logging</artifactId>
 -          <groupId>commons-logging</groupId>
 -        </exclusion>
 -      </exclusions>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-expression</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-beans</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-aop</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-context</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-context-support</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.codehaus.jackson</groupId>
 -      <artifactId>jackson-core-asl</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.codehaus.jackson</groupId>
 -      <artifactId>jackson-mapper-asl</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>slf4j-api</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <!-- TODO - should not scope be 'test' ? -->
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>slf4j-log4j12</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <!-- TODO - should not scope be 'test' ? -->
 -      <groupId>log4j</groupId>
 -      <artifactId>log4j</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.google.guava</groupId>
 -      <artifactId>guava</artifactId>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>junit</groupId>
 -      <artifactId>junit-dep</artifactId>
 -    </dependency>
 -
 -    <!-- Test Dependencies -->
 -
 -    <dependency>
 -      <groupId>org.springframework</groupId>
 -      <artifactId>spring-test</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -
 -    <!--<dependency>-->
 -    <!--<groupId>org.slf4j</groupId>-->
 -    <!--<artifactId>slf4j-log4j12</artifactId>-->
 -    <!--<scope>test</scope>-->
 -    <!--</dependency>-->
 -
 -    <!--<dependency>-->
 -    <!--<groupId>log4j</groupId>-->
 -    <!--<artifactId>log4j</artifactId>-->
 -    <!--<scope>test</scope>-->
 -    <!--</dependency>-->
 -
 -    <dependency>
 -      <groupId>junit</groupId>
 -      <artifactId>junit</artifactId>
 -      <scope>test</scope>
 -    </dependency>
 -  </dependencies>
 +    <modelVersion>4.0.0</modelVersion>
 +    <parent>
 +        <groupId>org.apache.usergrid</groupId>
 +        <artifactId>usergrid</artifactId>
 +        <version>2.0.0-SNAPSHOT</version>
 +    </parent>
 +
 +    <artifactId>usergrid-test-utils</artifactId>
 +    <name>Usergrid Test Utils</name>
 +    <description>Test Utilities for Usergrid system.</description>
 +    <packaging>jar</packaging>
 +
 +    <build>
 +        <testResources>
 +            <testResource>
 +                <directory>src/test/resources</directory>
 +                <filtering>true</filtering>
 +                <includes>
 +                    <include>**/*.properties</include>
 +                    <include>**/*.xml</include>
 +                </includes>
 +            </testResource>
 +        </testResources>
 +
 +        <plugins>
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-surefire-plugin</artifactId>
 +
 +                <configuration>
 +                    <systemPropertyVariables>
 +                        <storage-config>${basedir}/src/test/conf</storage-config>
 +                        <target-directory>${project.build.directory}</target-directory>
 +                    </systemPropertyVariables>
-                     <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar</argLine>
++                    <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
 +
 +                    <includes>
 +                        <include>**/CassandraResourceITSuite.java</include>
 +                        <!-- <include>**/CassandraResourceTest.java</include>-->
 +                    </includes>
 +                    <excludes>
 +                        <exclude>**/CassandraRunnerTest.java</exclude>
 +                        <exclude>**/OtherRunnerTest.java</exclude>
 +                    </excludes>
 +                </configuration>
 +            </plugin>
 +        </plugins>
 +    </build>
 +
 +    <dependencies>
 +
 +        <dependency>
 +            <groupId>org.apache.usergrid</groupId>
 +            <artifactId>usergrid-config</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
 +
 +        <!-- Apache Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.apache.cassandra</groupId>
 +            <artifactId>cassandra-all</artifactId>
 +            <!-- Exclude the old and problematic Snappy -->
 +            <exclusions>
 +                <exclusion>
 +                    <artifactId>snappy-java</artifactId>
 +                    <groupId>org.xerial.snappy</groupId>
 +                </exclusion>
 +            </exclusions>
 +        </dependency>
 +
 +        <!-- Include the slighly newer and less problematic snappy -->
 +        <dependency>
 +            <artifactId>snappy-java</artifactId>
 +            <groupId>org.xerial.snappy</groupId>
 +            <version>1.0.5</version>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>jline</groupId>
 +            <artifactId>jline</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.antlr</groupId>
 +            <artifactId>antlr-runtime</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.cassandra</groupId>
 +            <artifactId>cassandra-thrift</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-logging</groupId>
 +            <artifactId>commons-logging</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-lang</groupId>
 +            <artifactId>commons-lang</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-cli</groupId>
 +            <artifactId>commons-cli</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-codec</groupId>
 +            <artifactId>commons-codec</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.yammer.metrics</groupId>
 +            <artifactId>metrics-core</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-io</groupId>
 +            <artifactId>commons-io</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.shiro</groupId>
 +            <artifactId>shiro-core</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.shiro</groupId>
 +            <artifactId>shiro-spring</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.shiro</groupId>
 +            <artifactId>shiro-web</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.yaml</groupId>
 +            <artifactId>snakeyaml</artifactId>
 +        </dependency>
 +
 +        <!-- Spring and Other Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-core</artifactId>
 +            <exclusions>
 +                <exclusion>
 +                    <artifactId>commons-logging</artifactId>
 +                    <groupId>commons-logging</groupId>
 +                </exclusion>
 +            </exclusions>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-expression</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-beans</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-aop</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-context</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-context-support</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-api</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <!-- TODO - should not scope be 'test' ? -->
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-log4j12</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <!-- TODO - should not scope be 'test' ? -->
 +            <groupId>log4j</groupId>
 +            <artifactId>log4j</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>com.google.guava</groupId>
 +            <artifactId>guava</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>junit</groupId>
 +            <artifactId>junit-dep</artifactId>
 +        </dependency>
 +
 +        <!-- Test Dependencies -->
 +
 +        <dependency>
 +            <groupId>org.springframework</groupId>
 +            <artifactId>spring-test</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>junit</groupId>
 +            <artifactId>junit</artifactId>
 +            <scope>test</scope>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.codehaus.jackson</groupId>
 +            <artifactId>jackson-mapper-asl</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.elasticsearch</groupId>
 +            <artifactId>elasticsearch</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-core</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-logging-juli</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat.embed</groupId>
 +            <artifactId>tomcat-embed-jasper</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat</groupId>
 +            <artifactId>tomcat-jasper-el</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.tomcat</groupId>
 +            <artifactId>tomcat-jsp-api</artifactId>
 +        </dependency>
 +
 +    </dependencies>
 +
  </project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/tools/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e395f121/stack/websocket/pom.xml
----------------------------------------------------------------------


Mime
View raw message